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
16 changes: 13 additions & 3 deletions src/main/java/org/mtransit/commons/StringsCleaner.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,24 @@ object StringsCleaner {
"""(?x)
# Alternative 1: "line <name>" at start or after space
( (^|\s+) line \s+ ([\p{L}\p{N}]+) )
|
""".trimIndent(),
RegexOption.IGNORE_CASE
)
private const val LINE_AND_SHORT_NAME_REPLACEMENT = "$2$3"

private const val SHORT_NAME_AND_LINE_MIN_LENGTH = ROUTE_LONG_NAME_SHORT_MAX_LENGTH.div(3)
Comment thread
mmathieum marked this conversation as resolved.
Resolved
private val SHORT_NAME_AND_LINE = Regex(
"""(?x)
# Alternative 2: "<name> line" at the end of the string
(
^
( ( [\p{L}\p{N}]+ ( - | \s+(?!line\b) | ' | \.\s+(?!line\b) ) )*+ )
( ( [\p{L}\p{N}]+ ( \s*-\s* | \s+(?!line\b) | ' | \.\s+(?!line\b) ) )*+ )
( [\p{L}\p{N}]+ ) \s+ line ( \s* $ )
)
""".trimIndent(),
RegexOption.IGNORE_CASE
)
private const val LINE_AND_SHORT_NAME_REPLACEMENT = "$2$3$5$8"
private const val SHORT_NAME_AND_LINE_REPLACEMENT = "$2$5"

private val FR_LIGNE_AND_SHORT_NAME = Regex("""(^|\s+)ligne\s+([\p{L}\p{N}]+)""", RegexOption.IGNORE_CASE)
private const val FR_LIGNE_AND_SHORT_NAME_REPLACEMENT = "$1$2"
Expand All @@ -40,6 +47,9 @@ object StringsCleaner {
var routeLongName = originalRouteLongName
if (languages?.contains(Locale.ENGLISH) == true) {
routeLongName = LINE_AND_SHORT_NAME.replace(routeLongName, LINE_AND_SHORT_NAME_REPLACEMENT)
if (routeLongName.length > SHORT_NAME_AND_LINE_MIN_LENGTH && routeLongName.contains(' ')) { // avoid 'Tenth line' -> 'Tenth'
Comment thread
mmathieum marked this conversation as resolved.
Resolved
routeLongName = SHORT_NAME_AND_LINE.replace(routeLongName, SHORT_NAME_AND_LINE_REPLACEMENT)
}
}
if (languages?.contains(Locale.FRENCH) == true) {
routeLongName = FR_LIGNE_AND_SHORT_NAME.replace(routeLongName, FR_LIGNE_AND_SHORT_NAME_REPLACEMENT)
Expand Down
9 changes: 7 additions & 2 deletions src/test/java/org/mtransit/commons/StringsCleanerTests.kt
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class StringsCleanerTests {
"Yonge - University Line".let {
StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 1)
}.let { result ->
assertEquals("Yonge - University Line", result)
assertEquals("Yonge - University", result)
}
"St. Clair Line".let {
StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 1)
Expand All @@ -137,7 +137,7 @@ class StringsCleanerTests {
"Tenth Line".let {
StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3)
}.let { result ->
assertEquals("Tenth", result)
assertEquals("Tenth Line", result)
}
"Place Orléans Line".let {
StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3)
Expand All @@ -149,6 +149,11 @@ class StringsCleanerTests {
}.let { result ->
assertEquals("Place D'Orléans", result)
}
"Line Place D'Orléans".let {
StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3)
}.let { result ->
assertEquals("Place D'Orléans", result)
}
"Line 10".let {
StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3)
}.let { result ->
Expand Down
Loading