Skip to content

String cleaner > tweak short trip head-sign & stop name... #28

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 2 commits into from
Mar 26, 2026
Merged

String cleaner > tweak short trip head-sign & stop name... #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10ccb2c
String cleaner > tweak short trip head-sign & stop name...
mmathieum Mar 26, 2026
6c09874
PR comment
mmathieum Mar 26, 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
6 changes: 3 additions & 3 deletions src/main/java/org/mtransit/commons/CleanUtilsExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.mtransit.commons.CleanUtils.PLACE_CHAR_TSSE

fun makeALL_ST_REGEX() =
buildString {
append("((^\\s*|/\\s*)(")
append("((^\\s*|/\\s*)(") // |\s+ not after another word
append(
listOf(
PLACE_CHAR_ARRONDISSEMENT,
Expand All @@ -51,7 +51,7 @@ fun makeALL_ST_REGEX_REPLACEMENT() = "$2"

fun makeALL_CHARS_REGEX() =
buildString {
append("((^\\s*|/\\s*)(")
append("((^\\s*|/\\s*|\\s+)(") // |\s+ after another word
append(
listOf(
PLACE_CHAR_DE_L,
Expand All @@ -73,7 +73,7 @@ fun makeALL_CHARS_REGEX_REPLACEMENT() = "$2"

fun makeALL_FACE_A_REGEX() =
buildString {
append("((^|\\s)(")
append("((^\\s*|/\\s*|\\s+)(") // |\s+ after another word
append(
listOf(
"face à ",
Expand Down
12 changes: 9 additions & 3 deletions 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 @@ -23,6 +23,8 @@ object StringsCleaner {
return routeLongName
}

private const val TRIP_HEADSIGN_SHORT_MAX_LENGTH = 13

@JvmOverloads
@JvmStatic
fun cleanTripHeadsign(
Expand Down Expand Up @@ -54,10 +56,13 @@ object StringsCleaner {
if (languages?.contains(Locale.FRENCH) == true) {
tripHeadsign = CleanUtils.keepToFR(tripHeadsign)
}
tripHeadsign = cleanString(tripHeadsign, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = true)
val makeShorter = tripHeadsign.length > TRIP_HEADSIGN_SHORT_MAX_LENGTH
tripHeadsign = cleanString(tripHeadsign, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter)
return tripHeadsign
}

private const val STOP_NAME_SHORT_MAX_LENGTH = 17

@JvmOverloads
@JvmStatic
fun cleanStopName(
Expand All @@ -79,7 +84,8 @@ object StringsCleaner {
}

}
stopName = cleanString(stopName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = true)
val makeShorter = stopName.length > STOP_NAME_SHORT_MAX_LENGTH
stopName = cleanString(stopName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter)
return stopName
}

Expand All @@ -101,10 +107,10 @@ object StringsCleaner {
}
string = CleanUtils.cleanSlashes(string)
if (languages?.contains(Locale.ENGLISH) == true) {
string = CleanUtils.fixMcXCase(string)
if (short) {
string = CleanUtils.CLEAN_AND.matcher(string).replaceAll(CleanUtils.CLEAN_AND_REPLACEMENT)
string = CleanUtils.CLEAN_AT.matcher(string).replaceAll(CleanUtils.CLEAN_AT_REPLACEMENT)
string = CleanUtils.fixMcXCase(string)
string = CleanUtils.cleanStreetTypes(string)
string = CleanUtils.cleanNumbers(string)
}
Expand Down