Skip to content

Strings cleaner > FR > remove ligne from route long name & station from trip head-sign #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmathieum merged 3 commits into from
May 6, 2026
Merged

Strings cleaner > FR > remove ligne from route long name & station from trip head-sign #34

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32893ad
Strings cleaner > FR > remove "ligne" from route long name & "station…
mmathieum May 6, 2026
d207e44
PR comments
mmathieum May 6, 2026
dac3c54
Potential fix for pull request finding
mmathieum May 6, 2026
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
5 changes: 4 additions & 1 deletion src/main/java/org/mtransit/commons/CleanUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,9 @@ public static String cleanMergedID(@NotNull String mergedId) {
static final Pattern LINE = Pattern.compile("(^|\\s)(line)(\\s|$)", Pattern.CASE_INSENSITIVE);
static final String LINE_REPLACEMENT = "$1$3";

static final Pattern LINE_ = cleanWords("line");
static final Pattern FR_CA_LIGNE = cleanWords("line");
Comment thread
mmathieum marked this conversation as resolved.
Outdated

// http://www.semaphorecorp.com/cgi/abbrev.html
private static final Pattern STREET = cleanWords("street");
private static final String STREET_REPLACEMENT = cleanWordsReplacement("St");
Expand Down Expand Up @@ -1010,7 +1013,7 @@ public static String cleanStreetTypes(@NotNull String string) {
private static final String FR_CA_SECTEURS_REPLACEMENT = cleanWordsReplacementPlural("Sect");
private static final Pattern FR_CA_STATION_DE_METRO = cleanWordsFR("Station de m[é|e]tro");
private static final String FR_CA_STATION_DE_METRO_REPLACEMENT = cleanWordsReplacement("Ston mét");
private static final Pattern FR_CA_STATION = cleanWordsFR("station");
static final Pattern FR_CA_STATION = cleanWordsFR("station");
private static final String FR_CA_STATION_REPLACEMENT = cleanWordsReplacement("Ston");
private static final Pattern FR_CA_STATIONNEMENT = cleanWordsFR("stationnement");
private static final String FR_CA_STATIONNEMENT_REPLACEMENT = cleanWordsReplacement("Stat");
Expand Down
13 changes: 12 additions & 1 deletion src/main/java/org/mtransit/commons/StringsCleaner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ object StringsCleaner {
): String {
var routeLongName = originalRouteLongName
if (languages?.contains(Locale.ENGLISH) == true) {
routeLongName = CleanUtils.LINE.matcher(routeLongName).replaceAll(CleanUtils.LINE_REPLACEMENT)
routeLongName = CleanUtils.LINE_.matcher(routeLongName).replaceAll(EMPTY)
}
if (languages?.contains(Locale.FRENCH) == true) {
routeLongName = CleanUtils.FR_CA_LIGNE.matcher(routeLongName).replaceAll(EMPTY)
}
Comment thread
mmathieum marked this conversation as resolved.
val makeShorter = routeLongName.length > ROUTE_LONG_NAME_SHORT_MAX_LENGTH && routeLongName.contains(' ')
routeLongName = cleanString(routeLongName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter, shortMaxLength = ROUTE_LONG_NAME_SHORT_MAX_LENGTH)
Expand Down Expand Up @@ -50,6 +53,14 @@ object StringsCleaner {
}
}
}
if (languages?.contains(Locale.FRENCH) == true) {
when (routeType) {
1, // subway
-> {
tripHeadsign = CleanUtils.FR_CA_STATION.matcher(tripHeadsign).replaceAll(EMPTY)
}
}
Comment thread
mmathieum marked this conversation as resolved.
}
Comment thread
mmathieum marked this conversation as resolved.
if (languages?.contains(Locale.ENGLISH) == true) {
tripHeadsign = if (removeVia) {
CleanUtils.keepToAndRemoveVia(tripHeadsign)
Expand Down