> {
int MAX_ZOOM = 20;
int CACHE_MAX_SECONDS = -1;
double EXPANSION_FACTOR = 0.25d;
-
/**
* User-visible name of the layer
*/
diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index 5c018412572..d7d9385d9b8 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -1,6 +1,8 @@
package org.opentripplanner.model;
import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.SetMultimap;
import java.time.LocalDate;
import java.util.Collection;
@@ -9,6 +11,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
@@ -80,8 +83,7 @@ public class TimetableSnapshot {
* include ones from the scheduled GTFS, as well as ones added by realtime messages and
* tracked by the TripPatternCache.
* Note that the keys do not include all scheduled TripPatterns, only those for which we have at
- * least one update. The type of the field is specifically HashMap (rather than the more general
- * Map interface) because we need to efficiently clone it.
+ * least one update.
* The members of the SortedSet (the Timetable for a particular day) are treated as copy-on-write
* when we're updating them. If an update will modify the timetable for a particular day, that
* timetable is replicated before any modifications are applied to avoid affecting any previous
@@ -91,16 +93,15 @@ public class TimetableSnapshot {
* The compound key approach better reflects the fact that there should be only one Timetable per
* TripPattern and date.
*/
- private HashMap> timetables = new HashMap();
+ private Map> timetables = new HashMap<>();
/**
* For cases where the trip pattern (sequence of stops visited) has been changed by a realtime
* update, a Map associating the updated trip pattern with a compound key of the feed-scoped
- * trip ID and the service date. The type of this field is HashMap rather than the more general
- * Map interface because we need to efficiently clone it whenever we start building up a new
- * snapshot. TODO RT_AB: clarify if this is an index or the original source of truth.
+ * trip ID and the service date.
+ * TODO RT_AB: clarify if this is an index or the original source of truth.
*/
- private HashMap realtimeAddedTripPattern = new HashMap<>();
+ private Map realtimeAddedTripPattern = new HashMap<>();
/**
* This is an index of TripPatterns, not the primary collection. It tracks which TripPatterns
@@ -186,25 +187,7 @@ public Result update(
Timetable tt = resolve(pattern, serviceDate);
// we need to perform the copy of Timetable here rather than in Timetable.update()
// to avoid repeatedly copying in case several updates are applied to the same timetable
- if (!dirtyTimetables.contains(tt)) {
- Timetable old = tt;
- tt = new Timetable(tt, serviceDate);
- SortedSet sortedTimetables = timetables.get(pattern);
- if (sortedTimetables == null) {
- sortedTimetables = new TreeSet<>(new SortedTimetableComparator());
- } else {
- SortedSet temp = new TreeSet<>(new SortedTimetableComparator());
- temp.addAll(sortedTimetables);
- sortedTimetables = temp;
- }
- if (old.getServiceDate() != null) {
- sortedTimetables.remove(old);
- }
- sortedTimetables.add(tt);
- timetables.put(pattern, sortedTimetables);
- dirtyTimetables.add(tt);
- dirty = true;
- }
+ tt = copyTimetable(pattern, serviceDate, tt);
// Assume all trips in a pattern are from the same feed, which should be the case.
// Find trip index
@@ -256,9 +239,8 @@ public TimetableSnapshot commit(TransitLayerUpdater transitLayerUpdater, boolean
if (!force && !this.isDirty()) {
return null;
}
- ret.timetables = (HashMap>) this.timetables.clone();
- ret.realtimeAddedTripPattern =
- (HashMap) this.realtimeAddedTripPattern.clone();
+ ret.timetables = Map.copyOf(timetables);
+ ret.realtimeAddedTripPattern = Map.copyOf(realtimeAddedTripPattern);
if (transitLayerUpdater != null) {
transitLayerUpdater.update(dirtyTimetables, timetables);
@@ -267,7 +249,7 @@ public TimetableSnapshot commit(TransitLayerUpdater transitLayerUpdater, boolean
this.dirtyTimetables.clear();
this.dirty = false;
- ret.setPatternsForStop(HashMultimap.create(this.patternsForStop));
+ ret.patternsForStop = ImmutableSetMultimap.copyOf(patternsForStop);
ret.readOnly = true; // mark the snapshot as henceforth immutable
return ret;
@@ -304,6 +286,10 @@ public void clear(String feedId) {
* message and an attempt was made to re-associate it with its originally scheduled trip pattern.
*/
public boolean revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate serviceDate) {
+ if (readOnly) {
+ throw new ConcurrentModificationException("This TimetableSnapshot is read-only.");
+ }
+
boolean success = false;
final TripPattern pattern = getRealtimeAddedTripPattern(tripId, serviceDate);
@@ -330,10 +316,10 @@ public boolean revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate s
}
if (tripTimesToRemove != null) {
- for (Timetable sortedTimetable : sortedTimetables) {
- boolean isDirty = sortedTimetable.getTripTimes().remove(tripTimesToRemove);
- if (isDirty) {
- dirtyTimetables.add(sortedTimetable);
+ for (Timetable originalTimetable : sortedTimetables) {
+ if (originalTimetable.getTripTimes().contains(tripTimesToRemove)) {
+ Timetable updatedTimetable = copyTimetable(pattern, serviceDate, originalTimetable);
+ updatedTimetable.getTripTimes().remove(tripTimesToRemove);
}
}
}
@@ -370,7 +356,7 @@ public boolean purgeExpiredData(LocalDate serviceDate) {
if (toKeepTimetables.isEmpty()) {
it.remove();
} else {
- timetables.put(pattern, toKeepTimetables);
+ timetables.put(pattern, ImmutableSortedSet.copyOfSorted(toKeepTimetables));
}
}
@@ -407,10 +393,6 @@ public Collection getPatternsForStop(StopLocation stop) {
return patternsForStop.get(stop);
}
- public void setPatternsForStop(SetMultimap patternsForStop) {
- this.patternsForStop = patternsForStop;
- }
-
/**
* Does this snapshot contain any realtime data or is it completely empty?
*/
@@ -424,7 +406,7 @@ public boolean isEmpty() {
* @param feedId feed id to clear out
* @return true if the timetable changed as a result of the call
*/
- protected boolean clearTimetable(String feedId) {
+ private boolean clearTimetable(String feedId) {
return timetables.keySet().removeIf(tripPattern -> feedId.equals(tripPattern.getFeedId()));
}
@@ -434,7 +416,7 @@ protected boolean clearTimetable(String feedId) {
* @param feedId feed id to clear out
* @return true if the realtimeAddedTripPattern changed as a result of the call
*/
- protected boolean clearRealtimeAddedTripPattern(String feedId) {
+ private boolean clearRealtimeAddedTripPattern(String feedId) {
return realtimeAddedTripPattern
.keySet()
.removeIf(realtimeAddedTripPattern ->
@@ -455,6 +437,39 @@ private void addPatternToIndex(TripPattern tripPattern) {
}
}
+ /**
+ * Make a copy of the given timetable for a given pattern and service date.
+ * If the timetable was already copied-on write in this snapshot, the same instance will be
+ * returned. The SortedSet that holds the collection of Timetables for that pattern
+ * (sorted by service date) is shared between multiple snapshots and must be copied as well.
+ * Note on performance: if multiple Timetables are modified in a SortedSet, the SortedSet will be
+ * copied multiple times. The impact on memory/garbage collection is assumed to be minimal
+ * since the collection is small.
+ * The SortedSet is made immutable to prevent change after snapshot publication.
+ */
+ private Timetable copyTimetable(TripPattern pattern, LocalDate serviceDate, Timetable tt) {
+ if (!dirtyTimetables.contains(tt)) {
+ Timetable old = tt;
+ tt = new Timetable(tt, serviceDate);
+ SortedSet sortedTimetables = timetables.get(pattern);
+ if (sortedTimetables == null) {
+ sortedTimetables = new TreeSet<>(new SortedTimetableComparator());
+ } else {
+ SortedSet temp = new TreeSet<>(new SortedTimetableComparator());
+ temp.addAll(sortedTimetables);
+ sortedTimetables = temp;
+ }
+ if (old.getServiceDate() != null) {
+ sortedTimetables.remove(old);
+ }
+ sortedTimetables.add(tt);
+ timetables.put(pattern, ImmutableSortedSet.copyOfSorted(sortedTimetables));
+ dirtyTimetables.add(tt);
+ dirty = true;
+ }
+ return tt;
+ }
+
protected static class SortedTimetableComparator implements Comparator {
@Override
diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMNode.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMNode.java
index a1897d87124..d181cde4564 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMNode.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMNode.java
@@ -38,7 +38,8 @@ public boolean hasCrossingTrafficLight() {
return hasTag("crossing") && "traffic_signals".equals(getTag("crossing"));
}
- /* Checks if this node is a barrier which prevents motor vehicle traffic
+ /**
+ * Checks if this node is a barrier which prevents motor vehicle traffic.
*
* @return true if it is
*/
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
index 9989c102030..c5d1c0d1582 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
@@ -602,25 +602,6 @@ public void populateProperties(WayPropertySet props) {
/* Portland-local mixins */
- /*
- * the RLIS/CCGIS:bicycle=designated mixins are coded out as they are no longer neccessary because of of the bicycle=designated block of code
- * above. This switch makes our weighting system less reliant on tags that aren't generally used by the OSM community, and prevents the double
- * counting that was occuring on streets with both bicycle infrastructure and an RLIS:bicycle=designated tag
- */
-
- /*
- * props.setProperties("RLIS:bicycle=designated", StreetTraversalPermission.ALL, 0.97, 0.97, true);
- */
- props.setMixinProperties("RLIS:bicycle=caution_area", ofBicycleSafety(1.45));
- props.setMixinProperties("RLIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
- props.setMixinProperties("RLIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
- /*
- * props.setProperties("CCGIS:bicycle=designated", StreetTraversalPermission.ALL, 0.97, 0.97, true);
- */
- props.setMixinProperties("CCGIS:bicycle=caution_area", ofBicycleSafety(1.45));
- props.setMixinProperties("CCGIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
- props.setMixinProperties("CCGIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
-
props.setMixinProperties("foot=discouraged", ofWalkSafety(3));
props.setMixinProperties("bicycle=discouraged", ofBicycleSafety(3));
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java
index 9de824a145b..efe7850f08b 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java
@@ -30,7 +30,7 @@ class NorwayMapper implements OsmTagMapper {
@Override
public void populateProperties(WayPropertySet props) {
- var hasSidewalk = new Condition.EqualsAnyIn("sidewalk", "yes", "left", "right", "both");
+ var hasSidewalk = new Condition.OneOf("sidewalk", "yes", "left", "right", "both");
var hasPrefixSidewalk = new Condition.Equals("sidewalk", "yes"); // e.g sidewalk:left=yes
props.setDefaultWalkSafetyForPermission((permission, speedLimit, way) ->
switch (permission) {
@@ -74,16 +74,16 @@ else if (speedLimit >= 11.1f) {
var cycleSafetyLowTraffic = 1.83;
var cycleSafetyVeryLowTraffic = 1.57;
- var isTrunkOrPrimary = new Condition.EqualsAnyIn(
+ var isTrunkOrPrimary = new Condition.OneOf(
"highway",
"trunk",
"trunk_link",
"primary",
"primary_link"
);
- var isSecondaryHighway = new Condition.EqualsAnyIn("highway", "secondary", "secondary_link");
- var isTertiaryHighway = new Condition.EqualsAnyIn("highway", "tertiary", "tertiary_link");
- var isClassifiedRoad = new Condition.EqualsAnyIn(
+ var isSecondaryHighway = new Condition.OneOf("highway", "secondary", "secondary_link");
+ var isTertiaryHighway = new Condition.OneOf("highway", "tertiary", "tertiary_link");
+ var isClassifiedRoad = new Condition.OneOf(
"highway",
"trunk",
"trunk_link",
@@ -94,7 +94,7 @@ else if (speedLimit >= 11.1f) {
"tertiary",
"tertiary_link"
);
- var isClassifiedOrUnclassifiedRoad = new Condition.EqualsAnyIn(
+ var isClassifiedOrUnclassifiedRoad = new Condition.OneOf(
"highway",
"trunk",
"trunk_link",
@@ -107,7 +107,7 @@ else if (speedLimit >= 11.1f) {
"unclassified"
);
- var isNormalRoad = new Condition.EqualsAnyIn(
+ var isNormalRoad = new Condition.OneOf(
"highway",
"trunk",
"trunk_link",
@@ -166,7 +166,7 @@ else if (speedLimit >= 11.1f) {
);
props.setProperties(
- new ExactMatchSpecifier(new Condition.EqualsAnyIn("highway", "motorway", "motorway_link")),
+ new ExactMatchSpecifier(new Condition.OneOf("highway", "motorway", "motorway_link")),
withModes(CAR)
);
@@ -205,7 +205,7 @@ else if (speedLimit >= 11.1f) {
props.setProperties(
new ExactMatchSpecifier(
new Condition.Equals("cycleway", "lane"),
- new Condition.EqualsAnyIn("highway", "unclassified", "residential")
+ new Condition.OneOf("highway", "unclassified", "residential")
),
cycleLaneInLowTraffic
);
@@ -224,7 +224,7 @@ else if (speedLimit >= 11.1f) {
props.setMixinProperties(
new ExactMatchSpecifier(
new Condition.Equals("oneway", "yes"),
- new Condition.EqualsAnyInOrAbsent("cycleway"),
+ new Condition.OneOfOrAbsent("cycleway"),
isNormalRoad
),
ofBicycleSafety(1, 1.15)
@@ -233,7 +233,7 @@ else if (speedLimit >= 11.1f) {
// Discourage cycling along tram tracks
props.setMixinProperties(
new ExactMatchSpecifier(
- new Condition.EqualsAnyIn("embedded_rails", "tram", "light_rail", "disused")
+ new Condition.OneOf("embedded_rails", "tram", "light_rail", "disused")
),
ofBicycleSafety(1.2)
);
@@ -252,12 +252,12 @@ else if (speedLimit >= 11.1f) {
new LogicalOrSpecifier(
new ExactMatchSpecifier(
new Condition.Equals("bridge", "yes"),
- new Condition.EqualsAnyInOrAbsent("sidewalk", "no", "separate"),
+ new Condition.OneOfOrAbsent("sidewalk", "no", "separate"),
isClassifiedOrUnclassifiedRoad
),
new ExactMatchSpecifier(
new Condition.Equals("verge", "no"),
- new Condition.EqualsAnyInOrAbsent("sidewalk", "no", "separate"),
+ new Condition.OneOfOrAbsent("sidewalk", "no", "separate"),
isClassifiedOrUnclassifiedRoad
)
),
@@ -268,7 +268,7 @@ else if (speedLimit >= 11.1f) {
props.setMixinProperties(
new ExactMatchSpecifier(
new Condition.Equals("junction", "roundabout"),
- new Condition.EqualsAnyInOrAbsent("sidewalk", "no", "separate")
+ new Condition.OneOfOrAbsent("sidewalk", "no", "separate")
),
ofWalkSafety(2.)
);
@@ -297,7 +297,7 @@ else if (speedLimit >= 11.1f) {
props.setProperties(
new ExactMatchSpecifier(
new Condition.Equals("highway", "service"),
- new Condition.EqualsAnyIn("bus", "yes", "designated")
+ new Condition.OneOf("bus", "yes", "designated")
),
withModes(PEDESTRIAN_AND_BICYCLE).bicycleSafety(cycleSafetyMediumLowTraffic).walkSafety(1.9)
);
@@ -404,49 +404,49 @@ else if (speedLimit >= 11.1f) {
props.setProperties(
new ExactMatchSpecifier(
- new Condition.EqualsAnyIn("trail_visibility", "bad", "low", "poor", "horrible", "no"),
+ new Condition.OneOf("trail_visibility", "bad", "low", "poor", "horrible", "no"),
new Condition.Equals("highway", "path")
),
withModes(NONE)
);
props.setProperties(
new ExactMatchSpecifier(
- new Condition.EqualsAnyIn(
+ new Condition.OneOf(
"sac_scale",
"demanding_mountain_hiking",
"alpine_hiking",
"demanding_alpine_hiking",
"difficult_alpine_hiking"
),
- new Condition.EqualsAnyIn("highway", "path", "steps")
+ new Condition.OneOf("highway", "path", "steps")
),
withModes(NONE)
);
props.setProperties(
new ExactMatchSpecifier(
- new Condition.EqualsAnyIn("smoothness", "horrible", "very_horrible"),
- new Condition.EqualsAnyIn("highway", "path", "bridleway", "track")
+ new Condition.OneOf("smoothness", "horrible", "very_horrible"),
+ new Condition.OneOf("highway", "path", "bridleway", "track")
),
withModes(PEDESTRIAN).walkSafety(1.15)
);
props.setProperties(
new ExactMatchSpecifier(
new Condition.Equals("smoothness", "impassable"),
- new Condition.EqualsAnyIn("highway", "path", "bridleway", "track")
+ new Condition.OneOf("highway", "path", "bridleway", "track")
),
withModes(NONE)
);
props.setProperties(
new ExactMatchSpecifier(
new Condition.InclusiveRange("mtb:scale", 2, 1),
- new Condition.EqualsAnyIn("highway", "path", "bridleway", "track")
+ new Condition.OneOf("highway", "path", "bridleway", "track")
),
withModes(PEDESTRIAN).walkSafety(1.15)
);
props.setProperties(
new ExactMatchSpecifier(
new Condition.GreaterThan("mtb:scale", 2),
- new Condition.EqualsAnyIn("highway", "path", "bridleway", "track")
+ new Condition.OneOf("highway", "path", "bridleway", "track")
),
withModes(NONE)
);
@@ -461,7 +461,7 @@ else if (speedLimit >= 11.1f) {
props.setMixinProperties("surface=metal_grid", ofBicycleSafety(1.2));
props.setMixinProperties("surface=metal", ofBicycleSafety(1.2));
// Paved but damaged
- var isPaved = new Condition.EqualsAnyIn(
+ var isPaved = new Condition.OneOf(
"surface",
"asfalt",
"concrete",
@@ -502,46 +502,46 @@ else if (speedLimit >= 11.1f) {
props.setMixinProperties(
new ExactMatchSpecifier(
new Condition.Absent("tracktype"),
- new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
- new Condition.EqualsAnyIn("highway", "track", "bridleway")
+ new Condition.OneOfOrAbsent("surface", "unpaved"),
+ new Condition.OneOf("highway", "track", "bridleway")
),
ofBicycleSafety(1.8).walkSafety(1.6)
);
props.setMixinProperties(
new ExactMatchSpecifier(
new Condition.Equals("tracktype", "grade2"),
- new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
- new Condition.EqualsAnyIn("highway", "track", "bridleway", "service", "unclassified")
+ new Condition.OneOfOrAbsent("surface", "unpaved"),
+ new Condition.OneOf("highway", "track", "bridleway", "service", "unclassified")
),
ofBicycleSafety(1.4).walkSafety(1.4)
);
props.setMixinProperties(
new ExactMatchSpecifier(
new Condition.Equals("tracktype", "grade3"),
- new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
- new Condition.EqualsAnyIn("highway", "track", "bridleway", "service", "unclassified")
+ new Condition.OneOfOrAbsent("surface", "unpaved"),
+ new Condition.OneOf("highway", "track", "bridleway", "service", "unclassified")
),
ofBicycleSafety(1.8).walkSafety(1.6)
);
props.setMixinProperties(
new ExactMatchSpecifier(
new Condition.Equals("tracktype", "grade4"),
- new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
- new Condition.EqualsAnyIn("highway", "track", "bridleway", "service", "unclassified")
+ new Condition.OneOfOrAbsent("surface", "unpaved"),
+ new Condition.OneOf("highway", "track", "bridleway", "service", "unclassified")
),
ofBicycleSafety(2.3).walkSafety(1.8)
);
props.setMixinProperties(
new ExactMatchSpecifier(
new Condition.Equals("tracktype", "grade5"),
- new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
- new Condition.EqualsAnyIn("highway", "track", "bridleway", "service", "unclassified")
+ new Condition.OneOfOrAbsent("surface", "unpaved"),
+ new Condition.OneOf("highway", "track", "bridleway", "service", "unclassified")
),
ofBicycleSafety(2.3).walkSafety(2.4)
);
props.setMixinProperties(
new ExactMatchSpecifier(
- new Condition.EqualsAnyInOrAbsent("surface"),
+ new Condition.OneOfOrAbsent("surface"),
new Condition.Equals("highway", "path")
),
ofBicycleSafety(2.3).walkSafety(2.4)
@@ -560,7 +560,7 @@ else if (speedLimit >= 11.1f) {
*/
props.setCarSpeed(
- new ExactMatchSpecifier(new Condition.EqualsAnyIn("highway", "motorway", "motorway_link")),
+ new ExactMatchSpecifier(new Condition.OneOf("highway", "motorway", "motorway_link")),
30.56f // 110 km/t
);
@@ -570,7 +570,7 @@ else if (speedLimit >= 11.1f) {
);
props.setCarSpeed(
new ExactMatchSpecifier(
- new Condition.EqualsAnyIn(
+ new Condition.OneOf(
"highway",
"trunk",
"trunk_link",
@@ -589,8 +589,8 @@ else if (speedLimit >= 11.1f) {
);
props.setCarSpeed(
new ExactMatchSpecifier(
- new Condition.EqualsAnyIn("sidewalk", "yes", "both", "left", "right", "separate"),
- new Condition.EqualsAnyIn(
+ new Condition.OneOf("sidewalk", "yes", "both", "left", "right", "separate"),
+ new Condition.OneOf(
"highway",
"trunk",
"trunk_link",
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
index a532d279ba4..1a09b3b6714 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
@@ -1,5 +1,6 @@
package org.opentripplanner.openstreetmap.tagmapping;
+import static org.opentripplanner.openstreetmap.wayproperty.MixinPropertiesBuilder.ofBicycleSafety;
import static org.opentripplanner.openstreetmap.wayproperty.MixinPropertiesBuilder.ofWalkSafety;
import static org.opentripplanner.openstreetmap.wayproperty.specifier.ExactMatchSpecifier.exact;
@@ -41,6 +42,18 @@ public void populateProperties(WayPropertySet props) {
props.setMixinProperties(exact("sidewalk=no;maxspeed=35 mph"), ofWalkSafety(2));
props.setMixinProperties(exact("sidewalk=no;maxspeed=30 mph"), ofWalkSafety(1.5));
+ // rarely used tags that are specific to counties near Portland
+ // https://taginfo.openstreetmap.org/keys/RLIS:bicycle#overview
+
+ props.setMixinProperties("RLIS:bicycle=caution_area", ofBicycleSafety(1.45));
+ props.setMixinProperties("RLIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
+ props.setMixinProperties("RLIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
+
+ // https://taginfo.openstreetmap.org/keys/CCGIS:bicycle#overview
+ props.setMixinProperties("CCGIS:bicycle=caution_area", ofBicycleSafety(1.45));
+ props.setMixinProperties("CCGIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
+ props.setMixinProperties("CCGIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
+
// Max speed limit in Oregon is 70 mph ~= 113kmh ~= 31.3m/s
props.maxPossibleCarSpeed = 31.4f;
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
index fc166a69927..ab68fd978c2 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
@@ -5,4 +5,18 @@
*/
public record SafetyFeatures(double forward, double back) {
public static final SafetyFeatures DEFAULT = new SafetyFeatures(1, 1);
+
+ /**
+ * Does this instance actually modify the safety values?
+ */
+ public boolean modifies() {
+ return !(forward == 1 && back == 1);
+ }
+
+ /**
+ * Does forward and back have the same value?
+ */
+ public boolean isSymmetric() {
+ return forward == back;
+ }
}
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java
index d9f194aa4e5..293bcf84644 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java
@@ -1,5 +1,7 @@
package org.opentripplanner.openstreetmap.wayproperty.specifier;
+import java.util.Arrays;
+import java.util.stream.Collectors;
import org.opentripplanner.framework.tostring.ToStringBuilder;
import org.opentripplanner.openstreetmap.model.OSMWithTags;
@@ -72,6 +74,11 @@ public int matchScore(OSMWithTags way) {
return score;
}
+ @Override
+ public String toDocString() {
+ return Arrays.stream(conditions).map(Object::toString).collect(Collectors.joining("; "));
+ }
+
@Override
public String toString() {
return ToStringBuilder.of(this.getClass()).addObj("conditions", conditions).toString();
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
index 4d8381963b3..4ad180c16c3 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
@@ -107,13 +107,24 @@ enum MatchResult {
NONE,
}
+ /**
+ * Selects tags where a given key/value matches.
+ */
record Equals(String key, String value) implements Condition {
@Override
public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
return way.hasTag(exKey) && way.isTag(exKey, value);
}
+
+ @Override
+ public String toString() {
+ return "%s=%s".formatted(key, value);
+ }
}
+ /**
+ * Selects tags with a given key.
+ */
record Present(String key) implements Condition {
@Override
public MatchResult matchType() {
@@ -123,31 +134,63 @@ public MatchResult matchType() {
public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
return way.hasTag(exKey);
}
+
+ @Override
+ public String toString() {
+ return "present(%s)".formatted(key);
+ }
}
+ /**
+ * Selects tags where a given tag is absent.
+ */
record Absent(String key) implements Condition {
@Override
public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
return !way.hasTag(exKey);
}
+
+ @Override
+ public String toString() {
+ return "!%s".formatted(key);
+ }
}
+ /**
+ * Selects tags where the integer value is greater than a given number.
+ */
record GreaterThan(String key, int value) implements Condition {
@Override
public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
var maybeInt = way.getTagAsInt(exKey, ignored -> {});
return maybeInt.isPresent() && maybeInt.getAsInt() > value;
}
+
+ @Override
+ public String toString() {
+ return "%s > %s".formatted(key, value);
+ }
}
+ /**
+ * Selects tags where the integer value is less than a given number.
+ */
record LessThan(String key, int value) implements Condition {
@Override
public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
var maybeInt = way.getTagAsInt(exKey, ignored -> {});
return maybeInt.isPresent() && maybeInt.getAsInt() < value;
}
+
+ @Override
+ public String toString() {
+ return "%s < %s".formatted(key, value);
+ }
}
+ /**
+ * Selects integer tag values and checks if they are in between a lower and an upper bound.
+ */
record InclusiveRange(String key, int upper, int lower) implements Condition {
public InclusiveRange {
if (upper < lower) {
@@ -160,18 +203,36 @@ public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
var maybeInt = way.getTagAsInt(exKey, ignored -> {});
return maybeInt.isPresent() && maybeInt.getAsInt() >= lower && maybeInt.getAsInt() <= upper;
}
+
+ @Override
+ public String toString() {
+ return "%s > %s < %s".formatted(lower, key, upper);
+ }
}
- record EqualsAnyIn(String key, String... values) implements Condition {
+ /**
+ * Selects a tag which has one of a set of given values.
+ */
+ record OneOf(String key, String... values) implements Condition {
@Override
public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
return Arrays.stream(values).anyMatch(value -> way.isTag(exKey, value));
}
+
+ @Override
+ public String toString() {
+ return "%s one of [%s]".formatted(key, String.join(", ", values));
+ }
}
- record EqualsAnyInOrAbsent(String key, String... values) implements Condition {
+ /**
+ * Selects a tag where one of the following conditions is true:
+ * - one of a set of given values matches
+ * - the tag is absent
+ */
+ record OneOfOrAbsent(String key, String... values) implements Condition {
/* A use case for this is to detect the absence of a sidewalk, cycle lane or verge*/
- public EqualsAnyInOrAbsent(String key) {
+ public OneOfOrAbsent(String key) {
this(key, "no", "none");
}
@@ -181,5 +242,10 @@ public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
!way.hasTag(exKey) || Arrays.stream(values).anyMatch(value -> way.isTag(exKey, value))
);
}
+
+ @Override
+ public String toString() {
+ return "%s not one of [%s] or absent".formatted(key, String.join(", ", values));
+ }
}
}
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java
index e6eb3f37940..48c3b5edb64 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java
@@ -2,6 +2,7 @@
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
import org.opentripplanner.openstreetmap.model.OSMWithTags;
/**
@@ -54,6 +55,11 @@ public int matchScore(OSMWithTags way) {
}
}
+ @Override
+ public String toDocString() {
+ return conditions.stream().map(Object::toString).collect(Collectors.joining("; "));
+ }
+
public boolean allTagsMatch(OSMWithTags way) {
return conditions.stream().allMatch(o -> o.isMatch(way));
}
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java
index 229b26fa25a..74db280115b 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java
@@ -2,6 +2,7 @@
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
import org.opentripplanner.openstreetmap.model.OSMWithTags;
/**
@@ -25,10 +26,6 @@ public LogicalOrSpecifier(ExactMatchSpecifier... specifiers) {
this.subSpecs = Arrays.asList(specifiers);
}
- public LogicalOrSpecifier(Condition... conditions) {
- this.subSpecs = Arrays.stream(conditions).map(ExactMatchSpecifier::new).toList();
- }
-
public LogicalOrSpecifier(String... specs) {
this.subSpecs = Arrays.stream(specs).map(ExactMatchSpecifier::new).toList();
}
@@ -47,4 +44,9 @@ public int matchScore(OSMWithTags way) {
return 0;
}
}
+
+ @Override
+ public String toDocString() {
+ return subSpecs.stream().map(ExactMatchSpecifier::toDocString).collect(Collectors.joining("|"));
+ }
}
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java
index 1e6c53a25c9..71d629552ff 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java
@@ -42,6 +42,12 @@ static Condition[] parseConditions(String spec, String separator) {
*/
int matchScore(OSMWithTags way);
+ /**
+ * Convert this specifier to a human-readable identifier that represents this in (generated)
+ * documentation.
+ */
+ String toDocString();
+
record Scores(int forward, int backward) {
public static Scores of(int s) {
return new Scores(s, s);
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java b/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java
index 5ffa7cd2301..c36efc59e5b 100644
--- a/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java
+++ b/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java
@@ -63,6 +63,7 @@ public List findClosestPlaces(
List filterByStations,
List filterByRoutes,
List filterByBikeRentalStations,
+ List filterByNetwork,
TransitService transitService
) {
throw new UnsupportedOperationException("Not implemented");
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java b/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java
index 4c0b0c81144..063ed221dd5 100644
--- a/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java
+++ b/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java
@@ -69,6 +69,7 @@ List findClosestPlaces(
List filterByStations,
List filterByRoutes,
List filterByBikeRentalStations,
+ List filterByNetwork,
TransitService transitService
);
}
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java b/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java
index e71504d58f3..16420a0d9eb 100644
--- a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java
+++ b/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java
@@ -31,6 +31,7 @@ public class PlaceFinderTraverseVisitor implements TraverseVisitor
private final Set filterByStops;
private final Set filterByStations;
private final Set filterByRoutes;
+ private final Set filterByNetwork;
private final Set filterByVehicleRental;
private final Set seenPatternAtStops = new HashSet<>();
private final Set seenStops = new HashSet<>();
@@ -69,6 +70,7 @@ public PlaceFinderTraverseVisitor(
List filterByStations,
List filterByRoutes,
List filterByBikeRentalStations,
+ List filterByNetwork,
int maxResults,
double radiusMeters
) {
@@ -82,6 +84,7 @@ public PlaceFinderTraverseVisitor(
this.filterByStations = toSet(filterByStations);
this.filterByRoutes = toSet(filterByRoutes);
this.filterByVehicleRental = toSet(filterByBikeRentalStations);
+ this.filterByNetwork = toSet(filterByNetwork);
includeStops = shouldInclude(filterByPlaceTypes, PlaceType.STOP);
includePatternAtStops = shouldInclude(filterByPlaceTypes, PlaceType.PATTERN_AT_STOP);
@@ -264,6 +267,9 @@ private void handleVehicleRental(VehicleRentalPlace station, double distance) {
if (seenVehicleRentalPlaces.contains(station.getId())) {
return;
}
+ if (!filterByNetwork.isEmpty() && !filterByNetwork.contains(station.getNetwork())) {
+ return;
+ }
seenVehicleRentalPlaces.add(station.getId());
placesFound.add(new PlaceAtDistance(station, distance));
}
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java b/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java
index 1b2b1d8f522..71f65209ddf 100644
--- a/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java
+++ b/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java
@@ -56,6 +56,7 @@ public List findClosestPlaces(
List filterByStations,
List filterByRoutes,
List filterByBikeRentalStations,
+ List filterByNetwork,
TransitService transitService
) {
PlaceFinderTraverseVisitor visitor = new PlaceFinderTraverseVisitor(
@@ -66,6 +67,7 @@ public List findClosestPlaces(
filterByStations,
filterByRoutes,
filterByBikeRentalStations,
+ filterByNetwork,
maxResults,
radiusMeters
);
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java
index 1725e7df2dd..cd806603c9d 100644
--- a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java
+++ b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java
@@ -80,6 +80,9 @@ public interface VehicleRentalPlace {
/** Deep links for this rental station or individual vehicle */
VehicleRentalStationUris getRentalUris();
+ /** System information for the vehicle rental provider */
+ VehicleRentalSystem getVehicleRentalSystem();
+
default boolean networkIsNotAllowed(VehicleRentalPreferences preferences) {
if (
getNetwork() == null &&
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java
index a31e5e88a0e..d6e72023a31 100644
--- a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java
+++ b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java
@@ -172,6 +172,11 @@ public VehicleRentalStationUris getRentalUris() {
return rentalUris;
}
+ @Override
+ public VehicleRentalSystem getVehicleRentalSystem() {
+ return system;
+ }
+
@Override
public String toString() {
return String.format(
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java
index 7dba5e714b4..042e608c88f 100644
--- a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java
+++ b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java
@@ -128,4 +128,9 @@ public boolean isRealTimeData() {
public VehicleRentalStationUris getRentalUris() {
return rentalUris;
}
+
+ @Override
+ public VehicleRentalSystem getVehicleRentalSystem() {
+ return system;
+ }
}
diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java b/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
index b30fc3d5b3f..f8ed1184c04 100644
--- a/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
@@ -3,6 +3,7 @@
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_0;
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1;
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_4;
+import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5;
import java.util.List;
import org.opentripplanner.ext.vehiclerentalservicedirectory.api.NetworkParameters;
@@ -79,6 +80,22 @@ private static List mapNetworkParameters(
.of("geofencingZones")
.since(V2_4)
.summary("Enables geofencingZones for the given network")
+ .description(
+ "See the regular [GBFS documentation](../UpdaterConfig.md#gbfs-vehicle-rental-systems) for more information."
+ )
+ .asBoolean(false),
+ c
+ .of("allowKeepingVehicleAtDestination")
+ .since(V2_5)
+ .summary("Enables `allowKeepingVehicleAtDestination` for the given network.")
+ .description(
+ """
+ Configures if a vehicle rented from a station must be returned to another one or can
+ be kept at the end of the trip.
+
+ See the regular [GBFS documentation](../UpdaterConfig.md#gbfs-vehicle-rental-systems) for more information.
+ """
+ )
.asBoolean(false)
)
);
diff --git a/src/main/java/org/opentripplanner/updater/spi/UpdateError.java b/src/main/java/org/opentripplanner/updater/spi/UpdateError.java
index 548ef0210eb..1f568ba99a4 100644
--- a/src/main/java/org/opentripplanner/updater/spi/UpdateError.java
+++ b/src/main/java/org/opentripplanner/updater/spi/UpdateError.java
@@ -49,6 +49,7 @@ public enum UpdateErrorType {
NOT_IMPLEMENTED_UNSCHEDULED,
NOT_IMPLEMENTED_DUPLICATED,
NOT_MONITORED,
+ CANNOT_RESOLVE_AGENCY,
}
public static Result result(FeedScopedId tripId, UpdateErrorType errorType) {
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java
index caf5d97c0d4..22a4131f338 100644
--- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java
+++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java
@@ -10,6 +10,7 @@
import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones;
import org.opentripplanner.framework.geometry.GeometryUtils;
import org.opentripplanner.framework.geometry.UnsupportedGeometryException;
+import org.opentripplanner.framework.lang.StringUtils;
import org.opentripplanner.service.vehiclerental.model.GeofencingZone;
import org.opentripplanner.transit.model.framework.FeedScopedId;
import org.slf4j.Logger;
@@ -52,6 +53,9 @@ private GeofencingZone toInternalModel(GBFSFeature f) {
return null;
}
var name = Objects.requireNonNullElseGet(f.getProperties().getName(), () -> fallbackId(g));
+ if (!StringUtils.hasValue(name)) {
+ name = fallbackId(g);
+ }
var dropOffBanned = !f.getProperties().getRules().get(0).getRideAllowed();
var passThroughBanned = !f.getProperties().getRules().get(0).getRideThroughAllowed();
return new GeofencingZone(
diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index 57fe17a55ab..6e1195f5901 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -1183,6 +1183,8 @@ type QueryType {
nearest places related to bicycling.
"""
filterByModes: [Mode],
+ "Only include vehicle rental networks that match one of the given network ids."
+ filterByNetwork: [String!],
"Only return places that are one of these types, e.g. `STOP` or `VEHICLE_RENT`"
filterByPlaceTypes: [FilterPlaceType],
first: Int,
@@ -1739,9 +1741,11 @@ type RentalVehicle implements Node & PlaceInterface {
"Name of the vehicle"
name: String!
"ID of the rental network."
- network: String
+ network: String @deprecated(reason : "Use `networkId` from `rentalNetwork` instead.")
"If true, vehicle is not disabled."
operative: Boolean
+ "The vehicle rental network information. This is referred as system in the GBFS terminology."
+ rentalNetwork: VehicleRentalNetwork!
"Platform-specific URLs to begin the vehicle."
rentalUris: VehicleRentalUris
"ID of the vehicle in the format of network:id"
@@ -2413,6 +2417,21 @@ type VehiclePosition {
vehicleId: String
}
+"""
+Vehicle rental network, which is referred as system in the GBFS terminology. Note, the same operator can operate in multiple
+regions either with the same network/system or with a different one. This can contain information about either the rental brand
+or about the operator.
+"""
+type VehicleRentalNetwork {
+ """
+ ID of the vehicle rental network. In GBFS, this is the `system_id` field from the system information, but it can
+ be overridden in the configuration to have a different value so this field doesn't necessarily match the source data.
+ """
+ networkId: String!
+ "The rental vehicle operator's network/system URL. In GBFS, this is the `url` field from the system information."
+ url: String
+}
+
"Vehicle rental station represents a location where users can rent bicycles etc. for a fee."
type VehicleRentalStation implements Node & PlaceInterface {
"""
@@ -2443,7 +2462,7 @@ type VehicleRentalStation implements Node & PlaceInterface {
"Name of the vehicle rental station"
name: String!
"ID of the rental network."
- network: String
+ network: String @deprecated(reason : "Use `networkId` from `rentalNetwork` instead.")
"If true, station is on and in service."
operative: Boolean
"""
@@ -2452,6 +2471,8 @@ type VehicleRentalStation implements Node & PlaceInterface {
are always the total capacity divided by two.
"""
realtime: Boolean
+ "The vehicle rental network information. This is referred as system in the GBFS terminology."
+ rentalNetwork: VehicleRentalNetwork!
"Platform-specific URLs to begin renting a vehicle from this station."
rentalUris: VehicleRentalUris
"""
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
index 614c8778c6b..2fb7a8d9db2 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
@@ -73,8 +73,10 @@
import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle;
import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalService;
+import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder;
import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder;
import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle;
import org.opentripplanner.standalone.config.framework.json.JsonSupport;
import org.opentripplanner.test.support.FilePatternSource;
import org.opentripplanner.transit.model._data.TransitModelForTest;
@@ -112,6 +114,18 @@ class GraphQLIntegrationTest {
.map(p -> (RegularStop) p.stop)
.toList();
+ private static VehicleRentalStation VEHICLE_RENTAL_STATION = new TestVehicleRentalStationBuilder()
+ .withVehicles(10)
+ .withSpaces(10)
+ .withVehicleTypeBicycle(5, 7)
+ .withVehicleTypeElectricBicycle(5, 3)
+ .withSystem("Network-1", "https://foo.bar")
+ .build();
+
+ private static VehicleRentalVehicle RENTAL_VEHICLE = new TestFreeFloatingRentalVehicleBuilder()
+ .withSystem("Network-1", "https://foo.bar")
+ .build();
+
static final Graph GRAPH = new Graph();
static final Instant ALERT_START_TIME = OffsetDateTime
@@ -280,13 +294,8 @@ public TransitAlertService getTransitAlertService() {
realtimeVehicleService.setRealtimeVehicles(pattern, List.of(occypancyVehicle, positionVehicle));
DefaultVehicleRentalService defaultVehicleRentalService = new DefaultVehicleRentalService();
- VehicleRentalStation vehicleRentalStation = new TestVehicleRentalStationBuilder()
- .withVehicles(10)
- .withSpaces(10)
- .withVehicleTypeBicycle(5, 7)
- .withVehicleTypeElectricBicycle(5, 3)
- .build();
- defaultVehicleRentalService.addVehicleRentalStation(vehicleRentalStation);
+ defaultVehicleRentalService.addVehicleRentalStation(VEHICLE_RENTAL_STATION);
+ defaultVehicleRentalService.addVehicleRentalStation(RENTAL_VEHICLE);
context =
new GraphQLRequestContext(
@@ -448,13 +457,15 @@ public List findClosestPlaces(
List filterByStations,
List filterByRoutes,
List filterByBikeRentalStations,
+ List filterByNetwork,
TransitService transitService
) {
- return List
- .of(TransitModelForTest.of().stop("A").build())
- .stream()
- .map(stop -> new PlaceAtDistance(stop, 0))
- .toList();
+ var stop = TransitModelForTest.of().stop("A").build();
+ return List.of(
+ new PlaceAtDistance(stop, 0),
+ new PlaceAtDistance(VEHICLE_RENTAL_STATION, 30),
+ new PlaceAtDistance(RENTAL_VEHICLE, 50)
+ );
}
};
}
diff --git a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
new file mode 100644
index 00000000000..3090c696e37
--- /dev/null
+++ b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
@@ -0,0 +1,114 @@
+package org.opentripplanner.generate.doc;
+
+import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
+import static org.opentripplanner.framework.io.FileUtils.readFile;
+import static org.opentripplanner.framework.io.FileUtils.writeFile;
+import static org.opentripplanner.generate.doc.framework.DocsTestConstants.DOCS_ROOT;
+import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_ROOT;
+import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.ATLANTA;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.CONSTANT_SPEED_FINLAND;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.HAMBURG;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.HOUSTON;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.PORTLAND;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opentripplanner.framework.text.Table;
+import org.opentripplanner.framework.text.TableBuilder;
+import org.opentripplanner.generate.doc.framework.GeneratesDocumentation;
+import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapper;
+import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource;
+import org.opentripplanner.openstreetmap.wayproperty.SafetyFeatures;
+import org.opentripplanner.openstreetmap.wayproperty.WayPropertySet;
+
+@GeneratesDocumentation
+public class OsmMapperDocTest {
+
+ private static final String FILE_NAME = "OsmMapper.md";
+ private static final File TEMPLATE = new File(TEMPLATE_ROOT, FILE_NAME);
+ private static final Set SKIP_MAPPERS = Set.of(
+ ATLANTA,
+ HOUSTON,
+ PORTLAND,
+ HAMBURG,
+ CONSTANT_SPEED_FINLAND
+ );
+
+ public static List mappers() {
+ return Arrays
+ .stream(OsmTagMapperSource.values())
+ .filter(m -> !SKIP_MAPPERS.contains(m))
+ .toList();
+ }
+
+ @ParameterizedTest
+ @MethodSource("mappers")
+ public void updateDocs(OsmTagMapperSource source) {
+ var mapper = source.getInstance();
+ var wps = new WayPropertySet();
+ mapper.populateProperties(wps);
+
+ var outFile = outputFile(mapper);
+
+ // Read and close input file (same as output file)
+ String template = readFile(TEMPLATE);
+ String original = readFile(outFile);
+
+ var propTable = propTable(wps);
+ var mixinTable = mixinTable(wps);
+
+ template = replaceSection(template, "props", propTable.toMarkdownTable());
+ template = replaceSection(template, "mixins", mixinTable.toMarkdownTable());
+ writeFile(outFile, template);
+ assertFileEquals(original, outFile);
+ }
+
+ private static File outputFile(OsmTagMapper mapper) {
+ var name = mapper.getClass().getSimpleName().replaceAll("Mapper", ".md");
+ return new File("%s/osm/".formatted(DOCS_ROOT), name);
+ }
+
+ private static Table propTable(WayPropertySet wps) {
+ var propTable = new TableBuilder();
+ propTable.withHeaders("specifier", "permission", "bike safety", "walk safety");
+
+ for (var prop : wps.getWayProperties()) {
+ propTable.addRow(
+ "`%s`".formatted(prop.specifier().toDocString()),
+ "`%s`".formatted(prop.properties().getPermission()),
+ tableValues(prop.properties().bicycleSafety()),
+ tableValues(prop.properties().walkSafety())
+ );
+ }
+ return propTable.build();
+ }
+
+ private static Table mixinTable(WayPropertySet wps) {
+ var propTable = new TableBuilder();
+ propTable.withHeaders("matcher", "bicycle safety", "walk safety");
+
+ for (var prop : wps.getMixins()) {
+ propTable.addRow(
+ "`%s`".formatted(prop.specifier().toDocString()),
+ tableValues(prop.bicycleSafety()),
+ tableValues(prop.walkSafety())
+ );
+ }
+ return propTable.build();
+ }
+
+ private static String tableValues(SafetyFeatures safety) {
+ if (!safety.modifies()) {
+ return "";
+ } else if (safety.isSymmetric()) {
+ return Double.toString(safety.forward());
+ } else {
+ return "forward: %s
back: %s".formatted(safety.forward(), safety.back());
+ }
+ }
+}
diff --git a/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java b/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java
index 26d93f6a848..89c30da79e4 100644
--- a/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java
+++ b/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java
@@ -5,6 +5,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.google.transit.realtime.GtfsRealtime.TripDescriptor;
@@ -261,6 +262,52 @@ public void testPurge() {
assertFalse(resolver.isDirty());
}
+ @Test
+ void testCannotUpdateReadOnlyTimetableSnapshot() {
+ TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+ LocalDate today = LocalDate.now(timeZone);
+ TripPattern pattern = patternIndex.get(new FeedScopedId(feedId, "1.1"));
+ assertThrows(
+ ConcurrentModificationException.class,
+ () -> committedSnapshot.update(pattern, null, today)
+ );
+ }
+
+ @Test
+ void testCannotCommitReadOnlyTimetableSnapshot() {
+ TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+ assertThrows(ConcurrentModificationException.class, () -> committedSnapshot.commit(null, true));
+ }
+
+ @Test
+ void testCannotClearReadOnlyTimetableSnapshot() {
+ TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+ assertThrows(ConcurrentModificationException.class, () -> committedSnapshot.clear(null));
+ }
+
+ @Test
+ void testCannotPurgeReadOnlyTimetableSnapshot() {
+ TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+ assertThrows(
+ ConcurrentModificationException.class,
+ () -> committedSnapshot.purgeExpiredData(null)
+ );
+ }
+
+ @Test
+ void testCannotRevertReadOnlyTimetableSnapshot() {
+ TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+ assertThrows(
+ ConcurrentModificationException.class,
+ () -> committedSnapshot.revertTripToScheduledTripPattern(null, null)
+ );
+ }
+
+ private static TimetableSnapshot createCommittedSnapshot() {
+ TimetableSnapshot timetableSnapshot = new TimetableSnapshot();
+ return timetableSnapshot.commit(null, true);
+ }
+
private Result updateResolver(
TimetableSnapshot resolver,
TripPattern pattern,
diff --git a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java
index def272652f6..6386aa902e2 100644
--- a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java
+++ b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java
@@ -29,11 +29,11 @@
import org.opentripplanner.openstreetmap.model.OSMWithTags;
import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.Absent;
import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.Equals;
-import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.EqualsAnyIn;
import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.GreaterThan;
import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.InclusiveRange;
import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.LessThan;
import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.MatchResult;
+import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.OneOf;
import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.Present;
class ConditionTest {
@@ -46,7 +46,7 @@ class ConditionTest {
static Condition moreThanFourLanes = new GreaterThan("lanes", 4);
static Condition lessThanFourLanes = new LessThan("lanes", 4);
static Condition betweenFiveAndThreeLanes = new InclusiveRange("lanes", 5, 3);
- static Condition smoothnessBadAndWorseThanBad = new EqualsAnyIn(
+ static Condition smoothnessBadAndWorseThanBad = new OneOf(
"smoothness",
"bad",
"very_bad",
@@ -54,7 +54,7 @@ class ConditionTest {
"very_horrible",
"impassable"
);
- static Condition noSidewalk = new Condition.EqualsAnyInOrAbsent("sidewalk");
+ static Condition noSidewalk = new Condition.OneOfOrAbsent("sidewalk");
static Stream equalsCases() {
return Stream.of(
diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java b/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java
index 1ef675c8101..b69a6533334 100644
--- a/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java
+++ b/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java
@@ -13,6 +13,7 @@
import org.opentripplanner.framework.geometry.WgsCoordinate;
import org.opentripplanner.framework.i18n.NonLocalizedString;
import org.opentripplanner.model.StopTime;
+import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder;
import org.opentripplanner.street.search.state.TestStateBuilder;
import org.opentripplanner.transit.model._data.TransitModelForTest;
import org.opentripplanner.transit.model.basic.TransitMode;
@@ -96,6 +97,7 @@ void stopsOnly() {
null,
null,
null,
+ null,
1,
500
);
@@ -124,6 +126,7 @@ void stationsOnly() {
null,
null,
null,
+ null,
1,
500
);
@@ -152,6 +155,7 @@ void stopsAndStations() {
null,
null,
null,
+ null,
1,
500
);
@@ -183,6 +187,7 @@ void stopsAndStationsWithStationFilter() {
List.of(STATION1.getId()),
null,
null,
+ null,
1,
500
);
@@ -217,6 +222,7 @@ void stopsAndStationsWithStopFilter() {
null,
null,
null,
+ null,
1,
500
);
@@ -250,6 +256,7 @@ void stopsAndStationsWithStopAndStationFilter() {
List.of(STATION1.getId()),
null,
null,
+ null,
1,
500
);
@@ -274,4 +281,74 @@ void stopsAndStationsWithStopAndStationFilter() {
visitor.visitVertex(state1);
}
+
+ @Test
+ void rentalStation() {
+ var visitor = new PlaceFinderTraverseVisitor(
+ transitService,
+ null,
+ List.of(PlaceType.VEHICLE_RENT),
+ null,
+ null,
+ null,
+ null,
+ null,
+ 1,
+ 500
+ );
+ var station = new TestVehicleRentalStationBuilder().build();
+ assertEquals(List.of(), visitor.placesFound);
+ var state1 = TestStateBuilder.ofWalking().rentalStation(station).build();
+ visitor.visitVertex(state1);
+
+ var res = visitor.placesFound.stream().map(PlaceAtDistance::place).toList();
+
+ assertEquals(List.of(station), res);
+ }
+
+ @Test
+ void rentalStationWithNetworksFilter() {
+ var visitor = new PlaceFinderTraverseVisitor(
+ transitService,
+ null,
+ List.of(PlaceType.VEHICLE_RENT),
+ null,
+ null,
+ null,
+ null,
+ List.of("Network-1"),
+ 1,
+ 500
+ );
+ var station = new TestVehicleRentalStationBuilder().build();
+ assertEquals(List.of(), visitor.placesFound);
+ var state1 = TestStateBuilder.ofWalking().rentalStation(station).build();
+ visitor.visitVertex(state1);
+
+ var res = visitor.placesFound.stream().map(PlaceAtDistance::place).toList();
+
+ assertEquals(List.of(station), res);
+
+ visitor =
+ new PlaceFinderTraverseVisitor(
+ transitService,
+ null,
+ List.of(PlaceType.VEHICLE_RENT),
+ null,
+ null,
+ null,
+ null,
+ List.of("Network-2"),
+ 1,
+ 500
+ );
+
+ assertEquals(List.of(), visitor.placesFound);
+ state1 = TestStateBuilder.ofWalking().rentalStation(station).build();
+ visitor.visitVertex(state1);
+
+ res = visitor.placesFound.stream().map(PlaceAtDistance::place).toList();
+
+ assertEquals(List.of(), res);
+ }
}
diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java b/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java
index 3285e27594c..76f231577dd 100644
--- a/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java
+++ b/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java
@@ -156,6 +156,7 @@ void findClosestPlacesLimiting() {
null,
null,
null,
+ null,
transitService
)
);
@@ -179,6 +180,7 @@ void findClosestPlacesLimiting() {
null,
null,
null,
+ null,
transitService
)
);
@@ -196,6 +198,7 @@ void findClosestPlacesLimiting() {
null,
null,
null,
+ null,
transitService
)
);
@@ -220,6 +223,7 @@ void findClosestPlacesWithAModeFilter() {
null,
null,
null,
+ null,
transitService
)
);
@@ -237,6 +241,7 @@ void findClosestPlacesWithAModeFilter() {
null,
null,
null,
+ null,
transitService
)
);
@@ -262,6 +267,7 @@ void findClosestPlacesWithAStopFilter() {
null,
null,
null,
+ null,
transitService
)
);
@@ -279,6 +285,7 @@ void findClosestPlacesWithAStopFilter() {
null,
null,
null,
+ null,
transitService
)
);
@@ -304,6 +311,7 @@ void findClosestPlacesWithAStopAndRouteFilter() {
null,
null,
null,
+ null,
transitService
)
);
@@ -321,6 +329,7 @@ void findClosestPlacesWithAStopAndRouteFilter() {
null,
List.of(R1.getId()),
null,
+ null,
transitService
)
);
@@ -347,6 +356,7 @@ void findClosestPlacesWithARouteFilter() {
null,
null,
null,
+ null,
transitService
)
);
@@ -364,6 +374,7 @@ void findClosestPlacesWithARouteFilter() {
null,
List.of(R2.getId()),
null,
+ null,
transitService
)
);
@@ -387,6 +398,7 @@ void findClosestPlacesWithAVehicleRentalFilter() {
null,
null,
null,
+ null,
transitService
)
);
@@ -404,6 +416,7 @@ void findClosestPlacesWithAVehicleRentalFilter() {
null,
null,
List.of("BR2"),
+ null,
transitService
)
);
@@ -426,6 +439,7 @@ void findClosestPlacesWithABikeParkFilter() {
null,
null,
null,
+ null,
transitService
)
);
@@ -448,6 +462,7 @@ void findClosestPlacesWithACarParkFilter() {
null,
null,
null,
+ null,
transitService
)
);
diff --git a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java b/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
index 4864fab5e43..c3837942426 100644
--- a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
+++ b/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
@@ -13,6 +13,7 @@ public class TestFreeFloatingRentalVehicleBuilder {
private double latitude = DEFAULT_LATITUDE;
private double longitude = DEFAULT_LONGITUDE;
+ private VehicleRentalSystem system = null;
private RentalVehicleType vehicleType = RentalVehicleType.getDefaultType(NETWORK_1);
@@ -30,6 +31,28 @@ public TestFreeFloatingRentalVehicleBuilder withLongitude(double longitude) {
return this;
}
+ public TestFreeFloatingRentalVehicleBuilder withSystem(String id, String url) {
+ this.system =
+ new VehicleRentalSystem(
+ id,
+ null,
+ null,
+ null,
+ null,
+ url,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ );
+ return this;
+ }
+
public TestFreeFloatingRentalVehicleBuilder withVehicleScooter() {
return buildVehicleType(RentalFormFactor.SCOOTER);
}
@@ -63,6 +86,7 @@ public VehicleRentalVehicle build() {
vehicle.latitude = latitude;
vehicle.longitude = longitude;
vehicle.vehicleType = vehicleType;
+ vehicle.system = system;
return vehicle;
}
}
diff --git a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java b/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java
index 33f922ff0b9..0fb9f8b620f 100644
--- a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java
+++ b/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java
@@ -19,6 +19,7 @@ public class TestVehicleRentalStationBuilder {
private int spaces = 10;
private boolean overloadingAllowed = false;
private boolean stationOn = false;
+ private VehicleRentalSystem system = null;
private final Map vehicleTypesAvailable = new HashMap<>();
private final Map vehicleSpacesAvailable = new HashMap<>();
@@ -52,6 +53,28 @@ public TestVehicleRentalStationBuilder withStationOn(boolean stationOn) {
return this;
}
+ public TestVehicleRentalStationBuilder withSystem(String id, String url) {
+ this.system =
+ new VehicleRentalSystem(
+ id,
+ null,
+ null,
+ null,
+ null,
+ url,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ );
+ return this;
+ }
+
public TestVehicleRentalStationBuilder withVehicleTypeBicycle(int numAvailable, int numSpaces) {
return buildVehicleType(
RentalFormFactor.BICYCLE,
@@ -127,6 +150,7 @@ public VehicleRentalStation build() {
station.isRenting = stationOn;
station.isReturning = stationOn;
station.realTimeData = true;
+ station.system = system;
return station;
}
}
diff --git a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java
index e43c5a769d0..3750c4619b9 100644
--- a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java
+++ b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java
@@ -16,6 +16,7 @@
import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder;
import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder;
import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink;
import org.opentripplanner.service.vehiclerental.street.VehicleRentalEdge;
import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
@@ -219,6 +220,19 @@ public TestStateBuilder stop() {
return arriveAtStop(testModel.stop("stop", count, count).build());
}
+ /**
+ * Add a state that arrives at a rental station.
+ */
+ public TestStateBuilder rentalStation(VehicleRentalStation station) {
+ count++;
+ var from = (StreetVertex) currentState.vertex;
+ var to = new VehicleRentalPlaceVertex(station);
+
+ var link = StreetVehicleRentalLink.createStreetVehicleRentalLink(from, to);
+ currentState = link.traverse(currentState)[0];
+ return this;
+ }
+
public TestStateBuilder enterStation(String id) {
count++;
var from = (StreetVertex) currentState.vertex;
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json
index 82d929adeb1..b6b5b7ee674 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json
@@ -10,6 +10,20 @@
"parentStation" : null
}
}
+ },
+ {
+ "node" : {
+ "place" : {
+ "stationId" : "Network-1:FooStation"
+ }
+ }
+ },
+ {
+ "node" : {
+ "place" : {
+ "vehicleId" : "Network-1:free-floating-bicycle"
+ }
+ }
}
]
}
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
new file mode 100644
index 00000000000..9017fe77a93
--- /dev/null
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
@@ -0,0 +1,21 @@
+{
+ "data": {
+ "rentalVehicle": {
+ "vehicleId":"Network-1:free-floating-bicycle",
+ "name":"free-floating-bicycle",
+ "allowPickupNow":true,
+ "lon":19.01,
+ "lat":47.52,
+ "rentalUris":null,
+ "operative":true,
+ "vehicleType": {
+ "formFactor":"BICYCLE",
+ "propulsionType":"HUMAN"
+ },
+ "rentalNetwork": {
+ "networkId":"Network-1",
+ "url":"https://foo.bar"
+ }
+ }
+ }
+}
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
index ef1284c5c5e..ad1ce76d9be 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
@@ -47,13 +47,16 @@
"allowPickup" : false,
"allowDropoffNow" : false,
"allowPickupNow" : false,
- "network" : "Network-1",
"lon" : 18.99,
"lat" : 47.51,
"capacity" : null,
"allowOverloading" : false,
"rentalUris" : null,
- "operative" : false
+ "operative" : false,
+ "rentalNetwork" : {
+ "networkId" : "Network-1",
+ "url" : "https://foo.bar"
+ }
}
}
}
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql
index c7f8eed4213..469a117bab4 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql
@@ -1,5 +1,11 @@
{
- nearest(lat: 60.19915, lon: 24.94089, maxDistance: 500) {
+ nearest(
+ lat: 60.19915
+ lon: 24.94089
+ maxDistance: 500
+ filterByPlaceTypes: [STOP, VEHICLE_RENT]
+ filterByNetwork: ["Network-1"]
+ ) {
edges {
node {
place {
@@ -10,6 +16,12 @@
id
}
}
+ ... on RentalVehicle {
+ vehicleId
+ }
+ ... on VehicleRentalStation {
+ stationId
+ }
}
}
}
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
new file mode 100644
index 00000000000..9a912781c56
--- /dev/null
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
@@ -0,0 +1,23 @@
+{
+ rentalVehicle(id: "Network-1:free-floating-bicycle") {
+ vehicleId
+ name
+ allowPickupNow
+ lon
+ lat
+ rentalUris {
+ android
+ ios
+ web
+ }
+ operative
+ vehicleType {
+ formFactor
+ propulsionType
+ }
+ rentalNetwork {
+ networkId
+ url
+ }
+ }
+}
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
index 8e555ffdbdd..a2200465912 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
@@ -28,7 +28,6 @@
allowPickup
allowDropoffNow
allowPickupNow
- network
lon
lat
capacity
@@ -39,5 +38,9 @@
web
}
operative
+ rentalNetwork {
+ networkId
+ url
+ }
}
}