Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 27 additions & 2 deletions src/main/java/org/mtransit/parser/DefaultAgencyTools.java
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,15 @@ public String cleanRouteLongName(@NotNull String routeLongName) {
}
routeLongName = Configs.getRouteConfig().cleanRouteLongName(getFirstLanguageNN(), routeLongName);
if (defaultStringsCleanerEnabled()) {
return StringsCleaner.cleanRouteLongName(routeLongName, getSupportedLanguages(), getAgencyRouteType(), lowerUCStrings(), lowerUCWords(), getIgnoreUCWords());
return StringsCleaner.cleanRouteLongName(
routeLongName,
getSupportedLanguages(),
getAgencyRouteType(),
lowerUCStrings(),
lowerUCWords(),
lowerUCWordsMinPct(),
getIgnoreUCWords()
);
}
return org.mtransit.commons.CleanUtils.cleanLabel(getFirstLanguageNN(), routeLongName);
}
Expand All @@ -695,6 +703,14 @@ public boolean lowerUCWords() {
return false; // OPT-IN feature
}

@Nullable
private Float lowerUCWordsMinPct() {
Comment thread
mmathieum marked this conversation as resolved.
if (Configs.getAgencyConfig() != null) {
return Configs.getAgencyConfig().getToLowerUpperCaseWordsMinPct();
}
return null;
}

@Override
public boolean lowerUCStrings() {
if (Configs.getAgencyConfig() != null) {
Expand Down Expand Up @@ -847,6 +863,7 @@ public String cleanTripHeadsign(@NotNull String tripHeadsign) {
getAgencyRouteType(),
lowerUCStrings(),
lowerUCWords(),
lowerUCWordsMinPct(),
getIgnoreUCWords(),
Configs.getRouteConfig().getTripHeadsignRemoveVia()
);
Expand Down Expand Up @@ -1265,7 +1282,15 @@ public boolean excludeCalendar(@NotNull GCalendar gCalendar) {
public String cleanStopName(@NotNull String gStopName) {
gStopName = Configs.getRouteConfig().cleanStopName(getFirstLanguageNN(), gStopName);
if (defaultStringsCleanerEnabled()) {
return StringsCleaner.cleanStopName(gStopName, getSupportedLanguages(), getAgencyRouteType(), lowerUCStrings(), lowerUCWords(), getIgnoreUCWords());
return StringsCleaner.cleanStopName(
gStopName,
getSupportedLanguages(),
getAgencyRouteType(),
lowerUCStrings(),
lowerUCWords(),
lowerUCWordsMinPct(),
getIgnoreUCWords()
);
}
return org.mtransit.commons.CleanUtils.cleanLabel(getFirstLanguageNN(), gStopName);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ data class AgencyConfig(
val toLowerUpperCaseStrings: Boolean = false, // OPT-IN feature
@SerialName("to_lower_upper_case_words")
val toLowerUpperCaseWords: Boolean = false, // OPT-IN feature
@SerialName("to_lower_upper_case_words_min_pct")
val toLowerUpperCaseWordsMinPct: Float? = null, // OPT-IN feature
@SerialName("ignore_upper_case_words")
val ignoreUpperCaseWords: List<String> = emptyList(), // OPT-IN feature
// COLOR
Expand Down