Canada secures its future on the Formula 1 calendar until at least 2035 on the same day as a grand prix in Thailand moves a step closer.