diff --git a/agency-parser/src/main/java/org/mtransit/parser/ca_gatineau_sto_bus/GatineauSTOBusAgencyTools.java b/agency-parser/src/main/java/org/mtransit/parser/ca_gatineau_sto_bus/GatineauSTOBusAgencyTools.java index 5cda234d98..be3fe00518 100644 --- a/agency-parser/src/main/java/org/mtransit/parser/ca_gatineau_sto_bus/GatineauSTOBusAgencyTools.java +++ b/agency-parser/src/main/java/org/mtransit/parser/ca_gatineau_sto_bus/GatineauSTOBusAgencyTools.java @@ -29,11 +29,6 @@ public static void main(@NotNull String[] args) { new GatineauSTOBusAgencyTools().start(args); } - @Override - public boolean defaultExcludeEnabled() { - return true; - } - @NotNull @Override public String getAgencyName() { @@ -68,7 +63,7 @@ public String cleanRouteLongName(@NotNull String routeLongName) { routeLongName = CleanUtils.toLowerCaseUpperCaseWords(Locale.FRENCH, routeLongName, getIgnoredWords()); routeLongName = CEGEP_GABRIELLE_ROY_.matcher(routeLongName).replaceAll(CEGEP_GABRIELLE_ROY_REPLACEMENT); routeLongName = CleanUtils.cleanSlashes(routeLongName); - return CleanUtils.cleanLabel(routeLongName); + return CleanUtils.cleanLabel(getFirstLanguageNN(), routeLongName); } @Override @@ -482,7 +477,7 @@ public String cleanStopName(@NotNull String gStopName) { @Override public String getStopCode(@NotNull GStop gStop) { if (StringUtils.isEmpty(gStop.getStopCode())) { - //noinspection deprecation + //noinspection DiscouragedApi return gStop.getStopId(); // use stop ID as stop code } return super.getStopCode(gStop); @@ -490,7 +485,7 @@ public String getStopCode(@NotNull GStop gStop) { @Override public int getStopId(@NotNull GStop gStop) { - //noinspection deprecation + //noinspection DiscouragedApi final String stopId = gStop.getStopId(); if (!CharUtils.isDigitsOnly(stopId)) { final Matcher matcher = DIGITS.matcher(stopId); diff --git a/app-android/src/main/res/values/ca_sto_values_disabled.xml b/app-android/src/main/res/values/ca_sto_values_disabled.xml index 2629edee32..2f40499b89 100644 --- a/app-android/src/main/res/values/ca_sto_values_disabled.xml +++ b/app-android/src/main/res/values/ca_sto_values_disabled.xml @@ -1,8 +1,3 @@ - 2 - @string/gtfs_rts_authority - @string/gtfs_rts_short_name - @string/gtfs_rts_authority - @string/gtfs_rts_color - \ No newline at end of file + diff --git a/app-android/src/main/res/values/gtfs_real_time_values.xml b/app-android/src/main/res/values/gtfs_real_time_values.xml index 2e613916ce..b2464ed34b 100644 --- a/app-android/src/main/res/values/gtfs_real_time_values.xml +++ b/app-android/src/main/res/values/gtfs_real_time_values.xml @@ -1,8 +1,5 @@ - - 1 - @string/gtfs_rts_authority - false + https://gtfs.sto.ca/download.php?file=alert&key=%1$s&hash=%2$s https://gtfs.sto.ca/download.php?file=vehicule&key=%1$s&hash=%2$s https://gtfs.sto.ca/download.php?file=trip&key=%1$s&hash=%2$s @@ -14,9 +11,4 @@ - - - - - @string/gtfs_rts_timezone diff --git a/app-android/src/main/res/values/gtfs_rts_values.xml b/app-android/src/main/res/values/gtfs_rts_values.xml index a5ab654348..b9c75b538f 100755 --- a/app-android/src/main/res/values/gtfs_rts_values.xml +++ b/app-android/src/main/res/values/gtfs_rts_values.xml @@ -1,7 +1,6 @@ 20260331 - @string/gtfs_rts_authority https://www.sto.ca/en/contact-us/ https://www.sto.ca/nous-joindre/ https://www.sto.ca/en/fares diff --git a/app-android/src/main/res/values/twitter_values.xml b/app-android/src/main/res/values/twitter_values.xml index cebf76503f..02cf63c664 100644 --- a/app-android/src/main/res/values/twitter_values.xml +++ b/app-android/src/main/res/values/twitter_values.xml @@ -1,26 +1,11 @@ - 4 - @string/gtfs_rts_authority - @string/gtfs_rts_color STOGatineau 4308740555 - - @string/news_provider_language_unknown_show_all - - - @string/twitter_color - - - @string/twitter_target_for_poi_authority - - - @integer/news_provider_severity_info_agency - @string/news_provider_noteworthy_info diff --git a/app-android/src/main/res/values/youtube_values.xml b/app-android/src/main/res/values/youtube_values.xml index 18428f833f..d488ea325b 100755 --- a/app-android/src/main/res/values/youtube_values.xml +++ b/app-android/src/main/res/values/youtube_values.xml @@ -1,39 +1,6 @@ - 2 - @string/gtfs_rts_authority - @string/gtfs_rts_color - - Rapibus1 - - - UCRWwm_Ps2d-omfPlCj_vQbg - - - UURWwm_Ps2d-omfPlCj_vQbg - - - https://yt3.ggpht.com/pZdy9xz_Cd5_9S6l-Gcx0MQnaOA1IhRYExZ4uYW0CTr5Szy5OAkgR-87FnWPm9gWphLGmccw=s88-c-k-c0x00ffffff-no-rj - - - @string/gtfs_rts_short_name - https://www.youtube.com/user/Rapibus1 - - @string/news_provider_language_unknown_show_all - - - @string/youtube_color - - - @string/youtube_target_for_poi_authority - - - @integer/news_provider_severity_info_agency - - - @string/news_provider_noteworthy_long_term -