-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6494 from HSLdevcom/maxStopCountForMode-default-fix
Use default max stop count for mode from routing defaults in transfer requests
- Loading branch information
Showing
9 changed files
with
319 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
163 changes: 163 additions & 0 deletions
163
...n/src/main/java/org/opentripplanner/routing/api/request/preference/MaxStopCountLimit.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| package org.opentripplanner.routing.api.request.preference; | ||
|
|
||
| import java.util.EnumMap; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.function.Consumer; | ||
| import org.opentripplanner.routing.api.request.StreetMode; | ||
| import org.opentripplanner.utils.lang.IntUtils; | ||
| import org.opentripplanner.utils.tostring.ToStringBuilder; | ||
|
|
||
| /** | ||
| * This class is used for storing default and mode specific stop count limits for access and egress | ||
| * routing. | ||
| */ | ||
| public class MaxStopCountLimit { | ||
|
|
||
| private static final int DEFAULT_LIMIT = 500; | ||
| private static final Map<StreetMode, Integer> DEFAULT_FOR_MODES = Map.of(); | ||
|
|
||
| public static final MaxStopCountLimit DEFAULT = new MaxStopCountLimit(); | ||
|
|
||
| private final int defaultLimit; | ||
| private final Map<StreetMode, Integer> limitsForModes; | ||
|
|
||
| public MaxStopCountLimit() { | ||
| this.defaultLimit = DEFAULT_LIMIT; | ||
| this.limitsForModes = DEFAULT_FOR_MODES; | ||
| } | ||
|
|
||
| MaxStopCountLimit(Builder builder) { | ||
| this.defaultLimit = IntUtils.requireNotNegative(builder.defaultLimit()); | ||
| this.limitsForModes = builder.copyCustomLimits(); | ||
| } | ||
|
|
||
| public static Builder of() { | ||
| return DEFAULT.copyOf(); | ||
| } | ||
|
|
||
| public Builder copyOf() { | ||
| return new Builder(this); | ||
| } | ||
|
|
||
| /** | ||
| * Get the max stop count limit for mode. If no custom value is defined, default is used. | ||
| */ | ||
| public int limitForMode(StreetMode mode) { | ||
| return limitsForModes.getOrDefault(mode, defaultLimit); | ||
| } | ||
|
|
||
| public int defaultLimit() { | ||
| return defaultLimit; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return ToStringBuilder | ||
| .of(MaxStopCountLimit.class) | ||
| .addNum("defaultLimit", defaultLimit, DEFAULT_LIMIT) | ||
| .addObj("limitsForModes", limitsForModes, DEFAULT_FOR_MODES) | ||
| .toString(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
|
|
||
| var that = (MaxStopCountLimit) o; | ||
|
|
||
| return (defaultLimit == that.defaultLimit && limitsForModes.equals(that.limitsForModes)); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(defaultLimit, limitsForModes); | ||
| } | ||
|
|
||
| private Map<StreetMode, Integer> limitsForModes() { | ||
| return limitsForModes; | ||
| } | ||
|
|
||
| private boolean hasCustomLimit(StreetMode mode) { | ||
| return limitsForModes.containsKey(mode); | ||
| } | ||
|
|
||
| public static class Builder { | ||
|
|
||
| private final MaxStopCountLimit original; | ||
| private int defaultLimit; | ||
| private Map<StreetMode, Integer> limitsForModes = null; | ||
|
|
||
| Builder(MaxStopCountLimit original) { | ||
| this.original = original; | ||
| this.defaultLimit = original.defaultLimit(); | ||
| } | ||
|
|
||
| int defaultLimit() { | ||
| return defaultLimit; | ||
| } | ||
|
|
||
| public Builder withDefaultLimit(int defaultLimit) { | ||
| this.defaultLimit = defaultLimit; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder with(StreetMode mode, Integer limit) { | ||
| // Lazy initialize the valueForEnum map | ||
| if (limitsForModes == null) { | ||
| limitsForModes = new EnumMap<>(StreetMode.class); | ||
| for (StreetMode it : StreetMode.values()) { | ||
| if (original.hasCustomLimit(it)) { | ||
| limitsForModes.put(it, original.limitForMode(it)); | ||
| } | ||
| } | ||
| } | ||
| limitsForModes.put(mode, limit); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withLimitsForModes(Map<StreetMode, Integer> limitsForModes) { | ||
| for (Map.Entry<StreetMode, Integer> e : limitsForModes.entrySet()) { | ||
| with(e.getKey(), e.getValue()); | ||
| } | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Build a copy of the current values, excluding the defaultLimit from the map. This | ||
| * ensures equality and makes a defensive copy of the builder values. Hence, the builder | ||
| * can be used to generate new values if desired. | ||
| * */ | ||
| Map<StreetMode, Integer> copyCustomLimits() { | ||
| if (limitsForModes == null) { | ||
| // The limitForMode is protected and should never be mutated, so we can reuse it | ||
| return original.limitsForModes(); | ||
| } | ||
|
|
||
| var copy = new EnumMap<StreetMode, Integer>(StreetMode.class); | ||
| for (Map.Entry<StreetMode, Integer> it : limitsForModes.entrySet()) { | ||
| if (defaultLimit != it.getValue()) { | ||
| copy.put(it.getKey(), it.getValue()); | ||
| } | ||
| } | ||
| return copy; | ||
| } | ||
|
|
||
| public Builder apply(Consumer<Builder> body) { | ||
| body.accept(this); | ||
| return this; | ||
| } | ||
|
|
||
| public MaxStopCountLimit build() { | ||
| var it = new MaxStopCountLimit(this); | ||
|
|
||
| // Return the original if there are no changes, the subscriber is not notified. | ||
| if (original != null && original.equals(it)) { | ||
| return original; | ||
| } | ||
|
|
||
| return it; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.