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
8 changes: 4 additions & 4 deletions src/main/java/org/mtransit/parser/DefaultAgencyTools.java
Original file line number Diff line number Diff line change
Expand Up @@ -823,12 +823,12 @@ public void forgetOriginalTripId(@NotNull String gOriginalTripId) {

@Override
public boolean directionSplitterEnabled() {
return Configs.getRouteConfig().getDirectionSplitterEnabled();
return Configs.getRouteConfig().isDirectionSplitterEnabled(getTodayDateInt());
}

@Override
public boolean directionSplitterEnabled(long routeId) {
return directionSplitterEnabled();
return Configs.getRouteConfig().isDirectionSplitterEnabled(getTodayDateInt(), routeId);
}

@Override
Expand Down Expand Up @@ -891,12 +891,12 @@ public String cleanDirectionHeadsign(boolean fromStopName, @NotNull String direc

@Override
public boolean directionFinderEnabled() {
return Configs.getRouteConfig().getDirectionFinderEnabled();
return Configs.getRouteConfig().isDirectionFinderEnabled(getTodayDateInt());
}

@Override
public boolean directionFinderEnabled(long routeId, @NotNull GRoute gRoute) {
return directionFinderEnabled();
return Configs.getRouteConfig().isDirectionFinderEnabled(getTodayDateInt(), routeId);
}

@Override
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/mtransit/parser/config/gtfs/data/RouteConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,12 @@ data class RouteConfig(
val directionHeadsignRemoveRouteDesc: Boolean = false, // OPT-IN feature
@SerialName("direction_splitter_enabled")
val directionSplitterEnabled: Boolean = false, // OPT-IN feature
@SerialName("direction_splitter_disabled_until")
val directionSplitterDisabledUntil: Map<Long, String> = emptyMap(), // OPT-IN feature
@SerialName("direction_finder_enabled")
val directionFinderEnabled: Boolean = false, // OPT-IN feature
@SerialName("direction_finder_disabled_until")
val directionFinderDisabledUntil: Map<Long, String> = emptyMap(), // OPT-IN feature
@SerialName("allow_non_descriptive_head_signs")
val allowNonDescriptiveHeadSigns: Map<Long, Boolean> = emptyMap(), // OPT-IN feature
@SerialName("allow_non_descriptive_head_signs_until")
Expand Down Expand Up @@ -365,6 +369,14 @@ data class RouteConfig(
return string
}

@JvmOverloads
fun isDirectionSplitterEnabled(todayDate: Int, routeId: Long? = null) =
directionSplitterEnabled && !isAllowedUntil(directionSplitterDisabledUntil[routeId], todayDate)

@JvmOverloads
fun isDirectionFinderEnabled(todayDate: Int, routeId: Long? = null) =
directionFinderEnabled && !isAllowedUntil(directionFinderDisabledUntil[routeId], todayDate)
Comment thread
mmathieum marked this conversation as resolved.

fun allowIgnoreInvalidStopTimes(todayDate: Int) =
allowInvalidStopTimes || isAllowedUntil(allowInvalidStopTimesUntil, todayDate)

Expand Down