Skip to content

Strings cleaner > improvements... #30

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 27, 2026
Merged

Strings cleaner > improvements... #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c268f59
Strings cleaner > improvements...
mmathieum Mar 26, 2026
470462b
fix
mmathieum Mar 27, 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
9 changes: 6 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 @@ -5,6 +5,8 @@ import java.util.Locale

object StringsCleaner {

private const val ROUTE_LONG_NAME_SHORT_MAX_LENGTH = 33

@JvmOverloads
@JvmStatic
fun cleanRouteLongName(
Expand All @@ -19,7 +21,8 @@ object StringsCleaner {
if (languages?.contains(Locale.ENGLISH) == true) {
routeLongName = CleanUtils.LINE.matcher(routeLongName).replaceAll(CleanUtils.LINE_REPLACEMENT)
}
routeLongName = cleanString(routeLongName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = false)
val makeShorter = routeLongName.length > ROUTE_LONG_NAME_SHORT_MAX_LENGTH && routeLongName.contains(" ")
routeLongName = cleanString(routeLongName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter)
return routeLongName
}

Expand Down Expand Up @@ -56,7 +59,7 @@ object StringsCleaner {
if (languages?.contains(Locale.FRENCH) == true) {
tripHeadsign = CleanUtils.keepToFR(tripHeadsign)
}
val makeShorter = tripHeadsign.length > TRIP_HEADSIGN_SHORT_MAX_LENGTH
val makeShorter = tripHeadsign.length > TRIP_HEADSIGN_SHORT_MAX_LENGTH && tripHeadsign.contains(" ")
tripHeadsign = cleanString(tripHeadsign, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter)
return tripHeadsign
}
Expand Down Expand Up @@ -84,7 +87,7 @@ object StringsCleaner {
}

}
val makeShorter = stopName.length > STOP_NAME_SHORT_MAX_LENGTH
val makeShorter = stopName.length > STOP_NAME_SHORT_MAX_LENGTH && stopName.contains(" ")
stopName = cleanString(stopName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter)
return stopName
}
Expand Down