>) modesInput.get(
"transportModes"
);
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java
index 59259905944..e7a13dcacc9 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java
@@ -15,7 +15,7 @@ class RequestModesMapper {
* Maps GraphQL Modes input type to RequestModes.
*
* This only maps access, egress, direct & transfer modes. Transport modes are set using filters.
- * Default modes are WALK for access, egress, direct & transfer.
+ * Default modes are WALK for access, egress & transfer.
*/
static RequestModes mapRequestModes(Map modesInput) {
RequestModesBuilder mBuilder = RequestModes.of();
@@ -28,9 +28,8 @@ static RequestModes mapRequestModes(Map modesInput) {
if (modesInput.containsKey(egressModeKey)) {
mBuilder.withEgressMode((StreetMode) modesInput.get(egressModeKey));
}
- if (modesInput.containsKey(directModeKey)) {
- mBuilder.withDirectMode((StreetMode) modesInput.get(directModeKey));
- }
+ // An unset directMode should overwrite the walk default, so we don't check for existence first.
+ mBuilder.withDirectMode((StreetMode) modesInput.get(directModeKey));
return mBuilder.build();
}
diff --git a/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java b/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java
index 87a225fc0b3..85915cfeb48 100644
--- a/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java
+++ b/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java
@@ -10,8 +10,6 @@
import java.util.stream.Stream;
import org.geojson.GeoJsonObject;
import org.geojson.LngLatAlt;
-import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
-import org.geotools.referencing.CRS;
import org.locationtech.jts.algorithm.ConvexHull;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateSequence;
@@ -28,30 +26,12 @@
import org.locationtech.jts.linearref.LengthLocationMap;
import org.locationtech.jts.linearref.LinearLocation;
import org.locationtech.jts.linearref.LocationIndexedLine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class GeometryUtils {
- private static final Logger LOG = LoggerFactory.getLogger(GeometryUtils.class);
-
private static final CoordinateSequenceFactory csf = new PackedCoordinateSequenceFactory();
private static final GeometryFactory gf = new GeometryFactory(csf);
- /** A shared copy of the WGS84 CRS with longitude-first axis order. */
- public static final CoordinateReferenceSystem WGS84_XY;
-
- static {
- try {
- WGS84_XY = CRS.getAuthorityFactory(true).createCoordinateReferenceSystem("EPSG:4326");
- } catch (Exception ex) {
- LOG.error("Unable to create longitude-first WGS84 CRS", ex);
- throw new RuntimeException(
- "Could not create longitude-first WGS84 coordinate reference system."
- );
- }
- }
-
public static Geometry makeConvexHull(
Collection collection,
Function mapToCoordinate
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java
index 00404845349..26349c0d803 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java
@@ -10,7 +10,6 @@
import java.util.List;
import java.util.Map;
import java.util.Queue;
-import java.util.Set;
import java.util.stream.Collectors;
import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
import org.opentripplanner.graph_builder.issues.GraphConnectivity;
@@ -33,7 +32,6 @@
import org.opentripplanner.street.search.TraverseMode;
import org.opentripplanner.street.search.request.StreetSearchRequest;
import org.opentripplanner.street.search.state.State;
-import org.opentripplanner.transit.model.basic.TransitMode;
import org.opentripplanner.transit.service.TransitModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -252,16 +250,7 @@ private int processIslands(
if (island.stopSize() > 0) {
//for islands with stops
islandsWithStops++;
- boolean onlyFerry = true;
- for (Iterator vIter = island.stopIterator(); vIter.hasNext();) {
- TransitStopVertex v = (TransitStopVertex) vIter.next();
- Set modes = v.getModes();
- // test if stop has other transit modes than FERRY
- if (!modes.isEmpty() && !modes.contains(TransitMode.FERRY)) {
- onlyFerry = false;
- break;
- }
- }
+ boolean onlyFerry = island.hasOnlyFerryStops();
// do not remove real islands which have only ferry stops
if (!onlyFerry && island.streetSize() < pruningThresholdWithStops * adaptivePruningFactor) {
double sizeCoeff = (adaptivePruningFactor > 1.0)
@@ -487,8 +476,8 @@ private boolean restrictOrRemove(
// note: do not unlink stop if only CAR mode is pruned
// maybe this needs more logic for flex routing cases
List stopLabels = new ArrayList<>();
- for (Iterator vIter = island.stopIterator(); vIter.hasNext();) {
- Vertex v = vIter.next();
+ for (Iterator vIter = island.stopIterator(); vIter.hasNext();) {
+ TransitStopVertex v = vIter.next();
stopLabels.add(v.getLabel());
Collection edges = new ArrayList<>(v.getOutgoing());
edges.addAll(v.getIncoming());
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java
index 019c1c12a19..94dcfaaf131 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java
@@ -17,11 +17,12 @@
import org.opentripplanner.street.model.vertex.OsmVertex;
import org.opentripplanner.street.model.vertex.TransitStopVertex;
import org.opentripplanner.street.model.vertex.Vertex;
+import org.opentripplanner.transit.model.basic.TransitMode;
class Subgraph {
private final Set streetVertexSet;
- private final Set stopsVertexSet;
+ private final Set stopsVertexSet;
Subgraph() {
streetVertexSet = new HashSet<>();
@@ -29,8 +30,8 @@ class Subgraph {
}
void addVertex(Vertex vertex) {
- if (vertex instanceof TransitStopVertex) {
- stopsVertexSet.add(vertex);
+ if (vertex instanceof TransitStopVertex transitStopVertex) {
+ stopsVertexSet.add(transitStopVertex);
} else {
streetVertexSet.add(vertex);
}
@@ -64,7 +65,7 @@ Iterator streetIterator() {
return streetVertexSet.iterator();
}
- Iterator stopIterator() {
+ Iterator stopIterator() {
return stopsVertexSet.iterator();
}
@@ -98,8 +99,7 @@ Iterator stopIterator() {
Vertex vx = vIter.next();
envelope.expandToInclude(vx.getCoordinate());
}
- for (Iterator vIter = stopIterator(); vIter.hasNext();) {
- Vertex vx = vIter.next();
+ for (TransitStopVertex vx : stopsVertexSet) {
envelope.expandToInclude(vx.getCoordinate());
}
envelope.expandBy(searchRadiusDegrees / xscale, searchRadiusDegrees);
@@ -127,4 +127,21 @@ Geometry getGeometry() {
return new MultiPoint(points.toArray(new Point[0]), geometryFactory);
}
+
+ /**
+ * Checks whether the subgraph has only transit-stops for ferries
+ *
+ * @return true if only ferries stop at the subgraph and false if other or no modes are
+ * stopping at the subgraph
+ */
+ boolean hasOnlyFerryStops() {
+ for (TransitStopVertex v : stopsVertexSet) {
+ Set modes = v.getModes();
+ // test if stop has other transit modes than FERRY
+ if (!modes.contains(TransitMode.FERRY)) {
+ return false;
+ }
+ }
+ return true;
+ }
}
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java
index 592d34fb543..6bcab049bd4 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java
@@ -20,13 +20,14 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.geotools.api.coverage.Coverage;
import org.geotools.api.coverage.PointOutsideCoverageException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
import org.geotools.api.referencing.operation.TransformException;
import org.geotools.geometry.Position2D;
+import org.geotools.referencing.CRS;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
import org.opentripplanner.framework.geometry.EncodedPolyline;
-import org.opentripplanner.framework.geometry.GeometryUtils;
import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
import org.opentripplanner.framework.lang.IntUtils;
import org.opentripplanner.framework.logging.ProgressTracker;
@@ -61,6 +62,25 @@
public class ElevationModule implements GraphBuilderModule {
private static final Logger LOG = LoggerFactory.getLogger(ElevationModule.class);
+ /**
+ * The WGS84 CRS with longitude-first axis order. The first time a CRS lookup is
+ * performed is surprisingly expensive (around 500ms), apparently due to initializing
+ * an HSQLDB JDBC connection. For this reason, the constant is defined in this
+ * narrower scope rather than a shared utility class, where it was seen to incur the
+ * initialization cost in a broader range of tests than is necessary.
+ */
+ private static final CoordinateReferenceSystem WGS84_XY;
+
+ static {
+ try {
+ WGS84_XY = CRS.getAuthorityFactory(true).createCoordinateReferenceSystem("EPSG:4326");
+ } catch (Exception ex) {
+ LOG.error("Unable to create longitude-first WGS84 CRS", ex);
+ throw new RuntimeException(
+ "Could not create longitude-first WGS84 coordinate reference system."
+ );
+ }
+ }
/** The elevation data to be used in calculating elevations. */
private final ElevationGridCoverageFactory gridCoverageFactory;
@@ -564,7 +584,7 @@ private double getElevation(Coverage coverage, double x, double y)
// GeoTIFFs in various projections. Note that GeoTools defaults to strict EPSG axis ordering of (lat, long)
// for DefaultGeographicCRS.WGS84, but OTP is using (long, lat) throughout and assumes unprojected DEM
// rasters to also use (long, lat).
- coverage.evaluate(new Position2D(GeometryUtils.WGS84_XY, x, y), values);
+ coverage.evaluate(new Position2D(WGS84_XY, x, y), values);
} catch (PointOutsideCoverageException e) {
nPointsOutsideDEM.incrementAndGet();
throw e;
diff --git a/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java b/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java
index 4f090a440b6..0ceae6cb456 100644
--- a/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java
+++ b/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java
@@ -51,8 +51,14 @@ public static LegReference decode(String legReference) {
return null;
}
- var buf = Base64.getUrlDecoder().decode(legReference);
- var input = new ByteArrayInputStream(buf);
+ byte[] serializedLegReference;
+ try {
+ serializedLegReference = Base64.getUrlDecoder().decode(legReference);
+ } catch (IllegalArgumentException e) {
+ LOG.info("Unable to decode leg reference (invalid base64 encoding): '{}'", legReference, e);
+ return null;
+ }
+ var input = new ByteArrayInputStream(serializedLegReference);
try (var in = new ObjectInputStream(input)) {
// The order must be the same in the encode and decode function
@@ -60,7 +66,11 @@ public static LegReference decode(String legReference) {
var type = readEnum(in, LegReferenceType.class);
return type.getDeserializer().read(in);
} catch (IOException e) {
- LOG.error("Unable to decode leg reference: '" + legReference + "'", e);
+ LOG.warn(
+ "Unable to decode leg reference (incompatible serialization format): '{}'",
+ legReference,
+ e
+ );
return null;
}
}
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java b/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java
index 765a9b5c47f..740224b4489 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java
@@ -67,7 +67,7 @@ class TripPatternMapper {
private final ReadOnlyHierarchicalMap routeById;
- private final Multimap serviceJourniesByPatternId = ArrayListMultimap.create();
+ private final Multimap serviceJourneysByPatternId = ArrayListMultimap.create();
private final ReadOnlyHierarchicalMapById operatingDayById;
@@ -152,12 +152,12 @@ class TripPatternMapper {
this.serviceJourneyById = serviceJourneyById;
// Index service journey by pattern id
for (ServiceJourney sj : serviceJourneyById.localValues()) {
- this.serviceJourniesByPatternId.put(sj.getJourneyPatternRef().getValue().getRef(), sj);
+ this.serviceJourneysByPatternId.put(sj.getJourneyPatternRef().getValue().getRef(), sj);
}
}
Optional mapTripPattern(JourneyPattern_VersionStructure journeyPattern) {
- Collection serviceJourneys = serviceJourniesByPatternId.get(
+ Collection serviceJourneys = serviceJourneysByPatternId.get(
journeyPattern.getId()
);
@@ -392,9 +392,12 @@ private Trip mapTrip(
JourneyPattern_VersionStructure journeyPattern,
ServiceJourney serviceJourney
) {
- return tripMapper.mapServiceJourney(
- serviceJourney,
- () -> findTripHeadsign(journeyPattern, serviceJourney)
+ return deduplicator.deduplicateObject(
+ Trip.class,
+ tripMapper.mapServiceJourney(
+ serviceJourney,
+ () -> findTripHeadsign(journeyPattern, serviceJourney)
+ )
);
}
diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java
index c0cd049bd83..b1e90044bf2 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java
@@ -109,20 +109,6 @@ public boolean isOneWayReverseBicycle() {
return "-1".equals(oneWayBicycle) || isTagFalse("bicycle:forward");
}
- /**
- * Returns true if bikes must use sidepath in forward direction
- */
- public boolean isForwardDirectionSidepath() {
- return "use_sidepath".equals(getTag("bicycle:forward"));
- }
-
- /**
- * Returns true if bikes must use sidepath in reverse direction
- */
- public boolean isReverseDirectionSidepath() {
- return "use_sidepath".equals(getTag("bicycle:backward"));
- }
-
/**
* Some cycleways allow contraflow biking.
*/
@@ -188,18 +174,6 @@ public StreetTraversalPermissionPair splitPermissions(StreetTraversalPermission
}
}
- //This needs to be after adding permissions for oneway:bicycle=no
- //removes bicycle permission when bicycles need to use sidepath
- //TAG: bicycle:forward=use_sidepath
- if (isForwardDirectionSidepath()) {
- permissionsFront = permissionsFront.remove(StreetTraversalPermission.BICYCLE);
- }
-
- //TAG bicycle:backward=use_sidepath
- if (isReverseDirectionSidepath()) {
- permissionsBack = permissionsBack.remove(StreetTraversalPermission.BICYCLE);
- }
-
if (isOpposableCycleway()) {
permissionsBack = permissionsBack.add(StreetTraversalPermission.BICYCLE);
}
diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java
index 51bc9da1dd8..636584eb770 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java
@@ -403,14 +403,10 @@ public boolean isVehicleExplicitlyAllowed() {
/**
* Returns true if bikes are explicitly denied access.
*
- * bicycle is denied if bicycle:no, bicycle:dismount, bicycle:license or bicycle:use_sidepath
+ * bicycle is denied if bicycle:no, bicycle:dismount or bicycle:license.
*/
public boolean isBicycleExplicitlyDenied() {
- return (
- isTagDeniedAccess("bicycle") ||
- "dismount".equals(getTag("bicycle")) ||
- "use_sidepath".equals(getTag("bicycle"))
- );
+ return (isTagDeniedAccess("bicycle") || "dismount".equals(getTag("bicycle")));
}
/**
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
index 1463313203d..9989c102030 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
@@ -624,6 +624,9 @@ public void populateProperties(WayPropertySet props) {
props.setMixinProperties("foot=discouraged", ofWalkSafety(3));
props.setMixinProperties("bicycle=discouraged", ofBicycleSafety(3));
+ props.setMixinProperties("foot=use_sidepath", ofWalkSafety(5));
+ props.setMixinProperties("bicycle=use_sidepath", ofBicycleSafety(5));
+
populateNotesAndNames(props);
// slope overrides
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java
index 9bafe133f2a..5ea949e8d5c 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java
@@ -1,5 +1,6 @@
package org.opentripplanner.openstreetmap.tagmapping;
+import static org.opentripplanner.openstreetmap.wayproperty.MixinPropertiesBuilder.ofWalkSafety;
import static org.opentripplanner.openstreetmap.wayproperty.WayPropertiesBuilder.withModes;
import static org.opentripplanner.street.model.StreetTraversalPermission.ALL;
import static org.opentripplanner.street.model.StreetTraversalPermission.CAR;
@@ -163,6 +164,10 @@ else if (speedLimit <= 16.65f) {
props.setProperties("highway=service;tunnel=yes;access=destination", withModes(NONE));
props.setProperties("highway=service;access=destination", withModes(ALL).bicycleSafety(1.1));
+ // Typically if this tag is used on a way, there is also a better option for walking.
+ // We don't need to set bicycle safety as cycling is not currently allowed on these ways.
+ props.setMixinProperties("bicycle=use_sidepath", ofWalkSafety(5));
+
// Automobile speeds in Finland.
// General speed limit is 80kph unless signs says otherwise.
props.defaultCarSpeed = 22.22f;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
index 60cfb72ef7d..288f429a861 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
@@ -22,6 +22,8 @@ public class TransitLayer {
/**
* Transit data required for routing, indexed by each local date(Graph TimeZone) it runs through.
* A Trip "runs through" a date if any of its arrivals or departures is happening on that date.
+ * The same trip pattern can therefore have multiple running dates and trip pattern is not
+ * required to "run" on its service date.
*/
private final HashMap> tripPatternsRunningOnDate;
@@ -94,7 +96,12 @@ public StopLocation getStopByIndex(int stop) {
return stop == -1 ? null : this.stopModel.stopByIndex(stop);
}
- public Collection getTripPatternsForDate(LocalDate date) {
+ /**
+ * Returns trip patterns for the given running date. Running date is not necessarily the same
+ * as the service date. A Trip "runs through" a date if any of its arrivals or departures is
+ * happening on that date. Trip pattern can have multiple running dates.
+ */
+ public Collection getTripPatternsForRunningDate(LocalDate date) {
return tripPatternsRunningOnDate.getOrDefault(date, List.of());
}
@@ -112,16 +119,29 @@ public int getStopCount() {
return stopModel.stopIndexSize();
}
+ /**
+ * Returns a copy of the list of trip patterns for the given running date. Running date is not
+ * necessarily the same as the service date. A Trip "runs through" a date if any of its arrivals
+ * or departures is happening on that date. Trip pattern can have multiple running dates.
+ */
public List getTripPatternsRunningOnDateCopy(LocalDate runningPeriodDate) {
List tripPatternForDate = tripPatternsRunningOnDate.get(runningPeriodDate);
return tripPatternForDate != null ? new ArrayList<>(tripPatternForDate) : new ArrayList<>();
}
- public List getTripPatternsStartingOnDateCopy(LocalDate date) {
- List tripPatternsRunningOnDate = getTripPatternsRunningOnDateCopy(date);
- return tripPatternsRunningOnDate
+ /**
+ * Returns a copy of the list of trip patterns for the given service date. Service date is not
+ * necessarily the same as any of the trip pattern's running dates.
+ */
+ public List getTripPatternsOnServiceDateCopy(LocalDate date) {
+ List tripPatternsRunningOnDates = getTripPatternsRunningOnDateCopy(date);
+ // Trip pattern can run only after midnight. Therefore, we need to get the trip pattern's for
+ // the next running date as well and filter out duplicates.
+ tripPatternsRunningOnDates.addAll(getTripPatternsRunningOnDateCopy(date.plusDays(1)));
+ return tripPatternsRunningOnDates
.stream()
- .filter(t -> t.getLocalDate().equals(date))
+ .filter(t -> t.getServiceDate().equals(date))
+ .distinct()
.collect(Collectors.toList());
}
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java
index b86314aa42c..1411424dfc6 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java
@@ -43,16 +43,16 @@ public class TripPatternForDate implements Comparable {
*/
private final FrequencyEntry[] frequencies;
- /** The date for which the filtering was performed. */
- private final LocalDate localDate;
+ /** The service date of the trip pattern. */
+ private final LocalDate serviceDate;
/**
- * The date on which the first trip departs.
+ * The running date on which the first trip departs. Not necessarily the same as the service date.
*/
private final LocalDate startOfRunningPeriod;
/**
- * The date on which the last trip arrives.
+ * The running date on which the last trip arrives.
*/
private final LocalDate endOfRunningPeriod;
@@ -60,19 +60,19 @@ public TripPatternForDate(
RoutingTripPattern tripPattern,
List tripTimes,
List frequencies,
- LocalDate localDate
+ LocalDate serviceDate
) {
this.tripPattern = tripPattern;
this.tripTimes = tripTimes.toArray(new TripTimes[0]);
this.frequencies = frequencies.toArray(new FrequencyEntry[0]);
- this.localDate = localDate;
+ this.serviceDate = serviceDate;
// TODO: We expect a pattern only containing trips or frequencies, fix ability to merge
if (hasFrequencies()) {
this.startOfRunningPeriod =
ServiceDateUtils
.asDateTime(
- localDate,
+ serviceDate,
frequencies
.stream()
.mapToInt(frequencyEntry -> frequencyEntry.startTime)
@@ -84,7 +84,7 @@ public TripPatternForDate(
this.endOfRunningPeriod =
ServiceDateUtils
.asDateTime(
- localDate,
+ serviceDate,
frequencies
.stream()
.mapToInt(frequencyEntry -> frequencyEntry.endTime)
@@ -96,11 +96,11 @@ public TripPatternForDate(
// These depend on the tripTimes array being sorted
var first = tripTimes.get(0);
this.startOfRunningPeriod =
- ServiceDateUtils.asDateTime(localDate, first.getDepartureTime(0)).toLocalDate();
+ ServiceDateUtils.asDateTime(serviceDate, first.getDepartureTime(0)).toLocalDate();
var last = tripTimes.get(tripTimes.size() - 1);
this.endOfRunningPeriod =
ServiceDateUtils
- .asDateTime(localDate, last.getArrivalTime(last.getNumStops() - 1))
+ .asDateTime(serviceDate, last.getArrivalTime(last.getNumStops() - 1))
.toLocalDate();
assertValidRunningPeriod(startOfRunningPeriod, endOfRunningPeriod, first, last);
}
@@ -126,18 +126,31 @@ public TripTimes getTripTimes(int i) {
return tripTimes[i];
}
- public LocalDate getLocalDate() {
- return localDate;
+ /**
+ * The service date for which the trip pattern belongs to. Not necessarily the same as the start
+ * of the running period in cases where the trip pattern only runs after midnight.
+ */
+ public LocalDate getServiceDate() {
+ return serviceDate;
}
public int numberOfTripSchedules() {
return tripTimes.length;
}
+ /**
+ * The start of the running period. This is determined by the first departure time for this
+ * pattern. Not necessarily the same as the service date if the pattern runs after midnight.
+ */
public LocalDate getStartOfRunningPeriod() {
return startOfRunningPeriod;
}
+ /**
+ * Returns the running dates. A Trip "runs through" a date if any of its arrivals or departures is
+ * happening on that date. The same trip pattern can therefore have multiple running dates and
+ * trip pattern is not required to "run" on its service date.
+ */
public List getRunningPeriodDates() {
// Add one day to ensure last day is included
return startOfRunningPeriod
@@ -151,14 +164,14 @@ public boolean hasFrequencies() {
@Override
public int compareTo(TripPatternForDate other) {
- return localDate.compareTo(other.localDate);
+ return serviceDate.compareTo(other.serviceDate);
}
@Override
public int hashCode() {
return Objects.hash(
tripPattern,
- localDate,
+ serviceDate,
Arrays.hashCode(tripTimes),
Arrays.hashCode(frequencies)
);
@@ -176,7 +189,7 @@ public boolean equals(Object o) {
return (
tripPattern.equals(that.tripPattern) &&
- localDate.equals(that.localDate) &&
+ serviceDate.equals(that.serviceDate) &&
Arrays.equals(tripTimes, that.tripTimes) &&
Arrays.equals(frequencies, that.frequencies)
);
@@ -184,7 +197,9 @@ public boolean equals(Object o) {
@Override
public String toString() {
- return "TripPatternForDate{" + "tripPattern=" + tripPattern + ", localDate=" + localDate + '}';
+ return (
+ "TripPatternForDate{" + "tripPattern=" + tripPattern + ", serviceDate=" + serviceDate + '}'
+ );
}
@Nullable
@@ -214,7 +229,7 @@ public TripPatternForDate newWithFilteredTripTimes(Predicate filter)
return this;
}
- return new TripPatternForDate(tripPattern, filteredTripTimes, filteredFrequencies, localDate);
+ return new TripPatternForDate(tripPattern, filteredTripTimes, filteredFrequencies, serviceDate);
}
private static void assertValidRunningPeriod(
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java
index 451f51b2aa5..2f020e22cf5 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java
@@ -55,7 +55,7 @@ public RaptorBoardOrAlightEvent search(
arrivalTime + headway,
headway,
offset,
- pattern.getLocalDate()
+ pattern.getServiceDate()
);
}
}
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java
index 897ce370a93..ea58e870547 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java
@@ -54,7 +54,7 @@ public RaptorBoardOrAlightEvent search(
departureTime - headway,
headway,
offset,
- pattern.getLocalDate()
+ pattern.getServiceDate()
);
}
}
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
index bed27497587..fad5de83de0 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
@@ -96,7 +96,7 @@ public void update(
if (!tripPatternsStartingOnDateMapCache.containsKey(date)) {
Map map = realtimeTransitLayer
- .getTripPatternsStartingOnDateCopy(date)
+ .getTripPatternsOnServiceDateCopy(date)
.stream()
.collect(Collectors.toMap(t -> t.getTripPattern().getPattern(), t -> t));
tripPatternsStartingOnDateMapCache.put(date, map);
@@ -146,7 +146,7 @@ public void update(
} else {
LOG.debug(
"NEW TripPatternForDate: {} - {}",
- newTripPatternForDate.getLocalDate(),
+ newTripPatternForDate.getServiceDate(),
newTripPatternForDate.getTripPattern().debugInfo()
);
}
@@ -179,7 +179,7 @@ public void update(
}
for (TripPatternForDate tripPatternForDate : previouslyUsedPatterns) {
- if (tripPatternForDate.getLocalDate().equals(date)) {
+ if (tripPatternForDate.getServiceDate().equals(date)) {
TripPattern pattern = tripPatternForDate.getTripPattern().getPattern();
if (!pattern.isCreatedByRealtimeUpdater()) {
continue;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
index 863a4ca9ae8..f987e4f7a21 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
@@ -120,7 +120,7 @@ static List merge(
// Calculate offsets per date
int[] offsets = new int[patternsSorted.length];
for (int i = 0; i < patternsSorted.length; i++) {
- LocalDate serviceDate = patternsSorted[i].getLocalDate();
+ LocalDate serviceDate = patternsSorted[i].getServiceDate();
if (offsetCache.containsKey(serviceDate)) {
offsets[i] = offsetCache.get(serviceDate);
} else {
@@ -185,7 +185,9 @@ private static List filterActiveTripPatterns(
filter.tripTimesPredicate(tripTimes, filter.hasSubModeFilters());
Predicate tripTimesWithoutSubmodesPredicate = tripTimes ->
filter.tripTimesPredicate(tripTimes, false);
- Collection tripPatternsForDate = transitLayer.getTripPatternsForDate(date);
+ Collection tripPatternsForDate = transitLayer.getTripPatternsForRunningDate(
+ date
+ );
List result = new ArrayList<>(tripPatternsForDate.size());
for (TripPatternForDate p : tripPatternsForDate) {
if (firstDay || p.getStartOfRunningPeriod().equals(date)) {
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java
index 642dbd2d6e5..aca998b24ca 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java
@@ -124,7 +124,7 @@ private void findTripTimes() {
if (index < numSchedules) {
this.tripTimes = tripPatternForDate.getTripTimes(index);
- this.serviceDate = tripPatternForDate.getLocalDate();
+ this.serviceDate = tripPatternForDate.getServiceDate();
this.secondsOffset = pattern.tripPatternForDateOffsets(i);
return;
}
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java
index e5b0fd083dc..6ebd34e1287 100644
--- a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java
+++ b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java
@@ -120,9 +120,10 @@ public class VehicleParking implements Serializable {
VehicleParkingSpaces availability,
VehicleParkingGroup vehicleParkingGroup
) {
- this.id = id;
+ this.id =
+ Objects.requireNonNull(id, "%s must have an ID".formatted(this.getClass().getSimpleName()));
this.name = name;
- this.coordinate = coordinate;
+ this.coordinate = Objects.requireNonNull(coordinate);
this.detailsUrl = detailsUrl;
this.imageUrl = imageUrl;
this.tags = tags;
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java
index 6caf9082cff..70b8e261ee4 100644
--- a/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java
+++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java
@@ -10,7 +10,8 @@ public enum OtpVersion {
V2_2("2.2"),
V2_3("2.3"),
V2_4("2.4"),
- V2_5("2.5");
+ V2_5("2.5"),
+ V2_6("2.6");
private final String text;
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java
index e808ad6905c..f0306941547 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java
@@ -2,6 +2,7 @@
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2;
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_3;
+import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_6;
import java.time.Duration;
import java.time.ZoneId;
@@ -9,6 +10,7 @@
import java.util.Set;
import org.opentripplanner.ext.vehicleparking.bikely.BikelyUpdaterParameters;
import org.opentripplanner.ext.vehicleparking.hslpark.HslParkUpdaterParameters;
+import org.opentripplanner.ext.vehicleparking.noi.NoiUpdaterParameters;
import org.opentripplanner.ext.vehicleparking.parkapi.ParkAPIUpdaterParameters;
import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
import org.opentripplanner.updater.vehicle_parking.VehicleParkingSourceType;
@@ -50,7 +52,7 @@ public static VehicleParkingUpdaterParameters create(String updaterRef, NodeAdap
);
case PARK_API, BICYCLE_PARK_API -> new ParkAPIUpdaterParameters(
updaterRef,
- c.of("url").since(V2_2).summary("URL of the resource.").asString(null),
+ c.of("url").since(V2_2).summary("URL of the resource.").asString(),
feedId,
c
.of("frequency")
@@ -66,7 +68,7 @@ public static VehicleParkingUpdaterParameters create(String updaterRef, NodeAdap
);
case BIKELY -> new BikelyUpdaterParameters(
updaterRef,
- c.of("url").since(V2_3).summary("URL of the locations endpoint.").asUri(null),
+ c.of("url").since(V2_3).summary("URL of the locations endpoint.").asUri(),
feedId,
c
.of("frequency")
@@ -75,6 +77,17 @@ public static VehicleParkingUpdaterParameters create(String updaterRef, NodeAdap
.asDuration(Duration.ofMinutes(1)),
HttpHeadersConfig.headers(c, V2_3)
);
+ case NOI_OPEN_DATA_HUB -> new NoiUpdaterParameters(
+ updaterRef,
+ c.of("url").since(V2_6).summary("URL of the locations endpoint.").asUri(),
+ feedId,
+ c
+ .of("frequency")
+ .since(V2_6)
+ .summary("How often to update the source.")
+ .asDuration(Duration.ofMinutes(1)),
+ HttpHeadersConfig.headers(c, V2_6)
+ );
};
}
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/Money.java b/src/main/java/org/opentripplanner/transit/model/basic/Money.java
index e44994d1105..35278d8fbd8 100644
--- a/src/main/java/org/opentripplanner/transit/model/basic/Money.java
+++ b/src/main/java/org/opentripplanner/transit/model/basic/Money.java
@@ -206,4 +206,9 @@ public boolean equals(Object obj) {
return false;
}
}
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(currency, amount);
+ }
}
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java
index e0214fd9d57..3fe465a8cd5 100644
--- a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java
+++ b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java
@@ -4,6 +4,8 @@
import org.opentripplanner.ext.vehicleparking.bikely.BikelyUpdaterParameters;
import org.opentripplanner.ext.vehicleparking.hslpark.HslParkUpdater;
import org.opentripplanner.ext.vehicleparking.hslpark.HslParkUpdaterParameters;
+import org.opentripplanner.ext.vehicleparking.noi.NoiUpdater;
+import org.opentripplanner.ext.vehicleparking.noi.NoiUpdaterParameters;
import org.opentripplanner.ext.vehicleparking.parkapi.BicycleParkAPIUpdater;
import org.opentripplanner.ext.vehicleparking.parkapi.CarParkAPIUpdater;
import org.opentripplanner.ext.vehicleparking.parkapi.ParkAPIUpdaterParameters;
@@ -36,6 +38,7 @@ public static DataSource create(
openingHoursCalendarService
);
case BIKELY -> new BikelyUpdater((BikelyUpdaterParameters) parameters);
+ case NOI_OPEN_DATA_HUB -> new NoiUpdater((NoiUpdaterParameters) parameters);
};
}
}
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java
index 583bc9afc99..3a0cb7d31b3 100644
--- a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java
+++ b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java
@@ -5,4 +5,5 @@ public enum VehicleParkingSourceType {
BICYCLE_PARK_API,
HSL_PARK,
BIKELY,
+ NOI_OPEN_DATA_HUB,
}
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java
index 3d2e9b21e29..185de6bddb7 100644
--- a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java
@@ -8,6 +8,7 @@
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
+import org.opentripplanner.framework.tostring.ToStringBuilder;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.linking.DisposableEdgeCollection;
import org.opentripplanner.routing.linking.LinkingDirection;
@@ -68,7 +69,7 @@ public void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph) {
}
@Override
- protected void runPolling() throws Exception {
+ protected void runPolling() {
LOG.debug("Updating vehicle parkings from {}", source);
if (!source.update()) {
LOG.debug("No updates");
@@ -239,4 +240,9 @@ private void removeVehicleParkingEdgesFromGraph(
graph.remove(entranceVertex);
}
}
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.of(this.getClass()).addObj("source", source).toString();
+ }
}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
index 2f1e57ef4dc..fcc59af845f 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
@@ -131,6 +131,7 @@ static void setup() {
VehicleParking
.builder()
.id(id("parking-1"))
+ .coordinate(WgsCoordinate.GREENWICH)
.name(NonLocalizedString.ofNullable("parking"))
.build()
),
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java
index 160014213d3..b8d08c7d7f5 100644
--- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java
@@ -13,9 +13,11 @@ class RequestModesMapperTest {
void testMapRequestModesEmptyMapReturnsDefaults() {
Map inputModes = Map.of();
+ RequestModes wantModes = RequestModes.of().withDirectMode(null).build();
+
RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes);
- assertEquals(RequestModes.of().build(), mappedModes);
+ assertEquals(wantModes, mappedModes);
}
@Test
@@ -26,6 +28,7 @@ void testMapRequestModesAccessSetReturnsDefaultsForOthers() {
.of()
.withAccessMode(StreetMode.BIKE)
.withTransferMode(StreetMode.BIKE)
+ .withDirectMode(null)
.build();
RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes);
@@ -37,7 +40,11 @@ void testMapRequestModesAccessSetReturnsDefaultsForOthers() {
void testMapRequestModesEgressSetReturnsDefaultsForOthers() {
Map inputModes = Map.of("egressMode", StreetMode.CAR);
- RequestModes wantModes = RequestModes.of().withEgressMode(StreetMode.CAR).build();
+ RequestModes wantModes = RequestModes
+ .of()
+ .withEgressMode(StreetMode.CAR)
+ .withDirectMode(null)
+ .build();
RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes);
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java b/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java
index 95f4df79b7b..23f4ffc72ca 100644
--- a/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java
+++ b/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java
@@ -9,7 +9,6 @@
import org.junit.jupiter.api.Test;
import org.opentripplanner.framework.geometry.WgsCoordinate;
import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.vehicle_parking.VehicleParking;
import org.opentripplanner.routing.vehicle_parking.VehicleParkingHelper;
import org.opentripplanner.routing.vehicle_parking.VehicleParkingTestGraphData;
import org.opentripplanner.street.model.StreetTraversalPermission;
@@ -46,8 +45,8 @@ public void setup() {
@Test
public void entranceWithVertexLinkingTest() {
- var parking = VehicleParking
- .builder()
+ var parking = StreetModelForTest
+ .vehicleParking()
.entrance(builder ->
builder.entranceId(id("1")).coordinate(new WgsCoordinate(A.getCoordinate())).vertex(A)
)
@@ -65,8 +64,8 @@ public void entranceWithVertexLinkingTest() {
@Test
public void entranceWithoutVertexLinkingTest() {
- var parking = VehicleParking
- .builder()
+ var parking = StreetModelForTest
+ .vehicleParking()
.entrance(builder ->
builder
.entranceId(id("1"))
@@ -99,8 +98,8 @@ public void carParkingEntranceToAllTraversableStreetLinkingTest() {
StreetModelForTest.streetEdge(A, C, StreetTraversalPermission.NONE);
- var parking = VehicleParking
- .builder()
+ var parking = StreetModelForTest
+ .vehicleParking()
.entrance(builder ->
builder
.entranceId(id("1"))
@@ -123,9 +122,8 @@ public void carParkingEntranceToAllTraversableStreetLinkingTest() {
@Test
public void removeEntranceWithNonExistingVertexTest() {
- var vehicleParking = VehicleParking
- .builder()
- .id(id("VP"))
+ var vehicleParking = StreetModelForTest
+ .vehicleParking()
.bicyclePlaces(true)
.entrance(builder ->
builder
@@ -159,9 +157,8 @@ public void removeEntranceWithNonExistingVertexTest() {
@Test
public void removeVehicleParkingWithOneEntranceAndNonExistingVertexTest() {
- var vehicleParking = VehicleParking
- .builder()
- .id(id("VP"))
+ var vehicleParking = StreetModelForTest
+ .vehicleParking()
.bicyclePlaces(true)
.entrance(builder ->
builder
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java
new file mode 100644
index 00000000000..26aaf12896b
--- /dev/null
+++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java
@@ -0,0 +1,112 @@
+package org.opentripplanner.graph_builder.module.islandpruning;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.street.model.vertex.TransitStopVertex;
+import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder;
+import org.opentripplanner.transit.model._data.TransitModelForTest;
+import org.opentripplanner.transit.model.basic.TransitMode;
+import org.opentripplanner.transit.model.site.RegularStop;
+
+class SubgraphOnlyFerryTest {
+
+ private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of();
+ private static final RegularStop regularStop1 = TEST_MODEL.stop("TEST-1").build();
+ private static final RegularStop regularStop2 = TEST_MODEL.stop("TEST-2").build();
+
+ @Test
+ void subgraphHasOnlyFerry() {
+ TransitStopVertex transitStopVertex = new TransitStopVertexBuilder()
+ .withStop(regularStop1)
+ .withModes(Set.of(TransitMode.FERRY))
+ .build();
+
+ Subgraph subgraph = new Subgraph();
+ subgraph.addVertex(transitStopVertex);
+
+ assertTrue(subgraph.hasOnlyFerryStops());
+ }
+
+ @Test
+ void subgraphHasOnlyNoFerry() {
+ TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder()
+ .withStop(regularStop1)
+ .withModes(Set.of(TransitMode.BUS))
+ .build();
+
+ Subgraph subgraph = new Subgraph();
+ subgraph.addVertex(transitStopVertex1);
+
+ assertFalse(subgraph.hasOnlyFerryStops());
+ }
+
+ @Test
+ void subgraphHasOnlyNoMode() {
+ TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder()
+ .withStop(regularStop1)
+ .withModes(Set.of())
+ .build();
+
+ Subgraph subgraph = new Subgraph();
+ subgraph.addVertex(transitStopVertex1);
+
+ assertFalse(subgraph.hasOnlyFerryStops());
+ }
+
+ @Test
+ void subgraphHasOnlyFerryMoreStops() {
+ TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder()
+ .withStop(regularStop1)
+ .withModes(Set.of(TransitMode.FERRY))
+ .build();
+ TransitStopVertex transitStopVertex2 = new TransitStopVertexBuilder()
+ .withStop(regularStop2)
+ .withModes(Set.of(TransitMode.FERRY))
+ .build();
+
+ Subgraph subgraph = new Subgraph();
+ subgraph.addVertex(transitStopVertex1);
+ subgraph.addVertex(transitStopVertex2);
+
+ assertTrue(subgraph.hasOnlyFerryStops());
+ }
+
+ @Test
+ void subgraphHasNotOnlyFerryMoreStops() {
+ TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder()
+ .withStop(regularStop1)
+ .withModes(Set.of(TransitMode.FERRY))
+ .build();
+ TransitStopVertex transitStopVertex2 = new TransitStopVertexBuilder()
+ .withStop(regularStop2)
+ .withModes(Set.of(TransitMode.BUS))
+ .build();
+
+ Subgraph subgraph = new Subgraph();
+ subgraph.addVertex(transitStopVertex1);
+ subgraph.addVertex(transitStopVertex2);
+
+ assertFalse(subgraph.hasOnlyFerryStops());
+ }
+
+ @Test
+ void subgraphHasNoModeMoreStops() {
+ TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder()
+ .withStop(regularStop1)
+ .withModes(Set.of(TransitMode.FERRY))
+ .build();
+ TransitStopVertex transitStopVertex2 = new TransitStopVertexBuilder()
+ .withStop(regularStop2)
+ .withModes(Set.of())
+ .build();
+
+ Subgraph subgraph = new Subgraph();
+ subgraph.addVertex(transitStopVertex1);
+ subgraph.addVertex(transitStopVertex2);
+
+ assertFalse(subgraph.hasOnlyFerryStops());
+ }
+}
diff --git a/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java b/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java
index da295073e01..2d7df788ad3 100644
--- a/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java
+++ b/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java
@@ -2,6 +2,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.time.LocalDate;
import org.junit.jupiter.api.Test;
@@ -86,4 +87,19 @@ void testScheduledTransitLegReferenceLegacyV2Deserialize() {
assertEquals(FROM_STOP_POS, ref.fromStopPositionInPattern());
assertEquals(TO_STOP_POS, ref.toStopPositionInPattern());
}
+
+ @Test
+ void testNullSerializedLegReference() {
+ assertNull(LegReferenceSerializer.decode(null));
+ }
+
+ @Test
+ void testEmptySerializedLegReference() {
+ assertNull(LegReferenceSerializer.decode(""));
+ }
+
+ @Test
+ void testIllegalBase64CharacterInSerializedLegReference() {
+ assertNull(LegReferenceSerializer.decode("RUT:Line:5"));
+ }
}
diff --git a/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java b/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java
index b8723fdbcf3..b72c9b05277 100644
--- a/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java
+++ b/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java
@@ -40,6 +40,7 @@
import org.rutebanken.netex.model.ScheduledStopPointRefStructure;
import org.rutebanken.netex.model.ServiceAlterationEnumeration;
import org.rutebanken.netex.model.ServiceJourney;
+import org.rutebanken.netex.model.ServiceJourneyRefStructure;
import org.rutebanken.netex.model.StopPointInJourneyPattern;
import org.rutebanken.netex.model.StopPointInJourneyPatternRefStructure;
import org.rutebanken.netex.model.TimetabledPassingTime;
@@ -50,9 +51,11 @@
public class NetexTestDataSample {
public static final String SERVICE_JOURNEY_ID = "RUT:ServiceJourney:1";
+ public static final String DATED_SERVICE_JOURNEY_ID_1 = "RUT:DatedServiceJourney:1";
+ public static final String DATED_SERVICE_JOURNEY_ID_2 = "RUT:DatedServiceJourney:2";
public static final List DATED_SERVICE_JOURNEY_ID = List.of(
- "RUT:DatedServiceJourney:1",
- "RUT:DatedServiceJourney:2"
+ DATED_SERVICE_JOURNEY_ID_1,
+ DATED_SERVICE_JOURNEY_ID_2
);
public static final List OPERATING_DAYS = List.of("2022-02-28", "2022-02-29");
private static final DayType EVERYDAY = new DayType()
@@ -174,6 +177,11 @@ public NetexTestDataSample() {
DatedServiceJourney datedServiceJourney = new DatedServiceJourney()
.withId(DATED_SERVICE_JOURNEY_ID.get(i))
+ .withJourneyRef(
+ List.of(
+ MappingSupport.createWrappedRef(SERVICE_JOURNEY_ID, ServiceJourneyRefStructure.class)
+ )
+ )
.withServiceAlteration(ServiceAlterationEnumeration.PLANNED)
.withOperatingDayRef(new OperatingDayRefStructure().withRef(operatingDay.getId()));
@@ -218,6 +226,15 @@ public HierarchicalMapById getServiceJourneyById() {
return serviceJourneyById;
}
+ public DatedServiceJourney getDatedServiceJourneyById(String id) {
+ return datedServiceJourneyBySjId
+ .values()
+ .stream()
+ .filter(datedServiceJourney -> datedServiceJourney.getId().equals(id))
+ .findFirst()
+ .orElse(null);
+ }
+
public ServiceJourney getServiceJourney() {
return serviceJourneyById.lookup(SERVICE_JOURNEY_ID);
}
diff --git a/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java
index 74448fb3638..95af8f623e5 100644
--- a/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java
+++ b/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java
@@ -1,9 +1,12 @@
package org.opentripplanner.netex.mapping;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.google.common.collect.ArrayListMultimap;
+import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.junit.jupiter.api.Test;
@@ -19,17 +22,19 @@
import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
import org.opentripplanner.transit.model.timetable.TripTimes;
import org.rutebanken.netex.model.DatedServiceJourney;
+import org.rutebanken.netex.model.DatedServiceJourneyRefStructure;
import org.rutebanken.netex.model.OperatingDay;
+import org.rutebanken.netex.model.ServiceAlterationEnumeration;
/**
* @author Thomas Gran (Capra) - tgr@capraconsulting.no (29.11.2017)
*/
-public class TripPatternMapperTest {
+class TripPatternMapperTest {
private static final FeedScopedId SERVICE_ID = TransitModelForTest.id("S01");
@Test
- public void testMapTripPattern() {
+ void testMapTripPattern() {
NetexTestDataSample sample = new NetexTestDataSample();
TripPatternMapper tripPatternMapper = new TripPatternMapper(
@@ -88,9 +93,85 @@ public void testMapTripPattern() {
}
@Test
- public void testMapTripPattern_datedServiceJourney() {
+ void testMapTripPattern_datedServiceJourney() {
NetexTestDataSample sample = new NetexTestDataSample();
+ Optional res = mapTripPattern(sample);
+ assertTrue(res.isPresent());
+
+ var r = res.get();
+
+ assertEquals(2, r.tripOnServiceDates().size());
+
+ Trip trip = r.tripPattern().scheduledTripsAsStream().findFirst().get();
+
+ for (TripOnServiceDate tripOnServiceDate : r.tripOnServiceDates()) {
+ assertEquals(trip, tripOnServiceDate.getTrip());
+ assertEquals(TripAlteration.PLANNED, tripOnServiceDate.getTripAlteration());
+ assertEquals(
+ 1,
+ sample
+ .getOperatingDaysById()
+ .localValues()
+ .stream()
+ .map(OperatingDay::getId)
+ .filter(id -> id.equals(tripOnServiceDate.getServiceDate().toString()))
+ .count()
+ );
+ }
+ }
+
+ @Test
+ void testDatedServiceJourneyReplacement() {
+ NetexTestDataSample sample = new NetexTestDataSample();
+ DatedServiceJourney dsjReplaced = sample.getDatedServiceJourneyById(
+ NetexTestDataSample.DATED_SERVICE_JOURNEY_ID_1
+ );
+ dsjReplaced.setServiceAlteration(ServiceAlterationEnumeration.REPLACED);
+ DatedServiceJourney dsjReplacing = sample.getDatedServiceJourneyById(
+ NetexTestDataSample.DATED_SERVICE_JOURNEY_ID_2
+ );
+ dsjReplacing.withJourneyRef(
+ List.of(
+ MappingSupport.createWrappedRef(dsjReplaced.getId(), DatedServiceJourneyRefStructure.class)
+ )
+ );
+ Optional res = mapTripPattern(sample);
+
+ assertTrue(res.isPresent());
+ var r = res.get();
+ Optional replacedTripOnServiceDate = r
+ .tripOnServiceDates()
+ .stream()
+ .filter(tripOnServiceDate ->
+ NetexTestDataSample.DATED_SERVICE_JOURNEY_ID_1.equals(tripOnServiceDate.getId().getId())
+ )
+ .findFirst();
+
+ assertTrue(replacedTripOnServiceDate.isPresent());
+ assertEquals(TripAlteration.REPLACED, replacedTripOnServiceDate.get().getTripAlteration());
+
+ Optional replacingTripOnServiceDate = r
+ .tripOnServiceDates()
+ .stream()
+ .filter(tripOnServiceDate ->
+ NetexTestDataSample.DATED_SERVICE_JOURNEY_ID_2.equals(tripOnServiceDate.getId().getId())
+ )
+ .findFirst();
+
+ assertTrue(replacingTripOnServiceDate.isPresent());
+ assertEquals(TripAlteration.PLANNED, replacingTripOnServiceDate.get().getTripAlteration());
+ assertFalse(replacingTripOnServiceDate.get().getReplacementFor().isEmpty());
+
+ // the replaced trip should refer to the same object (object identity) whether it is accessed
+ // directly from the replaced DSJ or indirectly through the replacing DSJ.
+ assertSame(
+ replacingTripOnServiceDate.get().getReplacementFor().getFirst().getTrip(),
+ replacedTripOnServiceDate.get().getTrip()
+ );
+ }
+
+ private static Optional mapTripPattern(NetexTestDataSample sample) {
HierarchicalMapById datedServiceJourneys = new HierarchicalMapById<>();
datedServiceJourneys.addAll(sample.getDatedServiceJourneyBySjId().values());
@@ -121,28 +202,6 @@ public void testMapTripPattern_datedServiceJourney() {
Optional res = tripPatternMapper.mapTripPattern(
sample.getJourneyPattern()
);
-
- assertTrue(res.isPresent());
-
- var r = res.get();
-
- assertEquals(2, r.tripOnServiceDates().size());
-
- Trip trip = r.tripPattern().scheduledTripsAsStream().findFirst().get();
-
- for (TripOnServiceDate tripOnServiceDate : r.tripOnServiceDates()) {
- assertEquals(trip, tripOnServiceDate.getTrip());
- assertEquals(TripAlteration.PLANNED, tripOnServiceDate.getTripAlteration());
- assertEquals(
- 1,
- sample
- .getOperatingDaysById()
- .localValues()
- .stream()
- .map(OperatingDay::getId)
- .filter(id -> id.equals(tripOnServiceDate.getServiceDate().toString()))
- .count()
- );
- }
+ return res;
}
}
diff --git a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWayTest.java b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWayTest.java
index c316793ad8c..c0af4cf2701 100644
--- a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWayTest.java
+++ b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWayTest.java
@@ -92,21 +92,6 @@ void testIsOneWayBicycle() {
assertTrue(way.isOneWayReverseBicycle());
}
- @Test
- void testIsOneDirectionSidepath() {
- OSMWay way = new OSMWay();
- assertFalse(way.isForwardDirectionSidepath());
- assertFalse(way.isReverseDirectionSidepath());
-
- way.addTag("bicycle:forward", "use_sidepath");
- assertTrue(way.isForwardDirectionSidepath());
- assertFalse(way.isReverseDirectionSidepath());
-
- way.addTag("bicycle:backward", "use_sidepath");
- assertTrue(way.isForwardDirectionSidepath());
- assertTrue(way.isReverseDirectionSidepath());
- }
-
@Test
void testIsOpposableCycleway() {
OSMWay way = new OSMWay();
diff --git a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java
index 18d92a5eec8..3c060150714 100644
--- a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java
+++ b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java
@@ -136,7 +136,7 @@ void testBicycleDenied() {
assertFalse(tags.isBicycleExplicitlyDenied(), "bicycle=" + allowedValue);
}
- for (var deniedValue : List.of("no", "dismount", "license", "use_sidepath")) {
+ for (var deniedValue : List.of("no", "dismount", "license")) {
tags.addTag("bicycle", deniedValue);
assertTrue(tags.isBicycleExplicitlyDenied(), "bicycle=" + deniedValue);
}
diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java
index 9a16f6a8e2e..2a8988dda61 100644
--- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java
+++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java
@@ -147,6 +147,48 @@ void bicycleDiscouraged() {
assertEquals(2.94, discouragedProps.bicycleSafety().forward(), epsilon);
}
+ @Test
+ void footUseSidepath() {
+ var regular = WayTestData.pedestrianTunnel();
+ var props = wps.getDataForWay(regular);
+ assertEquals(PEDESTRIAN_AND_BICYCLE, props.getPermission());
+ assertEquals(1, props.walkSafety().forward());
+
+ var useSidepath = WayTestData.pedestrianTunnel().addTag("foot", "use_sidepath");
+ var useSidepathProps = wps.getDataForWay(useSidepath);
+ assertEquals(PEDESTRIAN_AND_BICYCLE, useSidepathProps.getPermission());
+ assertEquals(5, useSidepathProps.walkSafety().forward());
+ }
+
+ @Test
+ void bicycleUseSidepath() {
+ var regular = WayTestData.southeastLaBonitaWay();
+ var props = wps.getDataForWay(regular);
+ assertEquals(ALL, props.getPermission());
+ assertEquals(.98, props.bicycleSafety().forward());
+
+ var useSidepath = WayTestData.southeastLaBonitaWay().addTag("bicycle", "use_sidepath");
+ var useSidepathProps = wps.getDataForWay(useSidepath);
+ assertEquals(ALL, useSidepathProps.getPermission());
+ assertEquals(4.9, useSidepathProps.bicycleSafety().forward(), epsilon);
+
+ var useSidepathForward = WayTestData
+ .southeastLaBonitaWay()
+ .addTag("bicycle:forward", "use_sidepath");
+ var useSidepathForwardProps = wps.getDataForWay(useSidepathForward);
+ assertEquals(ALL, useSidepathForwardProps.getPermission());
+ assertEquals(4.9, useSidepathForwardProps.bicycleSafety().forward(), epsilon);
+ assertEquals(0.98, useSidepathForwardProps.bicycleSafety().back(), epsilon);
+
+ var useSidepathBackward = WayTestData
+ .southeastLaBonitaWay()
+ .addTag("bicycle:backward", "use_sidepath");
+ var useSidepathBackwardProps = wps.getDataForWay(useSidepathBackward);
+ assertEquals(ALL, useSidepathBackwardProps.getPermission());
+ assertEquals(0.98, useSidepathBackwardProps.bicycleSafety().forward(), epsilon);
+ assertEquals(4.9, useSidepathBackwardProps.bicycleSafety().back(), epsilon);
+ }
+
/**
* Test that two values are within epsilon of each other.
*/
diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java
index a2f84873f20..4dd52195acb 100644
--- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java
+++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java
@@ -162,6 +162,13 @@ public void testSafetyWithMixins() {
wps.getDataForWay(wayWithMixinsAndCustomSafety).walkSafety().forward(),
epsilon
);
+
+ OSMWithTags wayWithBicycleSidePath = new OSMWithTags();
+ wayWithBicycleSidePath.addTag("bicycle", "use_sidepath");
+ assertEquals(8, wps.getDataForWay(wayWithBicycleSidePath).walkSafety().forward(), epsilon);
+ OSMWithTags wayWithFootSidePath = new OSMWithTags();
+ wayWithFootSidePath.addTag("foot", "use_sidepath");
+ assertEquals(8, wps.getDataForWay(wayWithFootSidePath).walkSafety().forward(), epsilon);
}
@Test
diff --git a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java
index e8f5b6e51d3..24360539b6f 100644
--- a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java
+++ b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java
@@ -256,65 +256,6 @@ void testMotorVehicleTagDeniedPermissions() {
assertTrue(permissionPair.main().allowsNothing());*/
}
- @Test
- void testSidepathPermissions() {
- OSMWay way = new OSMWay();
- way.addTag("bicycle", "use_sidepath");
- way.addTag("highway", "primary");
- way.addTag("lanes", "2");
- way.addTag("maxspeed", "70");
- way.addTag("oneway", "yes");
- var permissionPair = getWayProperties(way);
-
- assertFalse(permissionPair.main().allows(StreetTraversalPermission.BICYCLE));
- assertFalse(permissionPair.back().allows(StreetTraversalPermission.BICYCLE));
-
- assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR));
- assertFalse(permissionPair.back().allows(StreetTraversalPermission.CAR));
-
- way = new OSMWay();
- way.addTag("bicycle:forward", "use_sidepath");
- way.addTag("highway", "tertiary");
- permissionPair = getWayProperties(way);
-
- assertFalse(permissionPair.main().allows(StreetTraversalPermission.BICYCLE));
- assertTrue(permissionPair.back().allows(StreetTraversalPermission.BICYCLE));
-
- assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR));
- assertTrue(permissionPair.back().allows(StreetTraversalPermission.CAR));
-
- way = new OSMWay();
- way.addTag("bicycle:backward", "use_sidepath");
- way.addTag("highway", "tertiary");
- permissionPair = getWayProperties(way);
-
- assertTrue(permissionPair.main().allows(StreetTraversalPermission.BICYCLE));
- assertFalse(permissionPair.back().allows(StreetTraversalPermission.BICYCLE));
-
- assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR));
- assertTrue(permissionPair.back().allows(StreetTraversalPermission.CAR));
-
- way = new OSMWay();
- way.addTag("highway", "tertiary");
- way.addTag("oneway", "yes");
- way.addTag("oneway:bicycle", "no");
- permissionPair = getWayProperties(way);
-
- assertTrue(permissionPair.main().allows(StreetTraversalPermission.BICYCLE));
- assertTrue(permissionPair.back().allows(StreetTraversalPermission.BICYCLE));
-
- assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR));
- assertFalse(permissionPair.back().allows(StreetTraversalPermission.CAR));
-
- way.addTag("bicycle:forward", "use_sidepath");
- permissionPair = getWayProperties(way);
- assertFalse(permissionPair.main().allows(StreetTraversalPermission.BICYCLE));
- assertTrue(permissionPair.back().allows(StreetTraversalPermission.BICYCLE));
-
- assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR));
- assertFalse(permissionPair.back().allows(StreetTraversalPermission.CAR));
- }
-
private StreetTraversalPermissionPair getWayProperties(OSMWay way) {
WayPropertySet wayPropertySet = new WayPropertySet();
WayProperties wayData = wayPropertySet.getDataForWay(way);
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
new file mode 100644
index 00000000000..7c674252e6a
--- /dev/null
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
@@ -0,0 +1,201 @@
+package org.opentripplanner.routing.algorithm.raptoradapter.transit;
+
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.model.StopTime;
+import org.opentripplanner.transit.model._data.TransitModelForTest;
+import org.opentripplanner.transit.model.framework.Deduplicator;
+import org.opentripplanner.transit.model.network.RoutingTripPattern;
+import org.opentripplanner.transit.model.network.StopPattern;
+import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.timetable.TripTimes;
+import org.opentripplanner.transit.model.timetable.TripTimesFactory;
+
+class TransitLayerTest {
+
+ private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of();
+ private static final TripTimes TRIP_TIMES;
+
+ private static final RoutingTripPattern TRIP_PATTERN;
+
+ static {
+ var stop = TEST_MODEL.stop("TEST:STOP", 0, 0).build();
+ var stopTime = new StopTime();
+ stopTime.setStop(stop);
+ var stopPattern = new StopPattern(List.of(stopTime));
+ var route = TransitModelForTest.route("1").build();
+ TRIP_PATTERN =
+ TripPattern
+ .of(TransitModelForTest.id("P1"))
+ .withRoute(route)
+ .withStopPattern(stopPattern)
+ .build()
+ .getRoutingTripPattern();
+ TRIP_TIMES =
+ TripTimesFactory.tripTimes(
+ TransitModelForTest.trip("1").withRoute(route).build(),
+ List.of(new StopTime()),
+ new Deduplicator()
+ );
+ }
+
+ @Test
+ void testGetTripPatternsRunningOnDateCopy() {
+ var date = LocalDate.of(2024, 1, 1);
+
+ var tripPatternForDate = new TripPatternForDate(
+ TRIP_PATTERN,
+ List.of(TRIP_TIMES),
+ List.of(),
+ date
+ );
+ var tripPatterns = List.of(tripPatternForDate);
+ var transitLayer = new TransitLayer(
+ Map.of(date, tripPatterns),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ );
+ var runningOnDate = transitLayer.getTripPatternsRunningOnDateCopy(date);
+ assertEquals(1, runningOnDate.size());
+ assertEquals(tripPatterns, runningOnDate);
+ assertFalse(tripPatterns == runningOnDate);
+ assertEquals(0, transitLayer.getTripPatternsRunningOnDateCopy(date.minusDays(1)).size());
+ assertEquals(0, transitLayer.getTripPatternsRunningOnDateCopy(date.plusDays(1)).size());
+ }
+
+ @Test
+ void testGetTripPatternsForRunningDate() {
+ var date = LocalDate.of(2024, 1, 1);
+
+ var tripPatternForDate = new TripPatternForDate(
+ TRIP_PATTERN,
+ List.of(TRIP_TIMES),
+ List.of(),
+ date
+ );
+ var tripPatterns = List.of(tripPatternForDate);
+ var transitLayer = new TransitLayer(
+ Map.of(date, tripPatterns),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ );
+ var runningOnDate = transitLayer.getTripPatternsForRunningDate(date);
+ assertEquals(1, runningOnDate.size());
+ assertEquals(tripPatterns, runningOnDate);
+ assertTrue(tripPatterns == runningOnDate);
+ assertEquals(0, transitLayer.getTripPatternsForRunningDate(date.minusDays(1)).size());
+ assertEquals(0, transitLayer.getTripPatternsForRunningDate(date.plusDays(1)).size());
+ }
+
+ @Test
+ void testGetTripPatternsOnServiceDateCopyWithSameRunningAndServiceDate() {
+ var date = LocalDate.of(2024, 1, 1);
+
+ var tripPatternForDate = new TripPatternForDate(
+ TRIP_PATTERN,
+ List.of(TRIP_TIMES),
+ List.of(),
+ date
+ );
+ var transitLayer = new TransitLayer(
+ Map.of(date, List.of(tripPatternForDate)),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ );
+ var startingOnDate = transitLayer.getTripPatternsOnServiceDateCopy(date);
+ assertEquals(1, startingOnDate.size());
+ assertEquals(tripPatternForDate, startingOnDate.getFirst());
+ assertEquals(0, transitLayer.getTripPatternsOnServiceDateCopy(date.minusDays(1)).size());
+ assertEquals(0, transitLayer.getTripPatternsOnServiceDateCopy(date.plusDays(1)).size());
+ }
+
+ @Test
+ void testGetTripPatternsOnServiceDateCopyWithServiceRunningAfterMidnight() {
+ var runningDate = LocalDate.of(2024, 1, 1);
+ var serviceDate = runningDate.minusDays(1);
+
+ var tripPatternForDate = new TripPatternForDate(
+ TRIP_PATTERN,
+ List.of(TRIP_TIMES),
+ List.of(),
+ serviceDate
+ );
+ var transitLayer = new TransitLayer(
+ Map.of(runningDate, List.of(tripPatternForDate)),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ );
+ var startingOnDate = transitLayer.getTripPatternsOnServiceDateCopy(serviceDate);
+ // starting date should be determined by service date, not running date which refers to the
+ // normal calendar date that the trip pattern is running on
+ assertEquals(1, startingOnDate.size());
+ assertEquals(tripPatternForDate, startingOnDate.getFirst());
+ assertEquals(0, transitLayer.getTripPatternsOnServiceDateCopy(runningDate).size());
+ }
+
+ @Test
+ void testGetTripPatternsOnServiceDateCopyWithServiceRunningBeforeAndAfterMidnight() {
+ // This is same as the service date
+ var firstRunningDate = LocalDate.of(2024, 1, 1);
+ var secondRunningDate = firstRunningDate.plusDays(1);
+
+ var tripPatternForDate = new TripPatternForDate(
+ TRIP_PATTERN,
+ List.of(TRIP_TIMES),
+ List.of(),
+ firstRunningDate
+ );
+ var transitLayer = new TransitLayer(
+ Map.ofEntries(
+ entry(firstRunningDate, List.of(tripPatternForDate)),
+ entry(secondRunningDate, List.of(tripPatternForDate))
+ ),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ );
+ var startingOnDate = transitLayer.getTripPatternsOnServiceDateCopy(firstRunningDate);
+ // Transit layer indexes trip patterns by running date and to get trip patterns for certain
+ // service date, we need to look up the trip patterns for the next running date as well, but
+ // we don't want to return duplicates
+ assertEquals(1, startingOnDate.size());
+ assertEquals(tripPatternForDate, startingOnDate.getFirst());
+ assertEquals(0, transitLayer.getTripPatternsOnServiceDateCopy(secondRunningDate).size());
+ }
+}
diff --git a/src/test/java/org/opentripplanner/routing/core/MoneyTest.java b/src/test/java/org/opentripplanner/routing/core/MoneyTest.java
index 5f197708f1d..01392e64493 100644
--- a/src/test/java/org/opentripplanner/routing/core/MoneyTest.java
+++ b/src/test/java/org/opentripplanner/routing/core/MoneyTest.java
@@ -102,4 +102,9 @@ void greaterThan() {
void serializable() {
assertInstanceOf(Serializable.class, oneDollar);
}
+
+ @Test
+ void equalHashCode() {
+ assertEquals(Money.usDollars(5).hashCode(), Money.usDollars(5).hashCode());
+ }
}
diff --git a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java b/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java
index 9c80cb9cda9..90bdeb015a4 100644
--- a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java
+++ b/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java
@@ -10,6 +10,7 @@
import org.opentripplanner.framework.i18n.NonLocalizedString;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.vehicle_parking.VehicleParking.VehicleParkingEntranceCreator;
+import org.opentripplanner.street.model._data.StreetModelForTest;
import org.opentripplanner.street.model.edge.VehicleParkingEdge;
import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex;
import org.opentripplanner.transit.model.framework.FeedScopedId;
@@ -41,8 +42,8 @@ void linkThreeVerticesTest() {
@Test
void linkSkippingEdgesTest() {
Graph graph = new Graph();
- var vehicleParking = VehicleParking
- .builder()
+ var vehicleParking = StreetModelForTest
+ .vehicleParking()
.entrances(
IntStream
.rangeClosed(1, 3)
@@ -67,8 +68,8 @@ void linkSkippingEdgesTest() {
}
private VehicleParking createParingWithEntrances(int entranceNumber) {
- return VehicleParking
- .builder()
+ return StreetModelForTest
+ .vehicleParking()
.bicyclePlaces(true)
.entrances(
IntStream
diff --git a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java b/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java
index 078d7350dcc..fca20322ebe 100644
--- a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java
+++ b/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java
@@ -2,6 +2,7 @@
import org.opentripplanner.framework.geometry.WgsCoordinate;
import org.opentripplanner.framework.i18n.NonLocalizedString;
+import org.opentripplanner.street.model._data.StreetModelForTest;
import org.opentripplanner.transit.model.framework.FeedScopedId;
public class VehicleParkingTestUtil {
@@ -25,8 +26,8 @@ public static VehicleParking createParkingWithEntrances(
.coordinate(new WgsCoordinate(y, x))
.walkAccessible(true);
- return VehicleParking
- .builder()
+ return StreetModelForTest
+ .vehicleParking()
.id(new FeedScopedId(TEST_FEED_ID, id))
.bicyclePlaces(true)
.capacity(vehiclePlaces)
diff --git a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java
index 94ebaec73c4..4a0a0d1b848 100644
--- a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java
+++ b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java
@@ -9,6 +9,7 @@
import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
import org.opentripplanner.framework.geometry.WgsCoordinate;
import org.opentripplanner.framework.i18n.I18NString;
+import org.opentripplanner.routing.vehicle_parking.VehicleParking;
import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder;
import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
import org.opentripplanner.street.model.RentalFormFactor;
@@ -111,4 +112,8 @@ public static VehicleRentalPlaceVertex rentalVertex(RentalFormFactor formFactor)
}
return new VehicleRentalPlaceVertex(rentalVehicleBuilder.build());
}
+
+ public static VehicleParking.VehicleParkingBuilder vehicleParking() {
+ return VehicleParking.builder().id(id("vehicle-parking-1")).coordinate(WgsCoordinate.GREENWICH);
+ }
}
diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java
index 7dad61fbd6b..81bee23ad54 100644
--- a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java
+++ b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java
@@ -10,6 +10,7 @@
import org.opentripplanner.routing.api.request.StreetMode;
import org.opentripplanner.routing.vehicle_parking.VehicleParking;
import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces;
+import org.opentripplanner.street.model._data.StreetModelForTest;
import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex;
import org.opentripplanner.street.search.request.StreetSearchRequest;
import org.opentripplanner.street.search.state.State;
@@ -130,8 +131,8 @@ private VehicleParking createVehicleParking(
boolean carPlaces,
VehicleParkingSpaces availability
) {
- return VehicleParking
- .builder()
+ return StreetModelForTest
+ .vehicleParking()
.id(TransitModelForTest.id("VehicleParking"))
.bicyclePlaces(bicyclePlaces)
.carPlaces(carPlaces)
diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java
index 5969121b6d6..579ae4e964d 100644
--- a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java
+++ b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java
@@ -11,9 +11,9 @@
import org.opentripplanner.framework.geometry.WgsCoordinate;
import org.opentripplanner.framework.i18n.NonLocalizedString;
import org.opentripplanner.routing.api.request.StreetMode;
-import org.opentripplanner.routing.vehicle_parking.VehicleParking;
import org.opentripplanner.routing.vehicle_parking.VehicleParkingEntrance;
import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces;
+import org.opentripplanner.street.model._data.StreetModelForTest;
import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex;
import org.opentripplanner.street.model.vertex.Vertex;
import org.opentripplanner.street.search.request.StreetSearchRequest;
@@ -62,9 +62,8 @@ private void runTest(
double expectedCost,
boolean arriveBy
) {
- var parking = VehicleParking
- .builder()
- .coordinate(COORDINATE)
+ var parking = StreetModelForTest
+ .vehicleParking()
.tags(parkingTags)
.availability(VehicleParkingSpaces.builder().bicycleSpaces(100).build())
.bicyclePlaces(true)
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java b/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java
index 031df343a9a..4113d5979b1 100644
--- a/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java
+++ b/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java
@@ -15,7 +15,7 @@ public static void assertTestDateHasData(
) {
int numberOfPatternForTestDate = transitModel
.getTransitLayer()
- .getTripPatternsForDate(config.testDate)
+ .getTripPatternsForRunningDate(config.testDate)
.size();
if (numberOfPatternForTestDate < 10) {
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java b/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java
index 2bcb49defae..a31b5cfb387 100644
--- a/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java
+++ b/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java
@@ -16,6 +16,7 @@
import org.opentripplanner.routing.vehicle_parking.VehicleParkingState;
import org.opentripplanner.routing.vehicle_parking.VehicleParkingTestGraphData;
import org.opentripplanner.routing.vehicle_parking.VehicleParkingTestUtil;
+import org.opentripplanner.street.model._data.StreetModelForTest;
import org.opentripplanner.street.model.edge.StreetVehicleParkingLink;
import org.opentripplanner.street.model.edge.VehicleParkingEdge;
import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex;
@@ -142,7 +143,10 @@ void deleteVehicleParkingTest() {
@Test
void addNotOperatingVehicleParkingTest() {
- var vehicleParking = VehicleParking.builder().state(VehicleParkingState.CLOSED).build();
+ var vehicleParking = StreetModelForTest
+ .vehicleParking()
+ .state(VehicleParkingState.CLOSED)
+ .build();
when(dataSource.getUpdates()).thenReturn(List.of(vehicleParking));
runUpdaterOnce();
@@ -155,8 +159,8 @@ void addNotOperatingVehicleParkingTest() {
void updateNotOperatingVehicleParkingTest() {
var vehiclePlaces = VehicleParkingSpaces.builder().bicycleSpaces(1).build();
- var vehicleParking = VehicleParking
- .builder()
+ var vehicleParking = StreetModelForTest
+ .vehicleParking()
.availability(vehiclePlaces)
.state(VehicleParkingState.CLOSED)
.build();
@@ -175,8 +179,8 @@ void updateNotOperatingVehicleParkingTest() {
vehiclePlaces = VehicleParkingSpaces.builder().bicycleSpaces(2).build();
vehicleParking =
- VehicleParking
- .builder()
+ StreetModelForTest
+ .vehicleParking()
.availability(vehiclePlaces)
.state(VehicleParkingState.CLOSED)
.build();
@@ -194,7 +198,10 @@ void updateNotOperatingVehicleParkingTest() {
@Test
void deleteNotOperatingVehicleParkingTest() {
- var vehicleParking = VehicleParking.builder().state(VehicleParkingState.CLOSED).build();
+ var vehicleParking = StreetModelForTest
+ .vehicleParking()
+ .state(VehicleParkingState.CLOSED)
+ .build();
when(dataSource.getUpdates()).thenReturn(List.of(vehicleParking));
runUpdaterOnce();
diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json
index 3a07cddfeb8..f5eaa1f942b 100644
--- a/src/test/resources/standalone/config/router-config.json
+++ b/src/test/resources/standalone/config/router-config.json
@@ -334,6 +334,12 @@
"Authorization": "${BIKELY_AUTHORIZATION}"
}
},
+ {
+ "type": "vehicle-parking",
+ "feedId": "noi",
+ "sourceType": "noi-open-data-hub",
+ "url": "https://parking.otp.opendatahub.com/parking/all.json"
+ },
{
"type": "stop-time-updater",
"frequency": "1m",