From fed1f0e49d9f4d81df4159cbcd96be9174c10c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 10 Nov 2026 14:53:41 -0500 Subject: [PATCH 1/4] Timezones rules change #Nov2026 - cannot trust older Android devices and emulator to have up-to-date timezone rules --- .../java/org/mtransit/parser/gtfs/GReader.java | 14 +++++++++++++- .../java/org/mtransit/parser/gtfs/data/GAgency.kt | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mtransit/parser/gtfs/GReader.java b/src/main/java/org/mtransit/parser/gtfs/GReader.java index 95d0f53..551ae62 100644 --- a/src/main/java/org/mtransit/parser/gtfs/GReader.java +++ b/src/main/java/org/mtransit/parser/gtfs/GReader.java @@ -417,9 +417,21 @@ private static void processFrequency( private static final Set AVAILABLE_TIME_ZONE_IDS = ZoneId.getAvailableZoneIds(); // cache because it returns new set copy every time + private static final Map TIME_ZONES_OVERRIDES; + + static { + HashMap timeZonesOverrides = new HashMap<>(); // #oldAndroidDevice + timeZonesOverrides.put("America/Vancouver", "America/Phoenix"); // time zone rule changed to UTC-7 all year round + timeZonesOverrides.put("America/Edmonton", "America/Regina"); // time zone rule changed to UTC-6 all year round + timeZonesOverrides.put("America/Winnipeg", "America/Cancun"); // time zone rule changed to UTC-5 all year round + timeZonesOverrides.put("America/Yellowknife", "America/Regina"); // time zone rule changed to UTC-6 all year round + timeZonesOverrides.put("America/Inuvik", "America/Regina"); // time zone rule changed to UTC-6 all year round + TIME_ZONES_OVERRIDES = timeZonesOverrides; + } + private static void processAgency(GAgencyTools agencyTools, GSpec gSpec, HashMap line) { try { - final GAgency gAgency = GAgency.fromLine(line, AVAILABLE_TIME_ZONE_IDS, agencyTools.getAgencyDefaultLanguage()); + final GAgency gAgency = GAgency.fromLine(line, AVAILABLE_TIME_ZONE_IDS, TIME_ZONES_OVERRIDES, agencyTools.getAgencyDefaultLanguage()); if (agencyTools.excludeAgency(gAgency)) { MTLog.logDebug("processAgency() > SKIP (exclude agency)"); return; diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GAgency.kt b/src/main/java/org/mtransit/parser/gtfs/data/GAgency.kt index 68dbea3..8a5ca58 100644 --- a/src/main/java/org/mtransit/parser/gtfs/data/GAgency.kt +++ b/src/main/java/org/mtransit/parser/gtfs/data/GAgency.kt @@ -82,11 +82,12 @@ data class GAgency( private const val AGENCY_EMAIL = "agency_email" // Optional @JvmStatic - fun fromLine(line: Map, availableZoneIds: Set, defaultLanguage: String?) = GAgency( + fun fromLine(line: Map, availableZoneIds: Set, timeZonesOverrides: Map, defaultLanguage: String?) = GAgency( agencyId = line[AGENCY_ID].orEmpty(), agencyName = line[AGENCY_NAME] ?: throw MTLog.Fatal("Invalid GAgency from $line!"), agencyUrl = line[AGENCY_URL] ?: throw MTLog.Fatal("Invalid GAgency from $line!"), agencyTimezone = line[AGENCY_TIMEZONE]?.trim() + ?.let { timeZonesOverrides[it] ?: it } ?.takeIf { availableZoneIds.contains(it) } ?: throw MTLog.Fatal("Invalid GAgency from $line!"), agencyLang = line[AGENCY_LANG]?.takeIf { it.isNotBlank() } ?: defaultLanguage?.takeIf { it.isNotBlank() }, From 1d7013a00438e67c3080ab6d5c30ef3d38bc5593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 10 Nov 2026 15:05:54 -0500 Subject: [PATCH 2/4] PR comments --- src/main/java/org/mtransit/parser/gtfs/GReader.java | 4 ++-- src/main/java/org/mtransit/parser/gtfs/data/GAgency.kt | 8 +++++++- src/main/java/org/mtransit/parser/gtfs/data/GStop.kt | 9 ++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/mtransit/parser/gtfs/GReader.java b/src/main/java/org/mtransit/parser/gtfs/GReader.java index 551ae62..017ee3b 100644 --- a/src/main/java/org/mtransit/parser/gtfs/GReader.java +++ b/src/main/java/org/mtransit/parser/gtfs/GReader.java @@ -570,8 +570,8 @@ private static void processStop(GAgencyTools agencyTools, GSpec gSpec, Map, availableZoneIds: Set, timeZonesOverrides: Map, defaultLanguage: String?) = GAgency( + fun fromLine( + line: Map, + availableZoneIds: Set, + timeZonesOverrides: Map, + defaultLanguage: String?, + ) = GAgency( agencyId = line[AGENCY_ID].orEmpty(), agencyName = line[AGENCY_NAME] ?: throw MTLog.Fatal("Invalid GAgency from $line!"), agencyUrl = line[AGENCY_URL] ?: throw MTLog.Fatal("Invalid GAgency from $line!"), agencyTimezone = line[AGENCY_TIMEZONE]?.trim() + ?.takeIf { it.isNotBlank() } ?.let { timeZonesOverrides[it] ?: it } ?.takeIf { availableZoneIds.contains(it) } ?: throw MTLog.Fatal("Invalid GAgency from $line!"), diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GStop.kt b/src/main/java/org/mtransit/parser/gtfs/data/GStop.kt index 3e2df89..a3e95e7 100644 --- a/src/main/java/org/mtransit/parser/gtfs/data/GStop.kt +++ b/src/main/java/org/mtransit/parser/gtfs/data/GStop.kt @@ -125,7 +125,13 @@ data class GStop( @JvmOverloads @JvmStatic - fun fromLine(line: Map, agencyTimezone: String?, availableZoneIds: Set, agencyTools: GAgencyTools? = null) = GStop( + fun fromLine( + line: Map, + agencyTimezone: String?, + availableZoneIds: Set, + timeZonesOverrides: Map, + agencyTools: GAgencyTools? = null, + ) = GStop( stopId = line[STOP_ID]?.trim() ?.let { agencyTools?.cleanStopOriginalId(it) ?: it } ?: throw MTLog.Fatal("Invalid GStop from $line!"), @@ -138,6 +144,7 @@ data class GStop( ?.let { agencyTools?.cleanStopOriginalId(it) ?: it }, stopTimezone = line[STOP_TIMEZONE]?.trim() ?.takeIf { it.isNotBlank() } + ?.let { timeZonesOverrides[it] ?: it } ?.also { gStopTimezone -> if (!availableZoneIds.contains(gStopTimezone)) { throw MTLog.Fatal("Invalid stop timezone in $line!") From 5f578b6c6241c9d1f9149aec2549bb8b5a12789a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 10 Nov 2026 15:18:03 -0500 Subject: [PATCH 3/4] PR comments --- .../org/mtransit/parser/gtfs/GReader.java | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/mtransit/parser/gtfs/GReader.java b/src/main/java/org/mtransit/parser/gtfs/GReader.java index 017ee3b..ea87aba 100644 --- a/src/main/java/org/mtransit/parser/gtfs/GReader.java +++ b/src/main/java/org/mtransit/parser/gtfs/GReader.java @@ -417,15 +417,28 @@ private static void processFrequency( private static final Set AVAILABLE_TIME_ZONE_IDS = ZoneId.getAvailableZoneIds(); // cache because it returns new set copy every time + private static final String TIME_ZONE_UTC_7_FOREVER = "America/Phoenix"; + private static final String TIME_ZONE_UTC_6_FOREVER = "America/Regina"; + private static final String TIME_ZONE_UTC_5_FOREVER = "America/Cancun"; + private static final Map TIME_ZONES_OVERRIDES; static { - HashMap timeZonesOverrides = new HashMap<>(); // #oldAndroidDevice - timeZonesOverrides.put("America/Vancouver", "America/Phoenix"); // time zone rule changed to UTC-7 all year round - timeZonesOverrides.put("America/Edmonton", "America/Regina"); // time zone rule changed to UTC-6 all year round - timeZonesOverrides.put("America/Winnipeg", "America/Cancun"); // time zone rule changed to UTC-5 all year round - timeZonesOverrides.put("America/Yellowknife", "America/Regina"); // time zone rule changed to UTC-6 all year round - timeZonesOverrides.put("America/Inuvik", "America/Regina"); // time zone rule changed to UTC-6 all year round + HashMap timeZonesOverrides = new HashMap<>(); // #oldAndroidDeviceEmulator + // Canada - BC + timeZonesOverrides.put("America/Vancouver", TIME_ZONE_UTC_7_FOREVER); + timeZonesOverrides.put("Canada/Pacific", TIME_ZONE_UTC_7_FOREVER); // Legacy Alias (Pointer) + // Canada - AB + timeZonesOverrides.put("America/Edmonton", TIME_ZONE_UTC_6_FOREVER); + timeZonesOverrides.put("Canada/Mountain", TIME_ZONE_UTC_6_FOREVER); // Legacy Alias (Pointer) + // Canada - NT + timeZonesOverrides.put("America/Yellowknife", TIME_ZONE_UTC_6_FOREVER); + timeZonesOverrides.put("America/Inuvik", TIME_ZONE_UTC_6_FOREVER); + // Canada - AB + timeZonesOverrides.put("America/Winnipeg", TIME_ZONE_UTC_5_FOREVER); + timeZonesOverrides.put("Canada/Central", TIME_ZONE_UTC_5_FOREVER); // Legacy Alias (Pointer) + // Canada - ON + timeZonesOverrides.put("America/Rainy_River", TIME_ZONE_UTC_5_FOREVER); // (different from the rest of ON) TIME_ZONES_OVERRIDES = timeZonesOverrides; } From 59e50ba7cdbbd35485c4188084d5e1f3d494b3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 10 Nov 2026 15:37:38 -0500 Subject: [PATCH 4/4] fix --- .../org/mtransit/parser/gtfs/GReader.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/mtransit/parser/gtfs/GReader.java b/src/main/java/org/mtransit/parser/gtfs/GReader.java index ea87aba..0c03af4 100644 --- a/src/main/java/org/mtransit/parser/gtfs/GReader.java +++ b/src/main/java/org/mtransit/parser/gtfs/GReader.java @@ -421,26 +421,22 @@ private static void processFrequency( private static final String TIME_ZONE_UTC_6_FOREVER = "America/Regina"; private static final String TIME_ZONE_UTC_5_FOREVER = "America/Cancun"; - private static final Map TIME_ZONES_OVERRIDES; - - static { - HashMap timeZonesOverrides = new HashMap<>(); // #oldAndroidDeviceEmulator - // Canada - BC - timeZonesOverrides.put("America/Vancouver", TIME_ZONE_UTC_7_FOREVER); - timeZonesOverrides.put("Canada/Pacific", TIME_ZONE_UTC_7_FOREVER); // Legacy Alias (Pointer) - // Canada - AB - timeZonesOverrides.put("America/Edmonton", TIME_ZONE_UTC_6_FOREVER); - timeZonesOverrides.put("Canada/Mountain", TIME_ZONE_UTC_6_FOREVER); // Legacy Alias (Pointer) - // Canada - NT - timeZonesOverrides.put("America/Yellowknife", TIME_ZONE_UTC_6_FOREVER); - timeZonesOverrides.put("America/Inuvik", TIME_ZONE_UTC_6_FOREVER); - // Canada - AB - timeZonesOverrides.put("America/Winnipeg", TIME_ZONE_UTC_5_FOREVER); - timeZonesOverrides.put("Canada/Central", TIME_ZONE_UTC_5_FOREVER); // Legacy Alias (Pointer) - // Canada - ON - timeZonesOverrides.put("America/Rainy_River", TIME_ZONE_UTC_5_FOREVER); // (different from the rest of ON) - TIME_ZONES_OVERRIDES = timeZonesOverrides; - } + private static final Map TIME_ZONES_OVERRIDES = Map.of( + // Canada - BC + "America/Vancouver", TIME_ZONE_UTC_7_FOREVER, + "Canada/Pacific", TIME_ZONE_UTC_7_FOREVER, // Legacy Alias (Pointer) + // Canada - AB + "America/Edmonton", TIME_ZONE_UTC_6_FOREVER, + "Canada/Mountain", TIME_ZONE_UTC_6_FOREVER, // Legacy Alias (Pointer) + // Canada - NT + "America/Yellowknife", TIME_ZONE_UTC_6_FOREVER, + "America/Inuvik", TIME_ZONE_UTC_6_FOREVER, + // Canada - MB + "America/Winnipeg", TIME_ZONE_UTC_5_FOREVER, + "Canada/Central", TIME_ZONE_UTC_5_FOREVER, // Legacy Alias (Pointer) + // Canada - ON + "America/Rainy_River", TIME_ZONE_UTC_5_FOREVER // (different from the rest of ON) + ); private static void processAgency(GAgencyTools agencyTools, GSpec gSpec, HashMap line) { try {