diff --git a/src/main/java/org/mtransit/parser/gtfs/GReader.java b/src/main/java/org/mtransit/parser/gtfs/GReader.java index 95d0f53..0c03af4 100644 --- a/src/main/java/org/mtransit/parser/gtfs/GReader.java +++ b/src/main/java/org/mtransit/parser/gtfs/GReader.java @@ -417,9 +417,30 @@ 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 = 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 { - 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; @@ -558,8 +579,8 @@ private static void processStop(GAgencyTools agencyTools, GSpec gSpec, 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() + ?.takeIf { it.isNotBlank() } + ?.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() }, 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!")