Skip to content

Support for custom LC UC words min % #43

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
Jul 3, 2026
Merged

Support for custom LC UC words min % #43

Show file tree
Hide file tree
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
17 changes: 11 additions & 6 deletions 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 @@ -587,18 +587,23 @@ public static String fixMcXCase(@NotNull String string) { // Mccowan -> McCowan
"([^" + WORD_REGEX_FR + "]*)([" + WORD_REGEX_FR + "]+)([^" + WORD_REGEX_FR + "]*)",
Pattern.CASE_INSENSITIVE | RegexUtils.fUNICODE_CHARACTER_CLASS() | RegexUtils.fCANON_EQ());

public static final float DEFAULT_MIN_UPPER_CASE_PCT = .33f;

@NotNull
public static String toLowerCaseUpperCaseWords(@NotNull Locale locale, @NotNull String string, @NotNull String... ignoreWords) {
return toLowerCaseUpperCaseWords(locale, string, DEFAULT_MIN_UPPER_CASE_PCT, ignoreWords);
}

@NotNull
public static String toLowerCaseUpperCaseWords(@NotNull Locale locale, @NotNull String string, float minUCPct, @NotNull String... ignoreWords) {
if (string.isEmpty()) return string;
final float charCount = string.length();
final float upperCaseCount = CharUtils.countUpperCase(string);
final float percent = upperCaseCount / charCount;
if (percent < .33f) { // 33%
return string;
}
StringBuilder sb = new StringBuilder();
Pattern pattern = locale == Locale.FRENCH ? WORD_NON_WORDS_FR : WORD_NON_WORDS;
Matcher matcher = pattern.matcher(string);
if (percent < minUCPct) return string;
final StringBuilder sb = new StringBuilder();
final Pattern pattern = locale == Locale.FRENCH ? WORD_NON_WORDS_FR : WORD_NON_WORDS;
final Matcher matcher = pattern.matcher(string);
while (matcher.find()) {
sb.append(matcher.group(1)); // before
final String word = matcher.group(2);
Expand Down
31 changes: 27 additions & 4 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 @@ -34,6 +34,7 @@ object StringsCleaner {
@Suppress("unused") routeType: Int,
lowerUCStrings: Boolean = false,
lowerUCWords: Boolean = false,
lowerUCWordsMinPct: Float? = null,
Comment thread
mmathieum marked this conversation as resolved.
vararg ignoredUCWords: String = emptyArray(),
): String {
var routeLongName = originalRouteLongName
Expand All @@ -44,7 +45,16 @@ object StringsCleaner {
routeLongName = FR_LIGNE_AND_SHORT_NAME.replace(routeLongName, FR_LIGNE_AND_SHORT_NAME_REPLACEMENT)
}
val makeShorter = routeLongName.length > ROUTE_LONG_NAME_SHORT_MAX_LENGTH && routeLongName.contains(' ')
routeLongName = cleanString(routeLongName, languages, makeShorter, ROUTE_LONG_NAME_SHORT_MAX_LENGTH, lowerUCStrings, lowerUCWords, *ignoredUCWords)
routeLongName = cleanString(
routeLongName,
languages,
makeShorter,
ROUTE_LONG_NAME_SHORT_MAX_LENGTH,
lowerUCStrings,
lowerUCWords,
lowerUCWordsMinPct,
*ignoredUCWords
)
return routeLongName
}

Expand Down Expand Up @@ -78,6 +88,7 @@ object StringsCleaner {
routeType: Int,
lowerUCStrings: Boolean = false,
lowerUCWords: Boolean = false,
lowerUCWordsMinPct: Float? = null,
Comment thread
mmathieum marked this conversation as resolved.
vararg ignoredUCWords: String = emptyArray(),
removeVia: Boolean = false,
): String {
Expand Down Expand Up @@ -114,7 +125,16 @@ object StringsCleaner {
}
}
val makeShorter = tripHeadsign.length > TRIP_HEADSIGN_SHORT_MAX_LENGTH && tripHeadsign.contains(' ')
tripHeadsign = cleanString(tripHeadsign, languages, makeShorter, TRIP_HEADSIGN_SHORT_MAX_LENGTH, lowerUCStrings, lowerUCWords, *ignoredUCWords)
tripHeadsign = cleanString(
tripHeadsign,
languages,
makeShorter,
TRIP_HEADSIGN_SHORT_MAX_LENGTH,
lowerUCStrings,
lowerUCWords,
lowerUCWordsMinPct,
*ignoredUCWords
)
if (tripHeadsign.length > TRIP_HEADSIGN_SHORT_MAX_LENGTH) {
tripHeadsign = CleanUtils.cleanSlashes(tripHeadsign, true)
}
Expand All @@ -131,6 +151,7 @@ object StringsCleaner {
routeType: Int,
lowerUCStrings: Boolean = false,
lowerUCWords: Boolean = false,
lowerUCWordsMinPct: Float? = null,
Comment thread
mmathieum marked this conversation as resolved.
vararg ignoredUCWords: String = emptyArray(),
): String {
var stopName = originalStopName
Expand All @@ -153,7 +174,7 @@ object StringsCleaner {
}
}
val makeShorter = stopName.length > STOP_NAME_SHORT_MAX_LENGTH && stopName.contains(' ')
stopName = cleanString(stopName, languages, makeShorter, STOP_NAME_SHORT_MAX_LENGTH, lowerUCStrings, lowerUCWords, *ignoredUCWords)
stopName = cleanString(stopName, languages, makeShorter, STOP_NAME_SHORT_MAX_LENGTH, lowerUCStrings, lowerUCWords, lowerUCWordsMinPct, *ignoredUCWords)
return stopName
}

Expand All @@ -165,12 +186,13 @@ object StringsCleaner {
shortMaxLength: Int,
lowerUCStrings: Boolean = false,
lowerUCWords: Boolean = false,
lowerUCWordsMinPct: Float? = null,
Comment thread
mmathieum marked this conversation as resolved.
vararg ignoredUCWords: String = emptyArray(),
): String {
var string = originalString
languages?.forEach { language ->
if (lowerUCWords) {
string = CleanUtils.toLowerCaseUpperCaseWords(language, string, *ignoredUCWords)
string = CleanUtils.toLowerCaseUpperCaseWords(language, string, lowerUCWordsMinPct ?: CleanUtils.DEFAULT_MIN_UPPER_CASE_PCT, *ignoredUCWords)
Comment thread
mmathieum marked this conversation as resolved.
} else if (lowerUCStrings) {
string = CleanUtils.toLowerCaseUpperCaseStrings(language, string, *ignoredUCWords)
}
Expand All @@ -187,6 +209,7 @@ object StringsCleaner {
}
string = CleanUtils.cleanNumbers(string)
}

Locale.FRENCH -> {
if (short) {
string = CleanUtils.CLEAN_ET.matcher(string).replaceAll(CleanUtils.CLEAN_ET_REPLACEMENT)
Expand Down