Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -482,15 +477,15 @@ 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);
}

@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);
Expand Down
7 changes: 1 addition & 6 deletions app-android/src/main/res/values/ca_sto_values_disabled.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation,UnusedResources">
<integer name="ca_sto_db_version">2</integer>
<string name="ca_sto_status_for_poi_authority">@string/gtfs_rts_authority</string>
<string name="ca_sto_news_author_name">@string/gtfs_rts_short_name</string>
<string name="ca_sto_news_target_for_poi_authority">@string/gtfs_rts_authority</string>
<string name="ca_sto_news_color">@string/gtfs_rts_color</string>
</resources>
</resources>
10 changes: 1 addition & 9 deletions app-android/src/main/res/values/gtfs_real_time_values.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation,UnusedResources">
<integer name="gtfs_real_time_db_version">1</integer>
<string name="gtfs_real_time_for_poi_authority">@string/gtfs_rts_authority</string>
<bool name="gtfs_real_time_stop_id_is_stop_code">false</bool>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation,Typos,UnusedResources">
<string name="gtfs_real_time_agency_service_alerts_url">https://gtfs.sto.ca/download.php?file=alert&amp;key=%1$s&amp;hash=%2$s</string>
<string name="gtfs_real_time_agency_vehicle_positions_url">https://gtfs.sto.ca/download.php?file=vehicule&amp;key=%1$s&amp;hash=%2$s</string>
<string name="gtfs_real_time_agency_trip_updates_url">https://gtfs.sto.ca/download.php?file=trip&amp;key=%1$s&amp;hash=%2$s</string>
Expand All @@ -14,9 +11,4 @@
<string-array name="gtfs_real_time_agency_extra_bold_words">
<item />
</string-array>
<string name="gtfs_real_time_agency_time_regex" />
<string name="gtfs_real_time_agency_time_hour_format" />
<string name="gtfs_real_time_agency_time_minute_format" />
<string name="gtfs_real_time_agency_time_ampm_format" />
<string name="gtfs_real_time_agency_time_zone">@string/gtfs_rts_timezone</string>
</resources>
1 change: 0 additions & 1 deletion app-android/src/main/res/values/gtfs_rts_values.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<integer name="gtfs_rts_db_version">20260331</integer>
<string name="gtfs_status_for_poi_authority">@string/gtfs_rts_authority</string>
<string name="gtfs_rts_contact_us">https://www.sto.ca/en/contact-us/</string>
<string name="gtfs_rts_contact_us_fr">https://www.sto.ca/nous-joindre/</string>
<string name="gtfs_rts_fares">https://www.sto.ca/en/fares</string>
Expand Down
15 changes: 0 additions & 15 deletions app-android/src/main/res/values/twitter_values.xml
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation,UnusedResources,InconsistentArrays">
<integer name="twitter_db_version">4</integer>
<string name="twitter_target_for_poi_authority">@string/gtfs_rts_authority</string>
<string name="twitter_color">@string/gtfs_rts_color</string>
<string-array name="twitter_screen_names">
<item>STOGatineau</item>
</string-array>
<string-array name="twitter_screen_names_id">
<item>4308740555</item>
</string-array>
<string-array name="twitter_screen_names_lang">
<item>@string/news_provider_language_unknown_show_all</item>
</string-array>
<string-array name="twitter_screen_names_colors">
<item>@string/twitter_color</item>
</string-array>
<string-array name="twitter_screen_names_target">
<item>@string/twitter_target_for_poi_authority</item>
</string-array>
<integer-array name="twitter_screen_names_severity">
<item>@integer/news_provider_severity_info_agency</item>
</integer-array>
<string-array name="twitter_screen_names_noteworthy">
<item>@string/news_provider_noteworthy_info</item>
</string-array>
Expand Down
33 changes: 0 additions & 33 deletions app-android/src/main/res/values/youtube_values.xml
Original file line number Diff line number Diff line change
@@ -1,39 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation,UnusedResources,InconsistentArrays,TypographyDashes">
<integer name="youtube_db_version">2</integer>
<string name="youtube_target_for_poi_authority">@string/gtfs_rts_authority</string>
<string name="youtube_color">@string/gtfs_rts_color</string>
<string-array name="youtube_channels_username">
<item>Rapibus1</item>
</string-array>
<string-array name="youtube_channels_id">
<item>UCRWwm_Ps2d-omfPlCj_vQbg</item>
</string-array>
<string-array name="youtube_channels_uploads_playlist_id">
<item>UURWwm_Ps2d-omfPlCj_vQbg</item>
</string-array>
<string-array name="youtube_channels_author_icon">
<item>https://yt3.ggpht.com/pZdy9xz_Cd5_9S6l-Gcx0MQnaOA1IhRYExZ4uYW0CTr5Szy5OAkgR-87FnWPm9gWphLGmccw=s88-c-k-c0x00ffffff-no-rj</item>
</string-array>
<string-array name="youtube_channels_author_name">
<item>@string/gtfs_rts_short_name</item>
</string-array>
<string-array name="youtube_channels_author_url">
<item>https://www.youtube.com/user/Rapibus1</item>
</string-array>
<string-array name="youtube_channels_lang">
<item>@string/news_provider_language_unknown_show_all</item>
</string-array>
<string-array name="youtube_channels_colors">
<item>@string/youtube_color</item>
</string-array>
<string-array name="youtube_channels_target">
<item>@string/youtube_target_for_poi_authority</item>
</string-array>
<integer-array name="youtube_channels_severity">
<item>@integer/news_provider_severity_info_agency</item>
</integer-array>
<string-array name="youtube_channels_noteworthy">
<item>@string/news_provider_noteworthy_long_term</item>
</string-array>
</resources>