Skip to content

Strings cleaner > fix Line replacement & always "@" #29

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 3 commits into from
Mar 26, 2026
Merged

Strings cleaner > fix Line replacement & always "@" #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c48025
Strings cleaner > fix Line replacement & always "@"
mmathieum Mar 26, 2026
d985b41
Update src/main/java/org/mtransit/commons/CleanUtils.java
mmathieum Mar 26, 2026
b32739f
Fix formatting of LINE and LINE_REPLACEMENT variables
mmathieum Mar 26, 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
3 changes: 2 additions & 1 deletion 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 @@ -722,7 +722,8 @@ public static String cleanMergedID(@NotNull String mergedId) {
return ID_MERGED.matcher(mergedId).replaceAll(ID_MERGED_REPLACEMENT);
}

static final Pattern LINE = cleanWords("line");
static final Pattern LINE = Pattern.compile("(^|\\s)(line)(\\s|$)", Pattern.CASE_INSENSITIVE);
static final String LINE_REPLACEMENT = "$1$3";

// http://www.semaphorecorp.com/cgi/abbrev.html
private static final Pattern STREET = cleanWords("street");
Expand Down
4 changes: 2 additions & 2 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 @@ -17,7 +17,7 @@ object StringsCleaner {
): String {
var routeLongName = originalRouteLongName
if (languages?.contains(Locale.ENGLISH) == true) {
routeLongName = CleanUtils.LINE.matcher(routeLongName).replaceAll(EMPTY)
routeLongName = CleanUtils.LINE.matcher(routeLongName).replaceAll(CleanUtils.LINE_REPLACEMENT)
}
routeLongName = cleanString(routeLongName, languages, lowerUCStrings, lowerUCWords, *ignoredUCWords, short = false)
return routeLongName
Expand Down Expand Up @@ -108,9 +108,9 @@ object StringsCleaner {
string = CleanUtils.cleanSlashes(string)
if (languages?.contains(Locale.ENGLISH) == true) {
string = CleanUtils.fixMcXCase(string)
string = CleanUtils.CLEAN_AT.matcher(string).replaceAll(CleanUtils.CLEAN_AT_REPLACEMENT)
if (short) {
string = CleanUtils.CLEAN_AND.matcher(string).replaceAll(CleanUtils.CLEAN_AND_REPLACEMENT)
string = CleanUtils.CLEAN_AT.matcher(string).replaceAll(CleanUtils.CLEAN_AT_REPLACEMENT)
string = CleanUtils.cleanStreetTypes(string)
string = CleanUtils.cleanNumbers(string)
}
Expand Down