Timezone

Same than antoine, but with rebase of dev
I would use || instead of &&. A stop_time is still on_demand if you're not allowed to alight/board (which results in a pickup or drop_off with 1) and not 2 at the stop.