From 5c480258fa32027ef5d03b6aba07f9bd64bb5c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Thu, 26 Mar 2026 15:04:24 -0400 Subject: [PATCH 1/3] Strings cleaner > fix Line replacement & always "@" --- src/main/java/org/mtransit/commons/CleanUtils.java | 3 ++- src/main/java/org/mtransit/commons/StringsCleaner.kt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/mtransit/commons/CleanUtils.java b/src/main/java/org/mtransit/commons/CleanUtils.java index 31cbd3b..c0bf9b3 100644 --- a/src/main/java/org/mtransit/commons/CleanUtils.java +++ b/src/main/java/org/mtransit/commons/CleanUtils.java @@ -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 = "$2$4"; // http://www.semaphorecorp.com/cgi/abbrev.html private static final Pattern STREET = cleanWords("street"); diff --git a/src/main/java/org/mtransit/commons/StringsCleaner.kt b/src/main/java/org/mtransit/commons/StringsCleaner.kt index 7061ce8..87d2759 100644 --- a/src/main/java/org/mtransit/commons/StringsCleaner.kt +++ b/src/main/java/org/mtransit/commons/StringsCleaner.kt @@ -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 @@ -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) } From d985b41774f07b89e3b14ea82e4b122974c12451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Thu, 26 Mar 2026 15:13:49 -0400 Subject: [PATCH 2/3] Update src/main/java/org/mtransit/commons/CleanUtils.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- src/main/java/org/mtransit/commons/CleanUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mtransit/commons/CleanUtils.java b/src/main/java/org/mtransit/commons/CleanUtils.java index c0bf9b3..b335635 100644 --- a/src/main/java/org/mtransit/commons/CleanUtils.java +++ b/src/main/java/org/mtransit/commons/CleanUtils.java @@ -722,8 +722,8 @@ public static String cleanMergedID(@NotNull String mergedId) { return ID_MERGED.matcher(mergedId).replaceAll(ID_MERGED_REPLACEMENT); } - static final Pattern LINE = Pattern.compile("((^|\\s)(line)(\\s|$))", Pattern.CASE_INSENSITIVE); - static final String LINE_REPLACEMENT = "$2$4"; +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"); From b32739f49ee9206d50a25bc539aed911ad5053bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Thu, 26 Mar 2026 15:15:13 -0400 Subject: [PATCH 3/3] Fix formatting of LINE and LINE_REPLACEMENT variables --- src/main/java/org/mtransit/commons/CleanUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mtransit/commons/CleanUtils.java b/src/main/java/org/mtransit/commons/CleanUtils.java index b335635..8f9ae47 100644 --- a/src/main/java/org/mtransit/commons/CleanUtils.java +++ b/src/main/java/org/mtransit/commons/CleanUtils.java @@ -722,8 +722,8 @@ public static String cleanMergedID(@NotNull String mergedId) { return ID_MERGED.matcher(mergedId).replaceAll(ID_MERGED_REPLACEMENT); } -static final Pattern LINE = Pattern.compile("(^|\\s)(line)(\\s|$)", Pattern.CASE_INSENSITIVE); -static final String LINE_REPLACEMENT = "$1$3"; + 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");