diff --git a/src/main/java/org/mtransit/parser/DefaultAgencyTools.java b/src/main/java/org/mtransit/parser/DefaultAgencyTools.java index f54a349..ae9b41f 100644 --- a/src/main/java/org/mtransit/parser/DefaultAgencyTools.java +++ b/src/main/java/org/mtransit/parser/DefaultAgencyTools.java @@ -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; } @@ -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; } diff --git a/src/main/java/org/mtransit/parser/config/gtfs/data/RouteConfig.kt b/src/main/java/org/mtransit/parser/config/gtfs/data/RouteConfig.kt index 8f7dbd3..98b1c3a 100644 --- a/src/main/java/org/mtransit/parser/config/gtfs/data/RouteConfig.kt +++ b/src/main/java/org/mtransit/parser/config/gtfs/data/RouteConfig.kt @@ -190,8 +190,6 @@ data class RouteConfig( val routeLongName: String? = null, @SerialName("color") val color: String, - @SerialName("override") - val override: Boolean = false, ) @Serializable @@ -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) }