Skip to content

Fix route provide missing color Java<>JSON config mess #60

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 1 commit into from
Apr 15, 2026
Merged

Fix route provide missing color Java<>JSON config mess #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 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 @@ -678,7 +678,7 @@ public String getRouteColor(@NotNull GRoute gRoute, @NotNull MAgency agency) {
if (routeColorFixed == null) {
return provideMissingRouteColor(gRoute);
} else if (agency.getColor().equalsIgnoreCase(routeColorFixed)) {
return fixColor(Configs.getRouteConfig().getRouteColor(gRoute, null));
return provideMissingRouteColor(gRoute);
} else {
return routeColorFixed;
}
Comment thread
mmathieum marked this conversation as resolved.
Expand All @@ -696,7 +696,7 @@ public String getRouteColor(@NotNull GRoute gRoute) {
if (routeColorFixed == null) {
return provideMissingRouteColor(gRoute);
} else if (getAgencyColor().equalsIgnoreCase(routeColorFixed)) {
return fixColor(Configs.getRouteConfig().getRouteColor(gRoute, null));
return provideMissingRouteColor(gRoute);
} else {
return routeColorFixed;
}
Comment thread
mmathieum marked this conversation as resolved.
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/org/mtransit/parser/config/gtfs/data/RouteConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ data class RouteConfig(
val routeLongName: String? = null,
@SerialName("color")
val color: String,
@SerialName("override")
val override: Boolean = false,
)

@Serializable
Expand Down Expand Up @@ -270,15 +268,12 @@ data class RouteConfig(
?: this.routeToRouteShortNameConfigs.singleOrNull { gRoute.routeLongNameOrDefault == it.routeLongName })
?.routeShortName

@JvmOverloads
fun getRouteColor(gRoute: GRoute, defaultColor: String? = gRoute.routeColor, override: Boolean = false) =
fun getRouteColor(gRoute: GRoute) =
//noinspection DiscouragedApi
(this.routeColors.singleOrNull { gRoute.routeId == it.routeId }
?: this.routeColors.singleOrNull { gRoute.routeShortName == it.routeShortName }
?: this.routeColors.singleOrNull { gRoute.routeLongNameOrDefault == it.routeLongName })
?.takeIf { it.override || !override }
?.color
?: defaultColor

fun isRouteColorIgnored(routeColor: String) =
this.routeColorsIgnored.any { it.equals(routeColor, ignoreCase = true) }
Expand Down