From c268f5938b66459aa3ee0f7a769111735ec06c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Thu, 26 Mar 2026 19:45:21 -0400 Subject: [PATCH 1/2] Strings cleaner > improvements... --- src/main/java/org/mtransit/commons/StringsCleaner.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mtransit/commons/StringsCleaner.kt b/src/main/java/org/mtransit/commons/StringsCleaner.kt index 87d2759..ebc971f 100644 --- a/src/main/java/org/mtransit/commons/StringsCleaner.kt +++ b/src/main/java/org/mtransit/commons/StringsCleaner.kt @@ -5,6 +5,8 @@ import java.util.Locale object StringsCleaner { + private const val ROUTE_LONG_NAME_SHORT_MAX_LENGTH = 33 + @JvmOverloads @JvmStatic fun cleanRouteLongName( @@ -19,6 +21,7 @@ object StringsCleaner { if (languages?.contains(Locale.ENGLISH) == true) { 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 = false) return routeLongName } @@ -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 } @@ -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 } From 470462b61a4739e8dfbcef7e6669aa75d3960f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Fri, 27 Mar 2026 08:25:30 -0400 Subject: [PATCH 2/2] fix --- src/main/java/org/mtransit/commons/StringsCleaner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/mtransit/commons/StringsCleaner.kt b/src/main/java/org/mtransit/commons/StringsCleaner.kt index ebc971f..dbabfe9 100644 --- a/src/main/java/org/mtransit/commons/StringsCleaner.kt +++ b/src/main/java/org/mtransit/commons/StringsCleaner.kt @@ -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 = false) + routeLongName = cleanString(routeLongName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = makeShorter) return routeLongName }