Skip to content

Strings cleaner > fix stop name length (default zoom) #32

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 1 commit into from
Apr 22, 2026
Merged

Strings cleaner > fix stop name length (default zoom) #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 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 @@ -22,7 +22,7 @@ object StringsCleaner {
routeLongName = CleanUtils.LINE.matcher(routeLongName).replaceAll(CleanUtils.LINE_REPLACEMENT)
}
val makeShorter = routeLongName.length > ROUTE_LONG_NAME_SHORT_MAX_LENGTH && routeLongName.contains(' ')
routeLongName = cleanString(routeLongName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter)
routeLongName = cleanString(routeLongName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter, shortMaxLength = ROUTE_LONG_NAME_SHORT_MAX_LENGTH)
return routeLongName
Comment thread
mmathieum marked this conversation as resolved.
}

Expand Down Expand Up @@ -64,14 +64,14 @@ object StringsCleaner {
}
}
val makeShorter = tripHeadsign.length > TRIP_HEADSIGN_SHORT_MAX_LENGTH && tripHeadsign.contains(' ')
tripHeadsign = cleanString(tripHeadsign, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter)
tripHeadsign = cleanString(tripHeadsign, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter, shortMaxLength = TRIP_HEADSIGN_SHORT_MAX_LENGTH)
if (tripHeadsign.length > TRIP_HEADSIGN_SHORT_MAX_LENGTH) {
tripHeadsign = CleanUtils.cleanSlashes(tripHeadsign, true)
}
return tripHeadsign
}

private const val STOP_NAME_SHORT_MAX_LENGTH = 17
private const val STOP_NAME_SHORT_MAX_LENGTH = 27 // almost as much space as route long name

@JvmOverloads
@JvmStatic
Expand All @@ -96,7 +96,7 @@ object StringsCleaner {

}
val makeShorter = stopName.length > STOP_NAME_SHORT_MAX_LENGTH && stopName.contains(' ')
stopName = cleanString(stopName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter)
stopName = cleanString(stopName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter, shortMaxLength = STOP_NAME_SHORT_MAX_LENGTH)
return stopName
Comment thread
mmathieum marked this conversation as resolved.
}

Expand All @@ -106,7 +106,8 @@ object StringsCleaner {
lowerUCStrings: Boolean = false,
lowerUCWords: Boolean = false,
vararg ignoredUCWords: String = emptyArray(),
short: Boolean
short: Boolean,
shortMaxLength: Int,
): String {
var string = originalString
languages?.forEach { language ->
Expand Down Expand Up @@ -138,7 +139,7 @@ object StringsCleaner {
}
}
languages?.forEach { language ->
if (short) {
if (short && string.length > shortMaxLength) {
string = CleanUtils.cleanBounds(language, string)
}
string = CleanUtils.cleanLabel(language, string)
Expand Down