Skip to content

JSON > fix use_route_long_name_for_missing_route_short_name #73

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
Jun 16, 2026
Merged

JSON > fix use_route_long_name_for_missing_route_short_name #73

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
6c7d639
`JSON` > fix `use_route_long_name_for_missing_route_short_name`
mmathieum Jun 16, 2026
88ad81f
PR comments
mmathieum Jun 16, 2026
cdea7c1
fix TimeZone in test
mmathieum Jun 16, 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
2 changes: 1 addition & 1 deletion src/main/java/org/mtransit/commons/DateUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import java.util.Date
object DateUtils {

@JvmStatic
fun addYears(date: Date, years: Int) =
fun addYears(date: Date, years: Int): Date =
Calendar.getInstance().apply {
time = date
add(Calendar.YEAR, years)
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/org/mtransit/parser/DefaultAgencyTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,9 +601,13 @@ public String getRouteShortName(@NotNull GRoute gRoute) {
return gRoute.getRouteLongNameOrDefault();
}
//noinspection DiscouragedApi
final String routeShortName =
String routeShortName =
useRouteIdForRouteShortName() ? gRoute.getRouteId()
: gRoute.getRouteShortName();
if (org.mtransit.commons.StringUtils.isEmpty(routeShortName)
&& Configs.getRouteConfig().getUseRouteLongNameForMissingRouteShortName()) {
routeShortName = gRoute.getRouteLongNameOrDefault();
}
Comment thread
mmathieum marked this conversation as resolved.
if (org.mtransit.commons.StringUtils.isEmpty(routeShortName)) {
return provideMissingRouteShortName(gRoute);
}
Comment thread
mmathieum marked this conversation as resolved.
Expand All @@ -628,9 +632,6 @@ public String provideMissingRouteShortName(@NotNull GRoute gRoute) {
if (routeShortNameFromConfig != null) {
return routeShortNameFromConfig;
}
Comment thread
mmathieum marked this conversation as resolved.
if (Configs.getRouteConfig().getUseRouteLongNameForMissingRouteShortName()) {
return gRoute.getRouteLongNameOrDefault();
}
throw new MTLog.Fatal("No default route short name for %s!", gRoute.toStringPlus());
}

Expand Down
18 changes: 17 additions & 1 deletion src/test/java/org/mtransit/commons/DateUtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,33 @@
package org.mtransit.commons

import java.util.Date
import java.util.TimeZone
import kotlin.test.AfterTest
import kotlin.test.BeforeTest
import kotlin.test.Test
import kotlin.test.assertEquals

class DateUtilsTest {

private var originalTimeZone: TimeZone = TimeZone.getDefault()

@BeforeTest
fun setUp() {
originalTimeZone = TimeZone.getDefault()
TimeZone.setDefault(TimeZone.getTimeZone("UTC"))
}

@AfterTest
fun tearDown() {
TimeZone.setDefault(originalTimeZone)
}

@Test
fun test_getEndOfYear() {
Date(1781570388_000L).let { // Monday, June 15, 2026 at 20:39:48 UTC-04:00 DST
DateUtils.getEndOfYear(it)
}.let { result ->
assertEquals(1798779599_999L, result.time)
assertEquals(1798761599_999L, result.time)
}
}
}