args) {
+ if (args == null) {
+ return List.of();
+ }
+ return args.stream().filter(Objects::nonNull).toList();
+ }
}
diff --git a/application/src/main/java/org/opentripplanner/framework/application/OTPFeature.java b/application/src/main/java/org/opentripplanner/framework/application/OTPFeature.java
index f71283b572e..6e13b05a7e6 100644
--- a/application/src/main/java/org/opentripplanner/framework/application/OTPFeature.java
+++ b/application/src/main/java/org/opentripplanner/framework/application/OTPFeature.java
@@ -92,6 +92,12 @@ public enum OTPFeature {
false,
"Whether the @async annotation in the GraphQL schema should lead to the fetch being executed asynchronously. This allows batch or alias queries to run in parallel at the cost of consuming extra threads."
),
+ WaitForGraphUpdateInPollingUpdaters(
+ true,
+ false,
+ "Make all polling updaters wait for graph updates to complete before finishing. " +
+ "If this is not enabled, the updaters will finish after submitting the task to update the graph."
+ ),
Co2Emissions(false, true, "Enable the emissions sandbox module."),
DataOverlay(
false,
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
index 0b071b64728..744a8209702 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
@@ -17,7 +17,9 @@
import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary;
import org.opentripplanner.graph_builder.model.GraphBuilderModule;
import org.opentripplanner.graph_builder.module.configure.DaggerGraphBuilderFactory;
+import org.opentripplanner.graph_builder.module.configure.GraphBuilderFactory;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository;
import org.opentripplanner.standalone.config.BuildConfig;
@@ -62,6 +64,7 @@ public static GraphBuilder create(
BuildConfig config,
GraphBuilderDataSources dataSources,
Graph graph,
+ OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
TimetableRepository timetableRepository,
WorldEnvelopeRepository worldEnvelopeRepository,
VehicleParkingRepository vehicleParkingService,
@@ -78,10 +81,11 @@ public static GraphBuilder create(
timetableRepository.initTimeZone(config.transitModelTimeZone);
- var builder = DaggerGraphBuilderFactory
- .builder()
+ GraphBuilderFactory.Builder builder = DaggerGraphBuilderFactory.builder();
+ builder
.config(config)
.graph(graph)
+ .osmInfoGraphBuildRepository(osmInfoGraphBuildRepository)
.timetableRepository(timetableRepository)
.worldEnvelopeRepository(worldEnvelopeRepository)
.vehicleParkingRepository(vehicleParkingService)
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java
index c4acabefd6c..25e33b9c057 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java
@@ -1,18 +1,27 @@
package org.opentripplanner.graph_builder.module;
import jakarta.inject.Inject;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
+import javax.annotation.Nullable;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Point;
import org.opentripplanner.framework.geometry.GeometryUtils;
import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
+import org.opentripplanner.framework.i18n.I18NString;
import org.opentripplanner.framework.i18n.LocalizedString;
import org.opentripplanner.graph_builder.model.GraphBuilderModule;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.graph.index.StreetIndex;
import org.opentripplanner.routing.linking.LinkingDirection;
import org.opentripplanner.routing.linking.VertexLinker;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildService;
+import org.opentripplanner.service.osminfo.model.Platform;
import org.opentripplanner.street.model.StreetTraversalPermission;
import org.opentripplanner.street.model.edge.AreaEdge;
import org.opentripplanner.street.model.edge.BoardingLocationToStopLink;
@@ -24,9 +33,12 @@
import org.opentripplanner.street.model.vertex.OsmBoardingLocationVertex;
import org.opentripplanner.street.model.vertex.StreetVertex;
import org.opentripplanner.street.model.vertex.TransitStopVertex;
+import org.opentripplanner.street.model.vertex.Vertex;
import org.opentripplanner.street.model.vertex.VertexFactory;
import org.opentripplanner.street.search.TraverseMode;
import org.opentripplanner.street.search.TraverseModeSet;
+import org.opentripplanner.transit.model.site.RegularStop;
+import org.opentripplanner.transit.model.site.StationElement;
import org.opentripplanner.transit.service.TimetableRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,14 +67,20 @@ public class OsmBoardingLocationsModule implements GraphBuilderModule {
private final Graph graph;
+ private final OsmInfoGraphBuildService osmInfoGraphBuildService;
private final TimetableRepository timetableRepository;
private final VertexFactory vertexFactory;
private VertexLinker linker;
@Inject
- public OsmBoardingLocationsModule(Graph graph, TimetableRepository timetableRepository) {
+ public OsmBoardingLocationsModule(
+ Graph graph,
+ OsmInfoGraphBuildService osmInfoGraphBuildService,
+ TimetableRepository timetableRepository
+ ) {
this.graph = graph;
+ this.osmInfoGraphBuildService = osmInfoGraphBuildService;
this.timetableRepository = timetableRepository;
this.vertexFactory = new VertexFactory(graph);
}
@@ -99,54 +117,32 @@ public void buildGraph() {
}
private boolean connectVertexToStop(TransitStopVertex ts, StreetIndex index) {
- var stopCode = ts.getStop().getCode();
- var stopId = ts.getStop().getId().getId();
+ if (connectVertexToNode(ts, index)) return true;
+
+ if (connectVertexToWay(ts, index)) return true;
+
+ return connectVertexToArea(ts, index);
+ }
+
+ private Envelope getEnvelope(TransitStopVertex ts) {
Envelope envelope = new Envelope(ts.getCoordinate());
double xscale = Math.cos(ts.getCoordinate().y * Math.PI / 180);
envelope.expandBy(searchRadiusDegrees / xscale, searchRadiusDegrees);
+ return envelope;
+ }
- // if the boarding location is an OSM node it's generated in the OSM processing step but we need
- // link it here
- var nearbyBoardingLocations = index
- .getVerticesForEnvelope(envelope)
- .stream()
- .filter(OsmBoardingLocationVertex.class::isInstance)
- .map(OsmBoardingLocationVertex.class::cast)
- .collect(Collectors.toSet());
-
- for (var boardingLocation : nearbyBoardingLocations) {
- if (
- (stopCode != null && boardingLocation.references.contains(stopCode)) ||
- boardingLocation.references.contains(stopId)
- ) {
- if (!boardingLocation.isConnectedToStreetNetwork()) {
- linker.linkVertexPermanently(
- boardingLocation,
- new TraverseModeSet(TraverseMode.WALK),
- LinkingDirection.BOTH_WAYS,
- (osmBoardingLocationVertex, splitVertex) -> {
- if (osmBoardingLocationVertex == splitVertex) {
- return List.of();
- }
- // the OSM boarding location vertex is not connected to the street network, so we
- // need to link it first
- return List.of(
- linkBoardingLocationToStreetNetwork(boardingLocation, splitVertex),
- linkBoardingLocationToStreetNetwork(splitVertex, boardingLocation)
- );
- }
- );
- }
- linkBoardingLocationToStop(ts, stopCode, boardingLocation);
- return true;
- }
- }
-
- // if the boarding location is an OSM way (an area) then we are generating the vertex here and
- // use the AreaEdgeList to link it to the correct vertices of the platform edge
- var nearbyEdgeLists = index
- .getEdgesForEnvelope(envelope)
+ /**
+ * Connect a transit stop vertex into a boarding location area in the index.
+ *
+ * A centroid vertex is generated in the area and connected to the vertices on the platform edge.
+ *
+ * @return if the vertex has been connected
+ */
+ private boolean connectVertexToArea(TransitStopVertex ts, StreetIndex index) {
+ RegularStop stop = ts.getStop();
+ var nearbyAreaEdgeList = index
+ .getEdgesForEnvelope(getEnvelope(ts))
.stream()
.filter(AreaEdge.class::isInstance)
.map(AreaEdge.class::cast)
@@ -155,33 +151,141 @@ private boolean connectVertexToStop(TransitStopVertex ts, StreetIndex index) {
// Iterate over all nearby areas representing transit stops in OSM, linking to them if they have a stop code or id
// in their ref= tag that matches the GTFS stop code of this StopVertex.
- for (var edgeList : nearbyEdgeLists) {
- if (
- (stopCode != null && edgeList.references.contains(stopCode)) ||
- edgeList.references.contains(stopId)
- ) {
+ for (var edgeList : nearbyAreaEdgeList) {
+ if (matchesReference(stop, edgeList.references)) {
var name = edgeList
.getAreas()
.stream()
.findFirst()
.map(NamedArea::getName)
.orElse(LOCALIZED_PLATFORM_NAME);
- var label = "platform-centroid/%s".formatted(ts.getStop().getId().toString());
- var centroid = edgeList.getGeometry().getCentroid();
- var boardingLocation = vertexFactory.osmBoardingLocation(
- new Coordinate(centroid.getX(), centroid.getY()),
- label,
+ var boardingLocation = makeBoardingLocation(
+ stop,
+ edgeList.getGeometry().getCentroid(),
edgeList.references,
name
);
linker.addPermanentAreaVertex(boardingLocation, edgeList);
- linkBoardingLocationToStop(ts, stopCode, boardingLocation);
+ linkBoardingLocationToStop(ts, stop.getCode(), boardingLocation);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Connect a transit stop vertex to a boarding location way in the index.
+ *
+ * The vertex is connected to the center of the way if one is found, splitting it if needed.
+ *
+ * @return if the vertex has been connected
+ */
+ private boolean connectVertexToWay(TransitStopVertex ts, StreetIndex index) {
+ var stop = ts.getStop();
+ var nearbyEdges = new HashMap>();
+
+ for (var edge : index.getEdgesForEnvelope(getEnvelope(ts))) {
+ osmInfoGraphBuildService
+ .findPlatform(edge)
+ .ifPresent(platform -> {
+ if (matchesReference(stop, platform.references())) {
+ if (!nearbyEdges.containsKey(platform)) {
+ var list = new ArrayList();
+ list.add(edge);
+ nearbyEdges.put(platform, list);
+ } else {
+ nearbyEdges.get(platform).add(edge);
+ }
+ }
+ });
+ }
+
+ for (var platformEdgeList : nearbyEdges.entrySet()) {
+ Platform platform = platformEdgeList.getKey();
+ var name = platform.name();
+ var boardingLocation = makeBoardingLocation(
+ stop,
+ platform.geometry().getCentroid(),
+ platform.references(),
+ name
+ );
+ for (var vertex : linker.linkToSpecificStreetEdgesPermanently(
+ boardingLocation,
+ new TraverseModeSet(TraverseMode.WALK),
+ LinkingDirection.BOTH_WAYS,
+ platformEdgeList.getValue().stream().map(StreetEdge.class::cast).collect(Collectors.toSet())
+ )) {
+ linkBoardingLocationToStop(ts, stop.getCode(), vertex);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Connect a transit stop vertex to a boarding location node.
+ *
+ * The node is generated in the OSM processing step but we need to link it here.
+ *
+ * @return If the vertex has been connected.
+ */
+ private boolean connectVertexToNode(TransitStopVertex ts, StreetIndex index) {
+ var nearbyBoardingLocations = index
+ .getVerticesForEnvelope(getEnvelope(ts))
+ .stream()
+ .filter(OsmBoardingLocationVertex.class::isInstance)
+ .map(OsmBoardingLocationVertex.class::cast)
+ .collect(Collectors.toSet());
+
+ for (var boardingLocation : nearbyBoardingLocations) {
+ if (matchesReference(ts.getStop(), boardingLocation.references)) {
+ if (!boardingLocation.isConnectedToStreetNetwork()) {
+ linker.linkVertexPermanently(
+ boardingLocation,
+ new TraverseModeSet(TraverseMode.WALK),
+ LinkingDirection.BOTH_WAYS,
+ (osmBoardingLocationVertex, splitVertex) ->
+ getConnectingEdges(boardingLocation, osmBoardingLocationVertex, splitVertex)
+ );
+ }
+ linkBoardingLocationToStop(ts, ts.getStop().getCode(), boardingLocation);
return true;
}
}
return false;
}
+ private OsmBoardingLocationVertex makeBoardingLocation(
+ RegularStop stop,
+ Point centroid,
+ Set refs,
+ I18NString name
+ ) {
+ var label = "platform-centroid/%s".formatted(stop.getId().toString());
+ return vertexFactory.osmBoardingLocation(
+ new Coordinate(centroid.getX(), centroid.getY()),
+ label,
+ refs,
+ name
+ );
+ }
+
+ private List getConnectingEdges(
+ OsmBoardingLocationVertex boardingLocation,
+ Vertex osmBoardingLocationVertex,
+ StreetVertex splitVertex
+ ) {
+ if (osmBoardingLocationVertex == splitVertex) {
+ return List.of();
+ }
+ // the OSM boarding location vertex is not connected to the street network, so we
+ // need to link it first
+ return List.of(
+ linkBoardingLocationToStreetNetwork(boardingLocation, splitVertex),
+ linkBoardingLocationToStreetNetwork(splitVertex, boardingLocation)
+ );
+ }
+
private StreetEdge linkBoardingLocationToStreetNetwork(StreetVertex from, StreetVertex to) {
var line = GeometryUtils.makeLineString(List.of(from.getCoordinate(), to.getCoordinate()));
return new StreetEdgeBuilder<>()
@@ -197,8 +301,8 @@ private StreetEdge linkBoardingLocationToStreetNetwork(StreetVertex from, Street
private void linkBoardingLocationToStop(
TransitStopVertex ts,
- String stopCode,
- OsmBoardingLocationVertex boardingLocation
+ @Nullable String stopCode,
+ StreetVertex boardingLocation
) {
BoardingLocationToStopLink.createBoardingLocationToStopLink(ts, boardingLocation);
BoardingLocationToStopLink.createBoardingLocationToStopLink(boardingLocation, ts);
@@ -210,4 +314,11 @@ private void linkBoardingLocationToStop(
boardingLocation.getCoordinate()
);
}
+
+ private boolean matchesReference(StationElement stop, Collection references) {
+ var stopCode = stop.getCode();
+ var stopId = stop.getId().getId();
+
+ return (stopCode != null && references.contains(stopCode)) || references.contains(stopId);
+ }
}
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java
index d4d00fdc2a0..4155ecf9614 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java
@@ -30,6 +30,8 @@
import org.opentripplanner.gtfs.graphbuilder.GtfsModule;
import org.opentripplanner.netex.NetexModule;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
+import org.opentripplanner.service.osminfo.configure.OsmInfoGraphBuildServiceModule;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository;
import org.opentripplanner.standalone.config.BuildConfig;
@@ -37,7 +39,7 @@
import org.opentripplanner.transit.service.TimetableRepository;
@Singleton
-@Component(modules = { GraphBuilderModules.class })
+@Component(modules = { GraphBuilderModules.class, OsmInfoGraphBuildServiceModule.class })
public interface GraphBuilderFactory {
//DataImportIssueStore issueStore();
GraphBuilder graphBuilder();
@@ -80,6 +82,9 @@ interface Builder {
@BindsInstance
Builder timetableRepository(TimetableRepository timetableRepository);
+ @BindsInstance
+ Builder osmInfoGraphBuildRepository(OsmInfoGraphBuildRepository osmInfoGraphBuildRepository);
+
@BindsInstance
Builder worldEnvelopeRepository(WorldEnvelopeRepository worldEnvelopeRepository);
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java
index 5371142d612..d464523a61a 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java
@@ -43,13 +43,14 @@
import org.opentripplanner.osm.OsmProvider;
import org.opentripplanner.routing.api.request.preference.WalkPreferences;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.standalone.config.BuildConfig;
import org.opentripplanner.street.model.StreetLimitationParameters;
import org.opentripplanner.transit.service.TimetableRepository;
/**
- * Configure all modules which is not simple enough to be injected.
+ * Configure all modules that are not simple enough to be injected.
*/
@Module
public class GraphBuilderModules {
@@ -60,7 +61,8 @@ static OsmModule provideOsmModule(
GraphBuilderDataSources dataSources,
BuildConfig config,
Graph graph,
- VehicleParkingRepository parkingService,
+ OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
+ VehicleParkingRepository vehicleParkingRepository,
DataImportIssueStore issueStore,
StreetLimitationParameters streetLimitationParameters
) {
@@ -71,6 +73,7 @@ static OsmModule provideOsmModule(
osmConfiguredDataSource.dataSource(),
osmConfiguredDataSource.config().osmTagMapper(),
osmConfiguredDataSource.config().timeZone(),
+ osmConfiguredDataSource.config().includeOsmSubwayEntrances(),
config.osmCacheDataInMem,
issueStore
)
@@ -78,7 +81,7 @@ static OsmModule provideOsmModule(
}
return OsmModule
- .of(providers, graph, parkingService)
+ .of(providers, graph, osmInfoGraphBuildRepository, vehicleParkingRepository)
.withEdgeNamer(config.edgeNamer)
.withAreaVisibility(config.areaVisibility)
.withPlatformEntriesLinking(config.platformEntriesLinking)
@@ -86,6 +89,7 @@ static OsmModule provideOsmModule(
.withStaticBikeParkAndRide(config.staticBikeParkAndRide)
.withMaxAreaNodes(config.maxAreaNodes)
.withBoardingAreaRefTags(config.boardingLocationTags)
+ .withIncludeOsmSubwayEntrances(config.osmDefaults.includeOsmSubwayEntrances())
.withIssueStore(issueStore)
.withStreetLimitationParameters(streetLimitationParameters)
.build();
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java
index 490d6a266b9..45ed01e4568 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java
@@ -95,7 +95,7 @@ public void buildElevatorEdges(Graph graph) {
}
int travelTime = parseDuration(node).orElse(-1);
- var wheelchair = node.getWheelchairAccessibility();
+ var wheelchair = node.wheelchairAccessibility();
createElevatorHopEdges(
onboardVertices,
@@ -138,7 +138,7 @@ public void buildElevatorEdges(Graph graph) {
int travelTime = parseDuration(elevatorWay).orElse(-1);
int levels = nodes.size();
- var wheelchair = elevatorWay.getWheelchairAccessibility();
+ var wheelchair = elevatorWay.wheelchairAccessibility();
createElevatorHopEdges(
onboardVertices,
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java
index db495905041..3b9f411fec6 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java
@@ -8,6 +8,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.LineString;
@@ -25,6 +26,8 @@
import org.opentripplanner.osm.wayproperty.WayProperties;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.util.ElevationUtils;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
+import org.opentripplanner.service.osminfo.model.Platform;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.vehicleparking.model.VehicleParking;
import org.opentripplanner.street.model.StreetLimitationParameters;
@@ -52,7 +55,9 @@ public class OsmModule implements GraphBuilderModule {
*/
private final List providers;
private final Graph graph;
+ private final OsmInfoGraphBuildRepository osmInfoGraphBuildRepository;
private final VehicleParkingRepository parkingRepository;
+
private final DataImportIssueStore issueStore;
private final OsmProcessingParameters params;
private final SafetyValueNormalizer normalizer;
@@ -63,36 +68,51 @@ public class OsmModule implements GraphBuilderModule {
OsmModule(
Collection providers,
Graph graph,
- VehicleParkingRepository parkingService,
+ OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
+ VehicleParkingRepository parkingRepository,
DataImportIssueStore issueStore,
StreetLimitationParameters streetLimitationParameters,
OsmProcessingParameters params
) {
this.providers = List.copyOf(providers);
this.graph = graph;
+ this.osmInfoGraphBuildRepository = osmInfoGraphBuildRepository;
+ this.parkingRepository = parkingRepository;
this.issueStore = issueStore;
this.params = params;
this.osmdb = new OsmDatabase(issueStore);
- this.vertexGenerator = new VertexGenerator(osmdb, graph, params.boardingAreaRefTags());
+ this.vertexGenerator =
+ new VertexGenerator(
+ osmdb,
+ graph,
+ params.boardingAreaRefTags(),
+ params.includeOsmSubwayEntrances()
+ );
this.normalizer = new SafetyValueNormalizer(graph, issueStore);
this.streetLimitationParameters = Objects.requireNonNull(streetLimitationParameters);
- this.parkingRepository = parkingService;
}
public static OsmModuleBuilder of(
Collection providers,
Graph graph,
- VehicleParkingRepository service
+ OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
+ VehicleParkingRepository vehicleParkingRepository
) {
- return new OsmModuleBuilder(providers, graph, service);
+ return new OsmModuleBuilder(
+ providers,
+ graph,
+ osmInfoGraphBuildRepository,
+ vehicleParkingRepository
+ );
}
public static OsmModuleBuilder of(
OsmProvider provider,
Graph graph,
- VehicleParkingRepository service
+ OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
+ VehicleParkingRepository vehicleParkingRepository
) {
- return of(List.of(provider), graph, service);
+ return of(List.of(provider), graph, osmInfoGraphBuildRepository, vehicleParkingRepository);
}
@Override
@@ -319,6 +339,8 @@ private void buildBasicGraph() {
// where the current edge should start
OsmNode osmStartNode = null;
+ var platform = getPlatform(way);
+
for (int i = 0; i < nodes.size() - 1; i++) {
OsmNode segmentStartOsmNode = osmdb.getNode(nodes.get(i));
@@ -341,7 +363,7 @@ private void buildBasicGraph() {
* We split segments at intersections, self-intersections, nodes with ele tags, and transit stops;
* the only processing we do on other nodes is to accumulate their geometry
*/
- if (segmentCoordinates.size() == 0) {
+ if (segmentCoordinates.isEmpty()) {
segmentCoordinates.add(osmStartNode.getCoordinate());
}
@@ -408,6 +430,11 @@ private void buildBasicGraph() {
StreetEdge backStreet = streets.back();
normalizer.applyWayProperties(street, backStreet, wayData, way);
+ platform.ifPresent(plat -> {
+ osmInfoGraphBuildRepository.addPlatform(street, plat);
+ osmInfoGraphBuildRepository.addPlatform(backStreet, plat);
+ });
+
applyEdgesToTurnRestrictions(way, startNode, endNode, street, backStreet);
startNode = endNode;
osmStartNode = osmdb.getNode(startNode);
@@ -422,6 +449,33 @@ private void buildBasicGraph() {
LOG.info(progress.completeMessage());
}
+ private Optional getPlatform(OsmWay way) {
+ if (way.isBoardingLocation()) {
+ var nodeRefs = way.getNodeRefs();
+ var size = nodeRefs.size();
+ var nodes = new Coordinate[size];
+ for (int i = 0; i < size; i++) {
+ nodes[i] = osmdb.getNode(nodeRefs.get(i)).getCoordinate();
+ }
+
+ var geometryFactory = GeometryUtils.getGeometryFactory();
+
+ var geometry = geometryFactory.createLineString(nodes);
+
+ var references = way.getMultiTagValues(params.boardingAreaRefTags());
+
+ return Optional.of(
+ new Platform(
+ params.edgeNamer().getNameForWay(way, "platform " + way.getId()),
+ geometry,
+ references
+ )
+ );
+ } else {
+ return Optional.empty();
+ }
+ }
+
private void validateBarriers() {
List vertices = graph.getVerticesOfType(BarrierVertex.class);
vertices.forEach(bv -> bv.makeBarrierAtEndReachable());
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java
index 2f7f4c506c9..ce50dbbde64 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java
@@ -8,6 +8,7 @@
import org.opentripplanner.graph_builder.services.osm.EdgeNamer;
import org.opentripplanner.osm.OsmProvider;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.street.model.StreetLimitationParameters;
@@ -19,6 +20,7 @@ public class OsmModuleBuilder {
private final Collection providers;
private final Graph graph;
private final VehicleParkingRepository parkingRepository;
+ private final OsmInfoGraphBuildRepository osmInfoGraphBuildRepository;
private Set boardingAreaRefTags = Set.of();
private DataImportIssueStore issueStore = DataImportIssueStore.NOOP;
private EdgeNamer edgeNamer = new DefaultNamer();
@@ -26,16 +28,19 @@ public class OsmModuleBuilder {
private boolean platformEntriesLinking = false;
private boolean staticParkAndRide = false;
private boolean staticBikeParkAndRide = false;
+ private boolean includeOsmSubwayEntrances = false;
private int maxAreaNodes;
private StreetLimitationParameters streetLimitationParameters = new StreetLimitationParameters();
OsmModuleBuilder(
Collection providers,
Graph graph,
+ OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
VehicleParkingRepository parkingRepository
) {
this.providers = providers;
this.graph = graph;
+ this.osmInfoGraphBuildRepository = osmInfoGraphBuildRepository;
this.parkingRepository = parkingRepository;
}
@@ -79,6 +84,11 @@ public OsmModuleBuilder withMaxAreaNodes(int maxAreaNodes) {
return this;
}
+ public OsmModuleBuilder withIncludeOsmSubwayEntrances(boolean includeOsmSubwayEntrances) {
+ this.includeOsmSubwayEntrances = includeOsmSubwayEntrances;
+ return this;
+ }
+
public OsmModuleBuilder withStreetLimitationParameters(StreetLimitationParameters parameters) {
this.streetLimitationParameters = parameters;
return this;
@@ -88,6 +98,7 @@ public OsmModule build() {
return new OsmModule(
providers,
graph,
+ osmInfoGraphBuildRepository,
parkingRepository,
issueStore,
streetLimitationParameters,
@@ -98,7 +109,8 @@ public OsmModule build() {
areaVisibility,
platformEntriesLinking,
staticParkAndRide,
- staticBikeParkAndRide
+ staticBikeParkAndRide,
+ includeOsmSubwayEntrances
)
);
}
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java
index e6fec74b798..8c707d005a9 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java
@@ -33,12 +33,19 @@ class VertexGenerator {
private final HashMap> multiLevelNodes = new HashMap<>();
private final OsmDatabase osmdb;
private final Set boardingAreaRefTags;
+ private final Boolean includeOsmSubwayEntrances;
private final VertexFactory vertexFactory;
- public VertexGenerator(OsmDatabase osmdb, Graph graph, Set boardingAreaRefTags) {
+ public VertexGenerator(
+ OsmDatabase osmdb,
+ Graph graph,
+ Set boardingAreaRefTags,
+ boolean includeOsmSubwayEntrances
+ ) {
this.osmdb = osmdb;
this.vertexFactory = new VertexFactory(graph);
this.boardingAreaRefTags = boardingAreaRefTags;
+ this.includeOsmSubwayEntrances = includeOsmSubwayEntrances;
}
/**
@@ -95,6 +102,11 @@ IntersectionVertex getVertexForOsmNode(OsmNode node, OsmWithTags way) {
iv = bv;
}
+ if (includeOsmSubwayEntrances && node.isSubwayEntrance()) {
+ String ref = node.getTag("ref");
+ iv = vertexFactory.stationEntrance(nid, coordinate, ref, node.wheelchairAccessibility());
+ }
+
if (iv == null) {
iv =
vertexFactory.osm(
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParameters.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParameters.java
index 175b9c04c5b..a59147137f6 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParameters.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParameters.java
@@ -11,16 +11,28 @@
* Example: {@code "osm" : [ {source: "file:///path/to/otp/norway.pbf"} ] }
*
*/
-public record OsmExtractParameters(URI source, OsmTagMapperSource osmTagMapper, ZoneId timeZone)
+public record OsmExtractParameters(
+ URI source,
+ OsmTagMapperSource osmTagMapper,
+ ZoneId timeZone,
+ boolean includeOsmSubwayEntrances
+)
implements DataSourceConfig {
public static final OsmTagMapperSource DEFAULT_OSM_TAG_MAPPER = OsmTagMapperSource.DEFAULT;
public static final ZoneId DEFAULT_TIME_ZONE = null;
+ public static final boolean DEFAULT_INCLUDE_OSM_SUBWAY_ENTRANCES = false;
+
public static final OsmExtractParameters DEFAULT = new OsmExtractParametersBuilder().build();
OsmExtractParameters(OsmExtractParametersBuilder builder) {
- this(builder.getSource(), builder.getOsmTagMapper(), builder.getTimeZone());
+ this(
+ builder.getSource(),
+ builder.getOsmTagMapper(),
+ builder.getTimeZone(),
+ builder.includeOsmSubwayEntrances()
+ );
}
@Override
@@ -37,6 +49,10 @@ public ZoneId timeZone() {
return timeZone;
}
+ public boolean includeOsmSubwayEntrances() {
+ return includeOsmSubwayEntrances;
+ }
+
public OsmExtractParametersBuilder copyOf() {
return new OsmExtractParametersBuilder(this);
}
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersBuilder.java
index 2d9bb71d9f5..66c65e05d81 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersBuilder.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersBuilder.java
@@ -24,14 +24,18 @@ public class OsmExtractParametersBuilder {
*/
private ZoneId timeZone;
+ private boolean includeOsmSubwayEntrances;
+
public OsmExtractParametersBuilder() {
this.osmTagMapper = OsmExtractParameters.DEFAULT_OSM_TAG_MAPPER;
this.timeZone = OsmExtractParameters.DEFAULT_TIME_ZONE;
+ this.includeOsmSubwayEntrances = OsmExtractParameters.DEFAULT_INCLUDE_OSM_SUBWAY_ENTRANCES;
}
public OsmExtractParametersBuilder(OsmExtractParameters original) {
this.osmTagMapper = original.osmTagMapper();
this.timeZone = original.timeZone();
+ this.includeOsmSubwayEntrances = original.includeOsmSubwayEntrances();
}
public OsmExtractParametersBuilder withSource(URI source) {
@@ -49,6 +53,13 @@ public OsmExtractParametersBuilder withTimeZone(ZoneId timeZone) {
return this;
}
+ public OsmExtractParametersBuilder withIncludeOsmSubwayEntrances(
+ boolean includeOsmSubwayEntrances
+ ) {
+ this.includeOsmSubwayEntrances = includeOsmSubwayEntrances;
+ return this;
+ }
+
public URI getSource() {
return source;
}
@@ -61,6 +72,10 @@ public ZoneId getTimeZone() {
return timeZone;
}
+ public boolean includeOsmSubwayEntrances() {
+ return includeOsmSubwayEntrances;
+ }
+
public OsmExtractParameters build() {
return new OsmExtractParameters(this);
}
diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmProcessingParameters.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmProcessingParameters.java
index 52bf8d65314..a3fd14020e8 100644
--- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmProcessingParameters.java
+++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmProcessingParameters.java
@@ -13,6 +13,7 @@
* @param platformEntriesLinking Whether platform entries should be linked
* @param staticParkAndRide Whether we should create car P+R stations from OSM data.
* @param staticBikeParkAndRide Whether we should create bike P+R stations from OSM data.
+ * @param includeOsmSubwayEntrances Whether we should create subway entrances from OSM data.
*/
public record OsmProcessingParameters(
Set boardingAreaRefTags,
@@ -21,7 +22,8 @@ public record OsmProcessingParameters(
boolean areaVisibility,
boolean platformEntriesLinking,
boolean staticParkAndRide,
- boolean staticBikeParkAndRide
+ boolean staticBikeParkAndRide,
+ boolean includeOsmSubwayEntrances
) {
public OsmProcessingParameters {
boardingAreaRefTags = Set.copyOf(Objects.requireNonNull(boardingAreaRefTags));
diff --git a/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java
index a5fe3641e3c..3548312b79a 100644
--- a/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java
+++ b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java
@@ -14,6 +14,7 @@
import org.onebusaway.csv_entities.EntityHandler;
import org.onebusaway.gtfs.impl.GtfsRelationalDaoImpl;
import org.onebusaway.gtfs.model.Agency;
+import org.onebusaway.gtfs.model.Area;
import org.onebusaway.gtfs.model.FareAttribute;
import org.onebusaway.gtfs.model.FareLegRule;
import org.onebusaway.gtfs.model.FareMedium;
@@ -27,7 +28,7 @@
import org.onebusaway.gtfs.model.ServiceCalendarDate;
import org.onebusaway.gtfs.model.ShapePoint;
import org.onebusaway.gtfs.model.Stop;
-import org.onebusaway.gtfs.model.StopArea;
+import org.onebusaway.gtfs.model.StopAreaElement;
import org.onebusaway.gtfs.model.Trip;
import org.onebusaway.gtfs.serialization.GtfsReader;
import org.onebusaway.gtfs.services.GenericMutableDao;
@@ -66,7 +67,8 @@ public class GtfsModule implements GraphBuilderModule {
FareTransferRule.class,
RiderCategory.class,
FareMedium.class,
- StopArea.class
+ StopAreaElement.class,
+ Area.class
);
private static final Logger LOG = LoggerFactory.getLogger(GtfsModule.class);
diff --git a/application/src/main/java/org/opentripplanner/model/plan/RelativeDirection.java b/application/src/main/java/org/opentripplanner/model/plan/RelativeDirection.java
index ffc8993d0db..3ce16a45c11 100644
--- a/application/src/main/java/org/opentripplanner/model/plan/RelativeDirection.java
+++ b/application/src/main/java/org/opentripplanner/model/plan/RelativeDirection.java
@@ -21,6 +21,13 @@ public enum RelativeDirection {
UTURN_RIGHT,
ENTER_STATION,
EXIT_STATION,
+ /**
+ * We don't have a way to reliably tell if we are entering or exiting a station and therefore
+ * use this generic enum value. Please don't expose it in APIs.
+ *
+ * If we manage to figure it out in the future, we can remove this.
+ */
+ ENTER_OR_EXIT_STATION,
FOLLOW_SIGNS;
public static RelativeDirection calculate(
diff --git a/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java
index 55e4bccfdec..ab912eae85b 100644
--- a/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java
+++ b/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java
@@ -98,6 +98,7 @@ protected ScheduledTransitLeg(ScheduledTransitLegBuilder builder) {
getDistanceFromCoordinates(
List.of(transitLegCoordinates.getFirst(), transitLegCoordinates.getLast())
);
+ this.transitAlerts.addAll(builder.alerts());
}
public ZoneId getZoneId() {
diff --git a/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java
index 3e9b5540b1c..e132137e982 100644
--- a/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java
+++ b/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java
@@ -3,7 +3,10 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime;
+import java.util.HashSet;
+import java.util.Set;
import org.opentripplanner.model.transfer.ConstrainedTransfer;
+import org.opentripplanner.routing.alertpatch.TransitAlert;
import org.opentripplanner.transit.model.network.TripPattern;
import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
import org.opentripplanner.transit.model.timetable.TripTimes;
@@ -23,6 +26,7 @@ public class ScheduledTransitLegBuilder>
private ConstrainedTransfer transferToNextLeg;
private int generalizedCost;
private Float accessibilityScore;
+ private Set alerts = new HashSet<>();
public ScheduledTransitLegBuilder() {}
@@ -40,6 +44,7 @@ public ScheduledTransitLegBuilder(ScheduledTransitLeg original) {
generalizedCost = original.getGeneralizedCost();
accessibilityScore = original.accessibilityScore();
zoneId = original.getZoneId();
+ alerts = original.getTransitAlerts();
}
public B withTripTimes(TripTimes tripTimes) {
@@ -159,6 +164,10 @@ public Float accessibilityScore() {
return accessibilityScore;
}
+ public Set alerts() {
+ return alerts;
+ }
+
public ScheduledTransitLeg build() {
return new ScheduledTransitLeg(this);
}
diff --git a/application/src/main/java/org/opentripplanner/model/plan/WalkStep.java b/application/src/main/java/org/opentripplanner/model/plan/WalkStep.java
index c2c2b2c609e..7ade16de39a 100644
--- a/application/src/main/java/org/opentripplanner/model/plan/WalkStep.java
+++ b/application/src/main/java/org/opentripplanner/model/plan/WalkStep.java
@@ -8,6 +8,7 @@
import org.opentripplanner.framework.i18n.I18NString;
import org.opentripplanner.street.model.edge.Edge;
import org.opentripplanner.street.model.note.StreetNote;
+import org.opentripplanner.transit.model.site.Entrance;
import org.opentripplanner.utils.lang.DoubleUtils;
import org.opentripplanner.utils.tostring.ToStringBuilder;
@@ -43,7 +44,8 @@ public final class WalkStep {
private final double angle;
private final boolean walkingBike;
- private final String exit;
+ private final String highwayExit;
+ private final Entrance entrance;
private final ElevationProfile elevationProfile;
private final boolean stayOn;
@@ -55,7 +57,8 @@ public final class WalkStep {
AbsoluteDirection absoluteDirection,
I18NString directionText,
Set streetNotes,
- String exit,
+ String highwayExit,
+ Entrance entrance,
ElevationProfile elevationProfile,
boolean nameIsDerived,
boolean walkingBike,
@@ -75,7 +78,8 @@ public final class WalkStep {
this.angle = DoubleUtils.roundTo2Decimals(angle);
this.walkingBike = walkingBike;
this.area = area;
- this.exit = exit;
+ this.highwayExit = highwayExit;
+ this.entrance = entrance;
this.elevationProfile = elevationProfile;
this.stayOn = stayOn;
this.edges = List.copyOf(Objects.requireNonNull(edges));
@@ -126,8 +130,15 @@ public Optional getAbsoluteDirection() {
/**
* When exiting a highway or traffic circle, the exit name/number.
*/
- public String getExit() {
- return exit;
+ public Optional highwayExit() {
+ return Optional.ofNullable(highwayExit);
+ }
+
+ /**
+ * Get information about a subway station entrance or exit.
+ */
+ public Optional entrance() {
+ return Optional.ofNullable(entrance);
}
/**
diff --git a/application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java
index b2f9e1f7510..75589718861 100644
--- a/application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java
+++ b/application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java
@@ -9,6 +9,7 @@
import org.opentripplanner.framework.i18n.I18NString;
import org.opentripplanner.street.model.edge.Edge;
import org.opentripplanner.street.model.note.StreetNote;
+import org.opentripplanner.transit.model.site.Entrance;
import org.opentripplanner.utils.lang.DoubleUtils;
import org.opentripplanner.utils.lang.IntUtils;
@@ -25,6 +26,7 @@ public class WalkStepBuilder {
private RelativeDirection relativeDirection;
private ElevationProfile elevationProfile;
private String exit;
+ private Entrance entrance;
private boolean stayOn = false;
/**
* Distance used for appending elevation profiles
@@ -74,6 +76,11 @@ public WalkStepBuilder withExit(String exit) {
return this;
}
+ public WalkStepBuilder withEntrance(@Nullable Entrance entrance) {
+ this.entrance = entrance;
+ return this;
+ }
+
public WalkStepBuilder withStayOn(boolean stayOn) {
this.stayOn = stayOn;
return this;
@@ -159,6 +166,7 @@ public WalkStep build() {
directionText,
streetNotes,
exit,
+ entrance,
elevationProfile,
nameIsDerived,
walkingBike,
diff --git a/application/src/main/java/org/opentripplanner/osm/OsmParser.java b/application/src/main/java/org/opentripplanner/osm/OsmParser.java
index 8a5f8e32448..4b443e6a505 100644
--- a/application/src/main/java/org/opentripplanner/osm/OsmParser.java
+++ b/application/src/main/java/org/opentripplanner/osm/OsmParser.java
@@ -1,11 +1,11 @@
package org.opentripplanner.osm;
+import crosby.binary.BinaryParser;
+import crosby.binary.Osmformat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import org.openstreetmap.osmosis.osmbinary.BinaryParser;
-import org.openstreetmap.osmosis.osmbinary.Osmformat;
import org.opentripplanner.graph_builder.module.osm.OsmDatabase;
import org.opentripplanner.osm.model.OsmMemberType;
import org.opentripplanner.osm.model.OsmNode;
diff --git a/application/src/main/java/org/opentripplanner/osm/OsmProvider.java b/application/src/main/java/org/opentripplanner/osm/OsmProvider.java
index 597fd516b0e..53d6acc87b9 100644
--- a/application/src/main/java/org/opentripplanner/osm/OsmProvider.java
+++ b/application/src/main/java/org/opentripplanner/osm/OsmProvider.java
@@ -1,11 +1,11 @@
package org.opentripplanner.osm;
+import crosby.binary.file.BlockInputStream;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.time.ZoneId;
-import org.openstreetmap.osmosis.osmbinary.file.BlockInputStream;
import org.opentripplanner.datastore.api.DataSource;
import org.opentripplanner.datastore.api.FileType;
import org.opentripplanner.datastore.file.FileDataSource;
@@ -37,6 +37,8 @@ public class OsmProvider {
private final OsmTagMapper osmTagMapper;
+ private boolean includeOsmSubwayEntrances = false;
+
private final WayPropertySet wayPropertySet;
private byte[] cachedBytes = null;
@@ -46,6 +48,7 @@ public OsmProvider(File file, boolean cacheDataInMem) {
new FileDataSource(file, FileType.OSM),
OsmTagMapperSource.DEFAULT,
null,
+ false,
cacheDataInMem,
DataImportIssueStore.NOOP
);
@@ -55,11 +58,13 @@ public OsmProvider(
DataSource dataSource,
OsmTagMapperSource tagMapperSource,
ZoneId zoneId,
+ boolean includeOsmSubwayEntrances,
boolean cacheDataInMem,
DataImportIssueStore issueStore
) {
this.source = dataSource;
this.zoneId = zoneId;
+ this.includeOsmSubwayEntrances = includeOsmSubwayEntrances;
this.osmTagMapper = tagMapperSource.getInstance();
this.wayPropertySet = new WayPropertySet(issueStore);
osmTagMapper.populateProperties(wayPropertySet);
@@ -152,6 +157,10 @@ public OsmTagMapper getOsmTagMapper() {
return osmTagMapper;
}
+ public boolean getIncludeOsmSubwayEntrances() {
+ return includeOsmSubwayEntrances;
+ }
+
public WayPropertySet getWayPropertySet() {
return wayPropertySet;
}
diff --git a/application/src/main/java/org/opentripplanner/osm/model/OsmNode.java b/application/src/main/java/org/opentripplanner/osm/model/OsmNode.java
index c5539d1296e..cb9fcd679f0 100644
--- a/application/src/main/java/org/opentripplanner/osm/model/OsmNode.java
+++ b/application/src/main/java/org/opentripplanner/osm/model/OsmNode.java
@@ -63,6 +63,15 @@ public boolean isBarrier() {
);
}
+ /**
+ * Checks if this node is a subway station entrance.
+ *
+ * @return true if it is
+ */
+ public boolean isSubwayEntrance() {
+ return hasTag("railway") && "subway_entrance".equals(getTag("railway"));
+ }
+
/**
* Consider barrier tag in permissions. Leave the rest for the super class.
*/
diff --git a/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java b/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java
index 3f47d4454bd..10214460b15 100644
--- a/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java
+++ b/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java
@@ -139,7 +139,7 @@ public boolean isTagFalse(String tag) {
/**
* Returns the level of wheelchair access of the element.
*/
- public Accessibility getWheelchairAccessibility() {
+ public Accessibility wheelchairAccessibility() {
if (isTagTrue("wheelchair")) {
return Accessibility.POSSIBLE;
} else if (isTagFalse("wheelchair")) {
diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java
index 4ce1c616e65..8ec6ac07e34 100644
--- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java
+++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java
@@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import javax.annotation.Nullable;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
import org.opentripplanner.framework.geometry.DirectionUtils;
@@ -25,9 +26,11 @@
import org.opentripplanner.street.model.edge.StreetEdge;
import org.opentripplanner.street.model.edge.StreetTransitEntranceLink;
import org.opentripplanner.street.model.vertex.ExitVertex;
+import org.opentripplanner.street.model.vertex.StationEntranceVertex;
import org.opentripplanner.street.model.vertex.Vertex;
import org.opentripplanner.street.search.TraverseMode;
import org.opentripplanner.street.search.state.State;
+import org.opentripplanner.transit.model.site.Entrance;
/**
* Process a list of states into a list of walking/driving instructions for a street leg.
@@ -158,7 +161,7 @@ private void processState(State backState, State forwardState) {
return;
} else if (edge instanceof StreetTransitEntranceLink link) {
var direction = relativeDirectionForTransitLink(link);
- createAndSaveStep(backState, forwardState, link.getName(), direction, edge);
+ createAndSaveStep(backState, forwardState, link.getName(), direction, edge, link.entrance());
return;
}
@@ -175,8 +178,18 @@ private void processState(State backState, State forwardState) {
if (edge instanceof ElevatorAlightEdge) {
addStep(createElevatorWalkStep(backState, forwardState, edge));
return;
+ } else if (backState.getVertex() instanceof StationEntranceVertex stationEntranceVertex) {
+ addStep(createStationEntranceWalkStep(backState, forwardState, stationEntranceVertex));
+ return;
} else if (edge instanceof PathwayEdge pwe && pwe.signpostedAs().isPresent()) {
- createAndSaveStep(backState, forwardState, pwe.signpostedAs().get(), FOLLOW_SIGNS, edge);
+ createAndSaveStep(
+ backState,
+ forwardState,
+ pwe.signpostedAs().get(),
+ FOLLOW_SIGNS,
+ edge,
+ null
+ );
return;
}
@@ -515,12 +528,33 @@ private WalkStepBuilder createElevatorWalkStep(State backState, State forwardSta
return step;
}
+ private WalkStepBuilder createStationEntranceWalkStep(
+ State backState,
+ State forwardState,
+ StationEntranceVertex vertex
+ ) {
+ Entrance entrance = Entrance
+ .of(vertex.id())
+ .withCode(vertex.code())
+ .withCoordinate(new WgsCoordinate(vertex.getCoordinate()))
+ .withWheelchairAccessibility(vertex.wheelchairAccessibility())
+ .build();
+
+ // don't care what came before or comes after
+ return createWalkStep(forwardState, backState)
+ // There is not a way to definitively determine if a user is entering or exiting the station,
+ // since the doors might be between or inside stations.
+ .withRelativeDirection(RelativeDirection.ENTER_OR_EXIT_STATION)
+ .withEntrance(entrance);
+ }
+
private void createAndSaveStep(
State backState,
State forwardState,
I18NString name,
RelativeDirection direction,
- Edge edge
+ Edge edge,
+ @Nullable Entrance entrance
) {
addStep(
createWalkStep(forwardState, backState)
@@ -528,6 +562,7 @@ private void createAndSaveStep(
.withNameIsDerived(false)
.withDirections(lastAngle, DirectionUtils.getFirstAngle(edge.getGeometry()), false)
.withRelativeDirection(direction)
+ .withEntrance(entrance)
.addDistance(edge.getDistanceMeters())
);
diff --git a/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java b/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java
index a152b96682d..8565952e557 100644
--- a/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java
+++ b/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java
@@ -25,6 +25,7 @@
import org.opentripplanner.model.projectinfo.GraphFileHeader;
import org.opentripplanner.model.projectinfo.OtpProjectInfo;
import org.opentripplanner.routing.graph.kryosupport.KryoBuilder;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository;
import org.opentripplanner.standalone.config.BuildConfig;
@@ -56,6 +57,10 @@ public class SerializedGraphObject implements Serializable {
private static final Logger LOG = LoggerFactory.getLogger(SerializedGraphObject.class);
public final Graph graph;
+
+ @Nullable
+ public final OsmInfoGraphBuildRepository osmInfoGraphBuildRepository;
+
public final TimetableRepository timetableRepository;
public final WorldEnvelopeRepository worldEnvelopeRepository;
private final Collection edges;
@@ -84,6 +89,7 @@ public class SerializedGraphObject implements Serializable {
public SerializedGraphObject(
Graph graph,
+ @Nullable OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
TimetableRepository timetableRepository,
WorldEnvelopeRepository worldEnvelopeRepository,
VehicleParkingRepository parkingRepository,
@@ -96,6 +102,7 @@ public SerializedGraphObject(
) {
this.graph = graph;
this.edges = graph.getEdges();
+ this.osmInfoGraphBuildRepository = osmInfoGraphBuildRepository;
this.timetableRepository = timetableRepository;
this.worldEnvelopeRepository = worldEnvelopeRepository;
this.parkingRepository = parkingRepository;
diff --git a/application/src/main/java/org/opentripplanner/routing/linking/VertexLinker.java b/application/src/main/java/org/opentripplanner/routing/linking/VertexLinker.java
index 48f5ff997c8..2f09d618ffd 100644
--- a/application/src/main/java/org/opentripplanner/routing/linking/VertexLinker.java
+++ b/application/src/main/java/org/opentripplanner/routing/linking/VertexLinker.java
@@ -7,6 +7,7 @@
import java.util.Set;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
+import javax.annotation.Nullable;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Envelope;
import org.locationtech.jts.geom.Geometry;
@@ -226,20 +227,43 @@ private DisposableEdgeCollection link(
return tempEdges;
}
+ /**
+ * Link a boarding location vertex to specific street edges.
+ *
+ * This is used if a platform is mapped as a linear way, where the given edges form the platform.
+ */
+ public Set linkToSpecificStreetEdgesPermanently(
+ Vertex vertex,
+ TraverseModeSet traverseModes,
+ LinkingDirection direction,
+ Set edges
+ ) {
+ var xscale = getXscale(vertex);
+ return linkToCandidateEdges(
+ vertex,
+ traverseModes,
+ direction,
+ Scope.PERMANENT,
+ null,
+ edges.stream().map(e -> new DistanceTo<>(e, distance(vertex, e, xscale))).toList(),
+ xscale
+ );
+ }
+
private Set linkToStreetEdges(
Vertex vertex,
TraverseModeSet traverseModes,
LinkingDirection direction,
Scope scope,
int radiusMeters,
- DisposableEdgeCollection tempEdges
+ @Nullable DisposableEdgeCollection tempEdges
) {
final double radiusDeg = SphericalDistanceLibrary.metersToDegrees(radiusMeters);
Envelope env = new Envelope(vertex.getCoordinate());
// Perform a simple local equirectangular projection, so distances are expressed in degrees latitude.
- final double xscale = Math.cos(vertex.getLat() * Math.PI / 180);
+ final double xscale = getXscale(vertex);
// Expand more in the longitude direction than the latitude direction to account for converging meridians.
env.expandBy(radiusDeg / xscale, radiusDeg);
@@ -257,6 +281,30 @@ private Set linkToStreetEdges(
.filter(ead -> ead.distanceDegreesLat < radiusDeg)
.toList();
+ return linkToCandidateEdges(
+ vertex,
+ traverseModes,
+ direction,
+ scope,
+ tempEdges,
+ candidateEdges,
+ xscale
+ );
+ }
+
+ private static double getXscale(Vertex vertex) {
+ return Math.cos(vertex.getLat() * Math.PI / 180);
+ }
+
+ private Set linkToCandidateEdges(
+ Vertex vertex,
+ TraverseModeSet traverseModes,
+ LinkingDirection direction,
+ Scope scope,
+ @Nullable DisposableEdgeCollection tempEdges,
+ List> candidateEdges,
+ double xscale
+ ) {
if (candidateEdges.isEmpty()) {
return Set.of();
}
@@ -269,7 +317,7 @@ private Set linkToStreetEdges(
return closestEdges
.stream()
.map(ce -> link(vertex, ce.item, xscale, scope, direction, tempEdges, linkedAreas))
- .filter(v -> v != null)
+ .filter(Objects::nonNull)
.collect(Collectors.toSet());
}
diff --git a/application/src/main/java/org/opentripplanner/service/osminfo/OsmInfoGraphBuildRepository.java b/application/src/main/java/org/opentripplanner/service/osminfo/OsmInfoGraphBuildRepository.java
new file mode 100644
index 00000000000..ac8f7276072
--- /dev/null
+++ b/application/src/main/java/org/opentripplanner/service/osminfo/OsmInfoGraphBuildRepository.java
@@ -0,0 +1,23 @@
+package org.opentripplanner.service.osminfo;
+
+import java.io.Serializable;
+import java.util.Optional;
+import org.opentripplanner.service.osminfo.model.Platform;
+import org.opentripplanner.street.model.edge.Edge;
+
+/**
+ * Store OSM data used during graph build, but discard it after it is complete.
+ *
+ * This is a repository to support the {@link OsmInfoGraphBuildService}.
+ */
+public interface OsmInfoGraphBuildRepository extends Serializable {
+ /**
+ * Associate the edge with a platform
+ */
+ void addPlatform(Edge edge, Platform platform);
+
+ /**
+ * Find the platform the edge belongs to
+ */
+ Optional findPlatform(Edge edge);
+}
diff --git a/application/src/main/java/org/opentripplanner/service/osminfo/OsmInfoGraphBuildService.java b/application/src/main/java/org/opentripplanner/service/osminfo/OsmInfoGraphBuildService.java
new file mode 100644
index 00000000000..6a50c3c92be
--- /dev/null
+++ b/application/src/main/java/org/opentripplanner/service/osminfo/OsmInfoGraphBuildService.java
@@ -0,0 +1,25 @@
+package org.opentripplanner.service.osminfo;
+
+import java.util.Optional;
+import org.opentripplanner.service.osminfo.model.Platform;
+import org.opentripplanner.street.model.edge.Edge;
+
+/**
+ * The responsibility of this service is to provide information from Open Street Map, which
+ * is NOT in the OTP street graph. The graph build happens in phases, and some data is read in
+ * from the OSM files, but needed later on. For example, we might need info from OSM to link street
+ * edges/vertexes with transit stops/platforms. We do not want to put data in the OTP street graph
+ * unless it is relevant for routing. So, for information that is read by the OsmGraphBuilder, but
+ * needed later on, we have this service.
+ *
+ * THIS SERVICE IS ONLY AVAILABLE DURING GRAPH BUILD, NOT DURING ROUTING. *
+ */
+public interface OsmInfoGraphBuildService {
+ /**
+ * Find the platform the given edge is part of.
+ *
+ * TODO: This service currently only stores linear platforms, but area platforms and
+ * node platforms should be supported as well.
+ */
+ Optional findPlatform(Edge edge);
+}
diff --git a/application/src/main/java/org/opentripplanner/service/osminfo/configure/OsmInfoGraphBuildRepositoryModule.java b/application/src/main/java/org/opentripplanner/service/osminfo/configure/OsmInfoGraphBuildRepositoryModule.java
new file mode 100644
index 00000000000..d8b9db5608e
--- /dev/null
+++ b/application/src/main/java/org/opentripplanner/service/osminfo/configure/OsmInfoGraphBuildRepositoryModule.java
@@ -0,0 +1,12 @@
+package org.opentripplanner.service.osminfo.configure;
+
+import dagger.Binds;
+import dagger.Module;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
+
+@Module
+public interface OsmInfoGraphBuildRepositoryModule {
+ @Binds
+ OsmInfoGraphBuildRepository bind(DefaultOsmInfoGraphBuildRepository repository);
+}
diff --git a/application/src/main/java/org/opentripplanner/service/osminfo/configure/OsmInfoGraphBuildServiceModule.java b/application/src/main/java/org/opentripplanner/service/osminfo/configure/OsmInfoGraphBuildServiceModule.java
new file mode 100644
index 00000000000..c6ac5c31ec9
--- /dev/null
+++ b/application/src/main/java/org/opentripplanner/service/osminfo/configure/OsmInfoGraphBuildServiceModule.java
@@ -0,0 +1,12 @@
+package org.opentripplanner.service.osminfo.configure;
+
+import dagger.Binds;
+import dagger.Module;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildService;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildService;
+
+@Module
+public interface OsmInfoGraphBuildServiceModule {
+ @Binds
+ OsmInfoGraphBuildService bind(DefaultOsmInfoGraphBuildService service);
+}
diff --git a/application/src/main/java/org/opentripplanner/service/osminfo/internal/DefaultOsmInfoGraphBuildRepository.java b/application/src/main/java/org/opentripplanner/service/osminfo/internal/DefaultOsmInfoGraphBuildRepository.java
new file mode 100644
index 00000000000..6505fdd67a4
--- /dev/null
+++ b/application/src/main/java/org/opentripplanner/service/osminfo/internal/DefaultOsmInfoGraphBuildRepository.java
@@ -0,0 +1,37 @@
+package org.opentripplanner.service.osminfo.internal;
+
+import jakarta.inject.Inject;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
+import org.opentripplanner.service.osminfo.model.Platform;
+import org.opentripplanner.street.model.edge.Edge;
+
+public class DefaultOsmInfoGraphBuildRepository
+ implements OsmInfoGraphBuildRepository, Serializable {
+
+ private final Map platforms = new HashMap<>();
+
+ @Inject
+ public DefaultOsmInfoGraphBuildRepository() {}
+
+ @Override
+ public void addPlatform(Edge edge, Platform platform) {
+ Objects.requireNonNull(edge);
+ Objects.requireNonNull(platform);
+ this.platforms.put(edge, platform);
+ }
+
+ @Override
+ public Optional findPlatform(Edge edge) {
+ return Optional.ofNullable(platforms.get(edge));
+ }
+
+ @Override
+ public String toString() {
+ return "DefaultOsmInfoGraphBuildRepository{platforms size = " + platforms.size() + "}";
+ }
+}
diff --git a/application/src/main/java/org/opentripplanner/service/osminfo/internal/DefaultOsmInfoGraphBuildService.java b/application/src/main/java/org/opentripplanner/service/osminfo/internal/DefaultOsmInfoGraphBuildService.java
new file mode 100644
index 00000000000..42eb5bf364f
--- /dev/null
+++ b/application/src/main/java/org/opentripplanner/service/osminfo/internal/DefaultOsmInfoGraphBuildService.java
@@ -0,0 +1,28 @@
+package org.opentripplanner.service.osminfo.internal;
+
+import jakarta.inject.Inject;
+import java.util.Optional;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildService;
+import org.opentripplanner.service.osminfo.model.Platform;
+import org.opentripplanner.street.model.edge.Edge;
+
+public class DefaultOsmInfoGraphBuildService implements OsmInfoGraphBuildService {
+
+ private final OsmInfoGraphBuildRepository repository;
+
+ @Inject
+ public DefaultOsmInfoGraphBuildService(OsmInfoGraphBuildRepository repository) {
+ this.repository = repository;
+ }
+
+ @Override
+ public Optional findPlatform(Edge edge) {
+ return repository.findPlatform(edge);
+ }
+
+ @Override
+ public String toString() {
+ return "DefaultOsmInfoGraphBuildService{ repository=" + repository + '}';
+ }
+}
diff --git a/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java b/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java
new file mode 100644
index 00000000000..91d78385a34
--- /dev/null
+++ b/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java
@@ -0,0 +1,7 @@
+package org.opentripplanner.service.osminfo.model;
+
+import java.util.Set;
+import org.locationtech.jts.geom.LineString;
+import org.opentripplanner.framework.i18n.I18NString;
+
+public record Platform(I18NString name, LineString geometry, Set references) {}
diff --git a/application/src/main/java/org/opentripplanner/standalone/OTPMain.java b/application/src/main/java/org/opentripplanner/standalone/OTPMain.java
index ade5067a981..25eea6df473 100644
--- a/application/src/main/java/org/opentripplanner/standalone/OTPMain.java
+++ b/application/src/main/java/org/opentripplanner/standalone/OTPMain.java
@@ -150,6 +150,7 @@ private static void startOTPServer(CommandLineParameters cli) {
// with using the embedded router config.
new SerializedGraphObject(
app.graph(),
+ app.osmInfoGraphBuildRepository(),
app.timetableRepository(),
app.worldEnvelopeRepository(),
app.vehicleParkingRepository(),
diff --git a/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/OsmConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/OsmConfig.java
index 1b2ec0ed74d..5cc67844b50 100644
--- a/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/OsmConfig.java
+++ b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/OsmConfig.java
@@ -1,6 +1,7 @@
package org.opentripplanner.standalone.config.buildconfig;
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2;
+import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_7;
import org.opentripplanner.graph_builder.module.osm.parameters.OsmExtractParameters;
import org.opentripplanner.graph_builder.module.osm.parameters.OsmExtractParametersBuilder;
@@ -84,6 +85,14 @@ public static OsmExtractParametersBuilder mapOsmGenericParameters(
)
.docDefaultValue(docDefaults.timeZone())
.asZoneId(defaults.timeZone())
+ )
+ .withIncludeOsmSubwayEntrances(
+ node
+ .of("includeOsmSubwayEntrances")
+ .since(V2_7)
+ .summary("Whether to include subway entrances from the OSM data." + documentationAddition)
+ .docDefaultValue(docDefaults.includeOsmSubwayEntrances())
+ .asBoolean(defaults.includeOsmSubwayEntrances())
);
}
}
diff --git a/application/src/main/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacer.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacer.java
index 17910fa62ca..c71c1237d3f 100644
--- a/application/src/main/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacer.java
+++ b/application/src/main/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacer.java
@@ -3,12 +3,12 @@
import static java.util.Map.entry;
import static org.opentripplanner.model.projectinfo.OtpProjectInfo.projectInfo;
-import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.annotation.Nullable;
import org.opentripplanner.framework.application.OtpAppException;
+import org.opentripplanner.utils.text.TextVariablesSubstitution;
/**
* Replaces environment variable placeholders specified on the format ${variable} in a text with the
@@ -58,46 +58,47 @@ public class EnvironmentVariableReplacer {
* Search for {@link #PATTERN}s and replace each placeholder with the value of the corresponding
* environment variable.
*
- * @param source is used only to generate human friendly error message in case the text contain a
- * placeholder which can not be found.
- * @throws IllegalArgumentException if a placeholder exist in the {@code text}, but the
- * environment variable do not exist.
+ * @param source is used only to generate a human friendly error message in case the text
+ * contains a placeholder which cannot be found.
+ * @throws IllegalArgumentException if a placeholder exists in the {@code text}, but the
+ * environment variable does not exist.
*/
public static String insertEnvironmentVariables(String text, String source) {
- return insertVariables(text, source, System::getenv);
+ return insertVariables(text, source, EnvironmentVariableReplacer::getEnvVarOrProjectInfo);
}
+ /**
+ * Same as {@link #insertEnvironmentVariables(String, String)}, but the caller mus provide the
+ * {@code variableResolver} - environment and project info variables are not available.
+ */
public static String insertVariables(
String text,
String source,
- Function getEnvVar
+ Function variableResolver
) {
- Map substitutions = new HashMap<>();
- Matcher matcher = PATTERN.matcher(text);
+ return TextVariablesSubstitution.insertVariables(
+ text,
+ variableResolver,
+ varName -> errorVariableNameNotFound(varName, source)
+ );
+ }
- while (matcher.find()) {
- String subKey = matcher.group(0);
- String nameOnly = matcher.group(1);
- if (!substitutions.containsKey(nameOnly)) {
- String value = getEnvVar.apply(nameOnly);
- if (value != null) {
- substitutions.put(subKey, value);
- } else if (PROJECT_INFO.containsKey(nameOnly)) {
- substitutions.put(subKey, PROJECT_INFO.get(nameOnly));
- } else {
- throw new OtpAppException(
- "Environment variable name '" +
- nameOnly +
- "' in config '" +
- source +
- "' not found in the system environment variables."
- );
- }
- }
+ @Nullable
+ private static String getEnvVarOrProjectInfo(String key) {
+ String value = System.getenv(key);
+ if (value == null) {
+ return PROJECT_INFO.get(key);
}
- for (Map.Entry entry : substitutions.entrySet()) {
- text = text.replace(entry.getKey(), entry.getValue());
- }
- return text;
+ return value;
+ }
+
+ private static void errorVariableNameNotFound(String variableName, String source) {
+ throw new OtpAppException(
+ "Environment variable name '" +
+ variableName +
+ "' in config '" +
+ source +
+ "' not found in the system environment variables."
+ );
}
}
diff --git a/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/ServerConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/ServerConfig.java
index a75300f62a2..64921eb813b 100644
--- a/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/ServerConfig.java
+++ b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/ServerConfig.java
@@ -1,9 +1,12 @@
package org.opentripplanner.standalone.config.routerconfig;
+import static org.opentripplanner.standalone.config.framework.json.EnumMapper.docEnumValueList;
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_4;
+import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_7;
import java.time.Duration;
import java.util.List;
+import org.opentripplanner.apis.support.graphql.injectdoc.ApiDocumentationProfile;
import org.opentripplanner.framework.application.OtpAppException;
import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
import org.opentripplanner.standalone.server.OTPWebApplicationParameters;
@@ -13,6 +16,7 @@ public class ServerConfig implements OTPWebApplicationParameters {
private final Duration apiProcessingTimeout;
private final List traceParameters;
+ private final ApiDocumentationProfile apiDocumentationProfile;
public ServerConfig(String parameterName, NodeAdapter root) {
NodeAdapter c = root
@@ -42,6 +46,14 @@ public ServerConfig(String parameterName, NodeAdapter root) {
)
.asDuration(Duration.ofSeconds(-1));
+ this.apiDocumentationProfile =
+ c
+ .of("apiDocumentationProfile")
+ .since(V2_7)
+ .summary(ApiDocumentationProfile.DEFAULT.typeDescription())
+ .description(docEnumValueList(ApiDocumentationProfile.values()))
+ .asEnum(ApiDocumentationProfile.DEFAULT);
+
this.traceParameters =
c
.of("traceParameters")
@@ -105,6 +117,15 @@ public Duration apiProcessingTimeout() {
return apiProcessingTimeout;
}
+ @Override
+ public List traceParameters() {
+ return traceParameters;
+ }
+
+ public ApiDocumentationProfile apiDocumentationProfile() {
+ return apiDocumentationProfile;
+ }
+
public void validate(Duration streetRoutingTimeout) {
if (
!apiProcessingTimeout.isNegative() &&
@@ -119,9 +140,4 @@ public void validate(Duration streetRoutingTimeout) {
);
}
}
-
- @Override
- public List traceParameters() {
- return traceParameters;
- }
}
diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
index b4edbb36299..eeaaf6427cb 100644
--- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
+++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
@@ -18,6 +18,7 @@
import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerMapper;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingService;
@@ -64,6 +65,11 @@ public class ConstructApplication {
private final CommandLineParameters cli;
private final GraphBuilderDataSources graphBuilderDataSources;
+ /**
+ * The OSM Info is injected into the graph-builder, but not the web-server; Hence not part of
+ * the application context.
+ */
+ private final OsmInfoGraphBuildRepository osmInfoGraphBuildRepository;
private final ConstructApplicationFactory factory;
/**
@@ -72,6 +78,7 @@ public class ConstructApplication {
ConstructApplication(
CommandLineParameters cli,
Graph graph,
+ OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
TimetableRepository timetableRepository,
WorldEnvelopeRepository worldEnvelopeRepository,
ConfigModel config,
@@ -84,6 +91,7 @@ public class ConstructApplication {
) {
this.cli = cli;
this.graphBuilderDataSources = graphBuilderDataSources;
+ this.osmInfoGraphBuildRepository = osmInfoGraphBuildRepository;
// We create the optional GraphVisualizer here, because it would be significant more complex to
// use Dagger DI to do it - passing in a parameter to enable it or not.
@@ -130,7 +138,8 @@ public GraphBuilder createGraphBuilder() {
buildConfig(),
graphBuilderDataSources,
graph(),
- timetableRepository(),
+ osmInfoGraphBuildRepository,
+ factory.timetableRepository(),
factory.worldEnvelopeRepository(),
factory.vehicleParkingRepository(),
factory.emissionsDataModel(),
@@ -183,6 +192,7 @@ private void setupTransitRoutingServer() {
routerConfig().transmodelApi(),
timetableRepository(),
routerConfig().routingRequestDefaults(),
+ routerConfig().server().apiDocumentationProfile(),
routerConfig().transitTuningConfig()
);
}
@@ -261,6 +271,10 @@ public DataImportIssueSummary dataImportIssueSummary() {
return factory.dataImportIssueSummary();
}
+ public OsmInfoGraphBuildRepository osmInfoGraphBuildRepository() {
+ return osmInfoGraphBuildRepository;
+ }
+
public StopConsolidationRepository stopConsolidationRepository() {
return factory.stopConsolidationRepository();
}
diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java
index d6310c0c616..3d479f0fa63 100644
--- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java
+++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java
@@ -51,21 +51,21 @@
@Component(
modules = {
ConfigModule.class,
- TransitModule.class,
- WorldEnvelopeServiceModule.class,
+ ConstructApplicationModule.class,
+ EmissionsServiceModule.class,
+ GeocoderModule.class,
+ InteractiveLauncherModule.class,
RealtimeVehicleServiceModule.class,
RealtimeVehicleRepositoryModule.class,
- VehicleRentalServiceModule.class,
- VehicleRentalRepositoryModule.class,
- VehicleParkingServiceModule.class,
- ConstructApplicationModule.class,
RideHailingServicesModule.class,
- EmissionsServiceModule.class,
+ TransitModule.class,
+ VehicleParkingServiceModule.class,
+ VehicleRentalRepositoryModule.class,
+ VehicleRentalServiceModule.class,
SorlandsbanenNorwayModule.class,
StopConsolidationServiceModule.class,
- InteractiveLauncherModule.class,
StreetLimitationParametersServiceModule.class,
- GeocoderModule.class,
+ WorldEnvelopeServiceModule.class,
}
)
public interface ConstructApplicationFactory {
diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java b/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java
index 021af778345..ad1a7293855 100644
--- a/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java
+++ b/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java
@@ -8,6 +8,7 @@
import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.graph.SerializedGraphObject;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository;
import org.opentripplanner.standalone.config.CommandLineParameters;
@@ -20,7 +21,7 @@
* This is used to load the graph, and finally this class can create the
* {@link ConstructApplication} for the next phase.
*
- * By splitting the these two responsibilities into two separate phases we are sure all
+ * By splitting these two responsibilities into two separate phases we are sure all
* components (graph and transit model) created in the load phase will be available for
* creating the application using Dagger dependency injection.
*/
@@ -55,6 +56,7 @@ public DataSource getInputGraphDataStore() {
public ConstructApplication appConstruction(SerializedGraphObject obj) {
return createAppConstruction(
obj.graph,
+ obj.osmInfoGraphBuildRepository,
obj.timetableRepository,
obj.worldEnvelopeRepository,
obj.parkingRepository,
@@ -69,6 +71,7 @@ public ConstructApplication appConstruction(SerializedGraphObject obj) {
public ConstructApplication appConstruction() {
return createAppConstruction(
factory.emptyGraph(),
+ factory.emptyOsmInfoGraphBuildRepository(),
factory.emptyTimetableRepository(),
factory.emptyWorldEnvelopeRepository(),
factory.emptyVehicleParkingRepository(),
@@ -92,6 +95,7 @@ public ConfigModel config() {
private ConstructApplication createAppConstruction(
Graph graph,
+ OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
TimetableRepository timetableRepository,
WorldEnvelopeRepository worldEnvelopeRepository,
VehicleParkingRepository parkingRepository,
@@ -103,6 +107,7 @@ private ConstructApplication createAppConstruction(
return new ConstructApplication(
cli,
graph,
+ osmInfoGraphBuildRepository,
timetableRepository,
worldEnvelopeRepository,
config(),
diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java
index b054fac3ca5..9fdbf59bfda 100644
--- a/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java
+++ b/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java
@@ -11,6 +11,8 @@
import org.opentripplanner.ext.stopconsolidation.configure.StopConsolidationRepositoryModule;
import org.opentripplanner.graph_builder.GraphBuilderDataSources;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
+import org.opentripplanner.service.osminfo.configure.OsmInfoGraphBuildRepositoryModule;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.vehicleparking.configure.VehicleParkingRepositoryModule;
import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository;
@@ -30,6 +32,7 @@
LoadConfigModule.class,
DataStoreModule.class,
GsDataSourceModule.class,
+ OsmInfoGraphBuildRepositoryModule.class,
WorldEnvelopeRepositoryModule.class,
StopConsolidationRepositoryModule.class,
VehicleParkingRepositoryModule.class,
@@ -43,6 +46,9 @@ public interface LoadApplicationFactory {
@Singleton
Graph emptyGraph();
+ @Singleton
+ OsmInfoGraphBuildRepository emptyOsmInfoGraphBuildRepository();
+
@Singleton
TimetableRepository emptyTimetableRepository();
diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/BoardingLocationToStopLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/BoardingLocationToStopLink.java
index 2b306b63cf3..235ec7c6be5 100644
--- a/application/src/main/java/org/opentripplanner/street/model/edge/BoardingLocationToStopLink.java
+++ b/application/src/main/java/org/opentripplanner/street/model/edge/BoardingLocationToStopLink.java
@@ -3,7 +3,7 @@
import java.util.List;
import org.locationtech.jts.geom.LineString;
import org.opentripplanner.framework.geometry.GeometryUtils;
-import org.opentripplanner.street.model.vertex.OsmBoardingLocationVertex;
+import org.opentripplanner.street.model.vertex.StreetVertex;
import org.opentripplanner.street.model.vertex.TransitStopVertex;
/**
@@ -12,16 +12,16 @@
*/
public class BoardingLocationToStopLink extends StreetTransitEntityLink {
- private BoardingLocationToStopLink(OsmBoardingLocationVertex fromv, TransitStopVertex tov) {
+ private BoardingLocationToStopLink(StreetVertex fromv, TransitStopVertex tov) {
super(fromv, tov, tov.getWheelchairAccessibility());
}
- private BoardingLocationToStopLink(TransitStopVertex fromv, OsmBoardingLocationVertex tov) {
+ private BoardingLocationToStopLink(TransitStopVertex fromv, StreetVertex tov) {
super(fromv, tov, fromv.getWheelchairAccessibility());
}
public static BoardingLocationToStopLink createBoardingLocationToStopLink(
- OsmBoardingLocationVertex fromv,
+ StreetVertex fromv,
TransitStopVertex tov
) {
return connectToGraph(new BoardingLocationToStopLink(fromv, tov));
@@ -29,7 +29,7 @@ public static BoardingLocationToStopLink createBoardingLocationToStopLink(
public static BoardingLocationToStopLink createBoardingLocationToStopLink(
TransitStopVertex fromv,
- OsmBoardingLocationVertex tov
+ StreetVertex tov
) {
return connectToGraph(new BoardingLocationToStopLink(fromv, tov));
}
diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java
index 7145f6183e4..34ca3faeeb3 100644
--- a/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java
+++ b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java
@@ -2,6 +2,7 @@
import org.opentripplanner.street.model.vertex.StreetVertex;
import org.opentripplanner.street.model.vertex.TransitEntranceVertex;
+import org.opentripplanner.transit.model.site.Entrance;
/**
* This represents the connection between a street vertex and a transit vertex belonging the street
@@ -43,6 +44,18 @@ public boolean isExit() {
return !isEntrance;
}
+ /**
+ * Get the {@link Entrance} that this edge links to.
+ */
+ public Entrance entrance() {
+ if (getToVertex() instanceof TransitEntranceVertex tev) {
+ return tev.getEntrance();
+ } else if (getFromVertex() instanceof TransitEntranceVertex tev) {
+ return tev.getEntrance();
+ }
+ throw new IllegalStateException("%s doesn't link to an entrance.".formatted(this));
+ }
+
protected int getStreetToStopTime() {
return 0;
}
diff --git a/application/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java
new file mode 100644
index 00000000000..7b9a94b0725
--- /dev/null
+++ b/application/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java
@@ -0,0 +1,58 @@
+package org.opentripplanner.street.model.vertex;
+
+import javax.annotation.Nullable;
+import org.opentripplanner.transit.model.basic.Accessibility;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
+
+/**
+ * A station entrance extracted from OSM and therefore not (yet) associated with the transit
+ * entity {@link org.opentripplanner.transit.model.site.Station}.
+ */
+public class StationEntranceVertex extends OsmVertex {
+
+ private static final String FEED_ID = "osm";
+ private final String code;
+ private final Accessibility wheelchairAccessibility;
+
+ public StationEntranceVertex(
+ double lat,
+ double lon,
+ long nodeId,
+ String code,
+ Accessibility wheelchairAccessibility
+ ) {
+ super(lat, lon, nodeId);
+ this.code = code;
+ this.wheelchairAccessibility = wheelchairAccessibility;
+ }
+
+ /**
+ * The id of the entrance which may or may not be human-readable.
+ */
+ public FeedScopedId id() {
+ return new FeedScopedId(FEED_ID, String.valueOf(nodeId));
+ }
+
+ /**
+ * Short human-readable code of the exit, like A or H3.
+ * If we need a proper name like "Oranienplatz" we have to add a name field.
+ */
+ @Nullable
+ public String code() {
+ return code;
+ }
+
+ public Accessibility wheelchairAccessibility() {
+ return wheelchairAccessibility;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder
+ .of(StationEntranceVertex.class)
+ .addNum("nodeId", nodeId)
+ .addStr("code", code)
+ .toString();
+ }
+}
diff --git a/application/src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java b/application/src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java
index 422fc16c837..393502ba3be 100644
--- a/application/src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java
+++ b/application/src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java
@@ -11,6 +11,7 @@
import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
import org.opentripplanner.street.model.edge.StreetEdge;
+import org.opentripplanner.transit.model.basic.Accessibility;
import org.opentripplanner.transit.model.site.BoardingArea;
import org.opentripplanner.transit.model.site.Entrance;
import org.opentripplanner.transit.model.site.PathwayNode;
@@ -94,6 +95,17 @@ public ExitVertex exit(long nid, Coordinate coordinate, String exitName) {
return addToGraph(new ExitVertex(coordinate.x, coordinate.y, nid, exitName));
}
+ public StationEntranceVertex stationEntrance(
+ long nid,
+ Coordinate coordinate,
+ String code,
+ Accessibility wheelchairAccessibility
+ ) {
+ return addToGraph(
+ new StationEntranceVertex(coordinate.x, coordinate.y, nid, code, wheelchairAccessibility)
+ );
+ }
+
public OsmVertex osm(
Coordinate coordinate,
OsmNode node,
diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java
index 7a7fc0e4621..ea90231bead 100644
--- a/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java
+++ b/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java
@@ -1,5 +1,6 @@
package org.opentripplanner.transit.model.site;
+import javax.annotation.Nullable;
import org.opentripplanner.framework.geometry.WgsCoordinate;
import org.opentripplanner.framework.i18n.I18NString;
import org.opentripplanner.transit.model.basic.Accessibility;
@@ -54,7 +55,7 @@ public String code() {
return code;
}
- public B withCode(String code) {
+ public B withCode(@Nullable String code) {
this.code = code;
return instance();
}
diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java
index 9c32ca39394..fe760747ef4 100644
--- a/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java
+++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java
@@ -9,7 +9,7 @@
*
* Descriptions are copied from the GTFS-RT specification with additions of SIRI nordic profile documentation.
*/
-public enum OccupancyStatus implements DocumentedEnum {
+public enum OccupancyStatus implements DocumentedEnum {
NO_DATA_AVAILABLE,
EMPTY,
MANY_SEATS_AVAILABLE,
diff --git a/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
index a5be5ef4185..8deddd35b61 100644
--- a/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
@@ -2,6 +2,7 @@
import com.google.transit.realtime.GtfsRealtime.FeedMessage;
import java.net.URI;
+import java.util.concurrent.ExecutionException;
import org.opentripplanner.framework.io.OtpHttpClient;
import org.opentripplanner.framework.io.OtpHttpClientFactory;
import org.opentripplanner.routing.impl.TransitAlertServiceImpl;
@@ -26,7 +27,6 @@ public class GtfsRealtimeAlertsUpdater extends PollingGraphUpdater implements Tr
private final TransitAlertService transitAlertService;
private final HttpHeaders headers;
private final OtpHttpClient otpHttpClient;
- private WriteToGraphCallback saveResultOnGraph;
private Long lastTimestamp = Long.MIN_VALUE;
public GtfsRealtimeAlertsUpdater(
@@ -48,11 +48,6 @@ public GtfsRealtimeAlertsUpdater(
LOG.info("Creating real-time alert updater running every {}: {}", pollingPeriod(), url);
}
- @Override
- public void setup(WriteToGraphCallback writeToGraphCallback) {
- this.saveResultOnGraph = writeToGraphCallback;
- }
-
public TransitAlertService getTransitAlertService() {
return transitAlertService;
}
@@ -63,32 +58,26 @@ public String toString() {
}
@Override
- protected void runPolling() {
- try {
- final FeedMessage feed = otpHttpClient.getAndMap(
- URI.create(url),
- this.headers.asMap(),
- FeedMessage.PARSER::parseFrom
- );
+ protected void runPolling() throws InterruptedException, ExecutionException {
+ final FeedMessage feed = otpHttpClient.getAndMap(
+ URI.create(url),
+ this.headers.asMap(),
+ FeedMessage::parseFrom
+ );
- long feedTimestamp = feed.getHeader().getTimestamp();
- if (feedTimestamp == lastTimestamp) {
- LOG.debug("Ignoring feed with a timestamp that has not been updated from {}", url);
- return;
- }
- if (feedTimestamp < lastTimestamp) {
- LOG.info("Ignoring feed with older than previous timestamp from {}", url);
- return;
- }
+ long feedTimestamp = feed.getHeader().getTimestamp();
+ if (feedTimestamp == lastTimestamp) {
+ LOG.debug("Ignoring feed with a timestamp that has not been updated from {}", url);
+ return;
+ }
+ if (feedTimestamp < lastTimestamp) {
+ LOG.info("Ignoring feed with older than previous timestamp from {}", url);
+ return;
+ }
- // Handle update in graph writer runnable
- saveResultOnGraph.execute(context ->
- updateHandler.update(feed, context.gtfsRealtimeFuzzyTripMatcher())
- );
+ // Handle update in graph writer runnable
+ updateGraph(context -> updateHandler.update(feed, context.gtfsRealtimeFuzzyTripMatcher()));
- lastTimestamp = feedTimestamp;
- } catch (Exception e) {
- LOG.error("Failed to process GTFS-RT Alerts feed from {}", url, e);
- }
+ lastTimestamp = feedTimestamp;
}
}
diff --git a/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdater.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdater.java
index 663d3ab906b..8901a49faef 100644
--- a/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdater.java
@@ -30,10 +30,6 @@ public class SiriETUpdater extends PollingGraphUpdater {
* Feed id that is used for the trip ids in the TripUpdates
*/
private final String feedId;
- /**
- * Parent update manager. Is used to execute graph writer runnables.
- */
- protected WriteToGraphCallback saveResultOnGraph;
private final EstimatedTimetableHandler estimatedTimetableHandler;
@@ -60,11 +56,6 @@ public SiriETUpdater(
this.metricsConsumer = metricsConsumer;
}
- @Override
- public void setup(WriteToGraphCallback writeToGraphCallback) {
- this.saveResultOnGraph = writeToGraphCallback;
- }
-
/**
* Repeatedly makes blocking calls to an UpdateStreamer to retrieve new stop time updates, and
* applies those updates to the graph.
diff --git a/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdater.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdater.java
index edfdf0d878d..f089ea69bfd 100644
--- a/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdater.java
@@ -14,7 +14,6 @@
import org.opentripplanner.updater.siri.SiriAlertsUpdateHandler;
import org.opentripplanner.updater.spi.PollingGraphUpdater;
import org.opentripplanner.updater.spi.PollingGraphUpdaterParameters;
-import org.opentripplanner.updater.spi.WriteToGraphCallback;
import org.opentripplanner.updater.trip.UrlUpdaterParameters;
import org.opentripplanner.utils.tostring.ToStringBuilder;
import org.slf4j.Logger;
@@ -36,7 +35,6 @@ public class SiriSXUpdater extends PollingGraphUpdater implements TransitAlertPr
// TODO RT_AB: Document why SiriAlertsUpdateHandler is a separate instance that persists across
// many graph update operations.
private final SiriAlertsUpdateHandler updateHandler;
- private WriteToGraphCallback writeToGraphCallback;
private ZonedDateTime lastTimestamp = ZonedDateTime.now().minusWeeks(1);
private String requestorRef;
/**
@@ -80,11 +78,6 @@ public SiriSXUpdater(
LOG.info("Creating SIRI-SX updater running every {}: {}", pollingPeriod(), url);
}
- @Override
- public void setup(WriteToGraphCallback writeToGraphCallback) {
- this.writeToGraphCallback = writeToGraphCallback;
- }
-
public TransitAlertService getTransitAlertService() {
return transitAlertService;
}
@@ -148,7 +141,7 @@ private void updateSiri() {
// All that said, out of all the update types, Alerts (and SIRI SX) are probably the ones
// that would be most tolerant of non-versioned application-wide storage since they don't
// participate in routing and are tacked on to already-completed routing responses.
- writeToGraphCallback.execute(context -> {
+ saveResultOnGraph.execute(context -> {
updateHandler.update(serviceDelivery, context);
if (markPrimed) {
primed = true;
diff --git a/application/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdater.java b/application/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdater.java
index e0859371de8..e8faa4b6aba 100644
--- a/application/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdater.java
@@ -2,6 +2,9 @@
import java.time.Duration;
import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import org.opentripplanner.framework.application.OTPFeature;
+import org.opentripplanner.updater.GraphWriterRunnable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,6 +37,10 @@ public abstract class PollingGraphUpdater implements GraphUpdater {
* removed that.
*/
protected volatile boolean primed;
+ /**
+ * Parent update manager. Is used to execute graph writer runnables.
+ */
+ protected WriteToGraphCallback saveResultOnGraph;
/** Shared configuration code for all polling graph updaters. */
protected PollingGraphUpdater(PollingGraphUpdaterParameters config) {
@@ -95,9 +102,22 @@ public String getConfigRef() {
return configRef;
}
+ @Override
+ public final void setup(WriteToGraphCallback writeToGraphCallback) {
+ this.saveResultOnGraph = writeToGraphCallback;
+ }
+
/**
* Mirrors GraphUpdater.run method. Only difference is that runPolling will be run multiple times
* with pauses in between. The length of the pause is defined in the preference frequency.
*/
protected abstract void runPolling() throws Exception;
+
+ protected final void updateGraph(GraphWriterRunnable task)
+ throws ExecutionException, InterruptedException {
+ var result = saveResultOnGraph.execute(task);
+ if (OTPFeature.WaitForGraphUpdateInPollingUpdaters.isOn()) {
+ result.get();
+ }
+ }
}
diff --git a/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java b/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
index 20b49ed022f..0580cd4ea63 100644
--- a/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
@@ -138,7 +138,7 @@ public void messageArrived(String topic, MqttMessage message) {
UpdateIncrementality updateIncrementality = FULL_DATASET;
try {
// Decode message
- GtfsRealtime.FeedMessage feedMessage = GtfsRealtime.FeedMessage.PARSER.parseFrom(
+ GtfsRealtime.FeedMessage feedMessage = GtfsRealtime.FeedMessage.parseFrom(
message.getPayload()
);
List feedEntityList = feedMessage.getEntityList();
diff --git a/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java b/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java
index c725c8b1088..8331bf19d3b 100644
--- a/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java
@@ -2,10 +2,10 @@
import com.google.transit.realtime.GtfsRealtime.TripUpdate;
import java.util.List;
+import java.util.concurrent.ExecutionException;
import java.util.function.Consumer;
import org.opentripplanner.updater.spi.PollingGraphUpdater;
import org.opentripplanner.updater.spi.UpdateResult;
-import org.opentripplanner.updater.spi.WriteToGraphCallback;
import org.opentripplanner.updater.trip.metrics.BatchTripUpdateMetrics;
import org.opentripplanner.utils.tostring.ToStringBuilder;
import org.slf4j.Logger;
@@ -33,10 +33,6 @@ public class PollingTripUpdater extends PollingGraphUpdater {
private final BackwardsDelayPropagationType backwardsDelayPropagationType;
private final Consumer recordMetrics;
- /**
- * Parent update manager. Is used to execute graph writer runnables.
- */
- private WriteToGraphCallback saveResultOnGraph;
/**
* Set only if we should attempt to match the trip_id from other data in TripDescriptor
*/
@@ -63,17 +59,12 @@ public PollingTripUpdater(
);
}
- @Override
- public void setup(WriteToGraphCallback writeToGraphCallback) {
- this.saveResultOnGraph = writeToGraphCallback;
- }
-
/**
* Repeatedly makes blocking calls to an UpdateStreamer to retrieve new stop time updates, and
* applies those updates to the graph.
*/
@Override
- public void runPolling() {
+ public void runPolling() throws InterruptedException, ExecutionException {
// Get update lists from update source
List updates = updateSource.getUpdates();
var incrementality = updateSource.incrementalityOfLastUpdates();
@@ -89,7 +80,7 @@ public void runPolling() {
feedId,
recordMetrics
);
- saveResultOnGraph.execute(runnable);
+ updateGraph(runnable);
}
}
diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java
index e548d5d75be..29e820ff952 100644
--- a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java
@@ -2,6 +2,7 @@
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
@@ -12,7 +13,6 @@
import org.opentripplanner.updater.RealTimeUpdateContext;
import org.opentripplanner.updater.spi.DataSource;
import org.opentripplanner.updater.spi.PollingGraphUpdater;
-import org.opentripplanner.updater.spi.WriteToGraphCallback;
import org.opentripplanner.utils.tostring.ToStringBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,8 +27,6 @@ public class VehicleParkingAvailabilityUpdater extends PollingGraphUpdater {
VehicleParkingAvailabilityUpdater.class
);
private final DataSource source;
- private WriteToGraphCallback saveResultOnGraph;
-
private final VehicleParkingRepository repository;
public VehicleParkingAvailabilityUpdater(
@@ -44,17 +42,12 @@ public VehicleParkingAvailabilityUpdater(
}
@Override
- public void setup(WriteToGraphCallback writeToGraphCallback) {
- this.saveResultOnGraph = writeToGraphCallback;
- }
-
- @Override
- protected void runPolling() {
+ protected void runPolling() throws InterruptedException, ExecutionException {
if (source.update()) {
var updates = source.getUpdates();
var graphWriterRunnable = new AvailabilityUpdater(updates);
- saveResultOnGraph.execute(graphWriterRunnable);
+ updateGraph(graphWriterRunnable);
}
}
diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java
index 8e4cf8a862b..5513e224f57 100644
--- a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java
@@ -6,6 +6,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.opentripplanner.routing.graph.Graph;
@@ -26,7 +27,6 @@
import org.opentripplanner.updater.RealTimeUpdateContext;
import org.opentripplanner.updater.spi.DataSource;
import org.opentripplanner.updater.spi.PollingGraphUpdater;
-import org.opentripplanner.updater.spi.WriteToGraphCallback;
import org.opentripplanner.utils.tostring.ToStringBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +42,6 @@ public class VehicleParkingUpdater extends PollingGraphUpdater {
private final Map> tempEdgesByPark = new HashMap<>();
private final DataSource source;
private final List oldVehicleParkings = new ArrayList<>();
- private WriteToGraphCallback saveResultOnGraph;
private final VertexLinker linker;
private final VehicleParkingRepository parkingRepository;
@@ -64,12 +63,7 @@ public VehicleParkingUpdater(
}
@Override
- public void setup(WriteToGraphCallback writeToGraphCallback) {
- this.saveResultOnGraph = writeToGraphCallback;
- }
-
- @Override
- protected void runPolling() {
+ protected void runPolling() throws InterruptedException, ExecutionException {
LOG.debug("Updating vehicle parkings from {}", source);
if (!source.update()) {
LOG.debug("No updates");
@@ -81,7 +75,7 @@ protected void runPolling() {
VehicleParkingGraphWriterRunnable graphWriterRunnable = new VehicleParkingGraphWriterRunnable(
vehicleParkings
);
- saveResultOnGraph.execute(graphWriterRunnable);
+ updateGraph(graphWriterRunnable);
}
private class VehicleParkingGraphWriterRunnable implements GraphWriterRunnable {
diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
index 4c487ac997b..f53d3010e59 100644
--- a/application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
@@ -3,11 +3,11 @@
import com.google.transit.realtime.GtfsRealtime.VehiclePosition;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.ExecutionException;
import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository;
import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle;
import org.opentripplanner.standalone.config.routerconfig.updaters.VehiclePositionsUpdaterConfig;
import org.opentripplanner.updater.spi.PollingGraphUpdater;
-import org.opentripplanner.updater.spi.WriteToGraphCallback;
import org.opentripplanner.utils.tostring.ToStringBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,10 +27,6 @@ public class PollingVehiclePositionUpdater extends PollingGraphUpdater {
private final GtfsRealtimeHttpVehiclePositionSource vehiclePositionSource;
private final Set vehiclePositionFeatures;
- /**
- * Parent update manager. Is used to execute graph writer runnables.
- */
- private WriteToGraphCallback saveResultOnGraph;
private final String feedId;
private final RealtimeVehicleRepository realtimeVehicleRepository;
private final boolean fuzzyTripMatching;
@@ -54,17 +50,12 @@ public PollingVehiclePositionUpdater(
);
}
- @Override
- public void setup(WriteToGraphCallback writeToGraphCallback) {
- this.saveResultOnGraph = writeToGraphCallback;
- }
-
/**
* Repeatedly makes blocking calls to an UpdateStreamer to retrieve new stop time updates, and
* applies those updates to the graph.
*/
@Override
- public void runPolling() {
+ public void runPolling() throws InterruptedException, ExecutionException {
// Get update lists from update source
List updates = vehiclePositionSource.getPositions();
@@ -77,7 +68,7 @@ public void runPolling() {
fuzzyTripMatching,
updates
);
- saveResultOnGraph.execute(runnable);
+ updateGraph(runnable);
}
}
diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java
index 24686edce6c..8419d004138 100644
--- a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java
+++ b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java
@@ -8,6 +8,7 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.opentripplanner.routing.linking.DisposableEdgeCollection;
@@ -30,7 +31,6 @@
import org.opentripplanner.updater.RealTimeUpdateContext;
import org.opentripplanner.updater.spi.PollingGraphUpdater;
import org.opentripplanner.updater.spi.UpdaterConstructionException;
-import org.opentripplanner.updater.spi.WriteToGraphCallback;
import org.opentripplanner.updater.vehicle_rental.datasources.VehicleRentalDatasource;
import org.opentripplanner.utils.lang.ObjectUtils;
import org.opentripplanner.utils.logging.Throttle;
@@ -53,8 +53,6 @@ public class VehicleRentalUpdater extends PollingGraphUpdater {
private final VehicleRentalDatasource source;
private final String nameForLogging;
- private WriteToGraphCallback saveResultOnGraph;
-
private Map latestModifiedEdges = Map.of();
private Set latestAppliedGeofencingZones = Set.of();
private final Map verticesByStation = new HashMap<>();
@@ -108,11 +106,6 @@ public VehicleRentalUpdater(
}
}
- @Override
- public void setup(WriteToGraphCallback writeToGraphCallback) {
- this.saveResultOnGraph = writeToGraphCallback;
- }
-
@Override
public String toString() {
return ToStringBuilder.of(VehicleRentalUpdater.class).addObj("source", source).toString();
@@ -124,7 +117,7 @@ public String getConfigRef() {
}
@Override
- protected void runPolling() {
+ protected void runPolling() throws InterruptedException, ExecutionException {
LOG.debug("Updating vehicle rental stations from {}", nameForLogging);
if (!source.update()) {
LOG.debug("No updates from {}", nameForLogging);
@@ -138,7 +131,7 @@ protected void runPolling() {
stations,
geofencingZones
);
- saveResultOnGraph.execute(graphWriterRunnable);
+ updateGraph(graphWriterRunnable);
}
private class VehicleRentalGraphWriterRunnable implements GraphWriterRunnable {
diff --git a/application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index 537d9b680b4..ce808e546d1 100644
--- a/application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -82,6 +82,9 @@ union CallStopLocation = Stop
"Rental place union that represents either a VehicleRentalStation or a RentalVehicle"
union RentalPlace = RentalVehicle | VehicleRentalStation
+"A feature for a step"
+union StepFeature = Entrance
+
union StopPosition = PositionAtStop | PositionBetweenStops
"A public transport agency"
@@ -488,6 +491,18 @@ type Emissions {
co2: Grams
}
+"Station entrance or exit, originating from OSM or GTFS data."
+type Entrance {
+ "ID of the entrance in the format of `FeedId:EntranceId`. If the `FeedId` is `osm`, the entrance originates from OSM data."
+ entranceId: String!
+ "Name of the entrance or exit."
+ name: String
+ "Short text or a number that identifies the entrance or exit for passengers. For example, `A` or `B`."
+ publicCode: String
+ "Whether the entrance or exit is accessible by wheelchair"
+ wheelchairAccessible: WheelchairBoarding
+}
+
"Real-time estimates for an arrival or departure at a certain place."
type EstimatedTime {
"""
@@ -2844,6 +2859,8 @@ type step {
elevationProfile: [elevationProfileComponent]
"When exiting a highway or traffic circle, the exit name/number."
exit: String
+ "Information about an feature associated with a step e.g. an station entrance or exit"
+ feature: StepFeature
"The latitude of the start of the step."
lat: Float
"The longitude of the start of the step."
@@ -3518,15 +3535,40 @@ enum RealtimeState {
UPDATED
}
-"Actions to take relative to the current position when engaging a walking/driving step."
+"""
+A direction that is not absolute but rather fuzzy and context-dependent.
+It provides the passenger with information what they should do in this step depending on where they
+were in the previous one.
+"""
enum RelativeDirection {
CIRCLE_CLOCKWISE
CIRCLE_COUNTERCLOCKWISE
+ """
+ Moving straight ahead in one of these cases
+
+ - Passing through a crossing or intersection.
+ - Passing through a station entrance or exit when it is not know whether the passenger is
+ entering or exiting. If it _is_ known then `ENTER_STATION`/`EXIT_STATION` is used.
+ More information about the entrance is in the `step.feature` field.
+ """
CONTINUE
DEPART
ELEVATOR
+ """
+ Entering a public transport station. If it's not known if the passenger is entering or exiting
+ then `CONTINUE` is used.
+
+ More information about the entrance is in the `step.feature` field.
+ """
ENTER_STATION
+ """
+ Exiting a public transport station. If it's not known if the passenger is entering or exiting
+ then `CONTINUE` is used.
+
+ More information about the entrance is in the `step.feature` field.
+ """
EXIT_STATION
+ "Follow the signs indicating a specific location like \"platform 1\" or \"exit B\"."
FOLLOW_SIGNS
HARD_LEFT
HARD_RIGHT
diff --git a/application/src/test/java/org/opentripplanner/ConstantsForTests.java b/application/src/test/java/org/opentripplanner/ConstantsForTests.java
index e5ab48cee54..3f188ff2c89 100644
--- a/application/src/test/java/org/opentripplanner/ConstantsForTests.java
+++ b/application/src/test/java/org/opentripplanner/ConstantsForTests.java
@@ -34,6 +34,7 @@
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.linking.LinkingDirection;
import org.opentripplanner.routing.linking.VertexLinker;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
@@ -137,9 +138,11 @@ public static TestOtpModel buildNewPortlandGraph(boolean withElevation) {
var timetableRepository = new TimetableRepository(new SiteRepository(), deduplicator);
// Add street data from OSM
{
- OsmProvider osmProvider = new OsmProvider(PORTLAND_CENTRAL_OSM, false);
- OsmModule osmModule = OsmModule
- .of(osmProvider, graph, new DefaultVehicleParkingRepository())
+ var osmProvider = new OsmProvider(PORTLAND_CENTRAL_OSM, false);
+ var osmInfoRepository = new DefaultOsmInfoGraphBuildRepository();
+ var vehicleParkingRepository = new DefaultVehicleParkingRepository();
+ var osmModule = OsmModule
+ .of(osmProvider, graph, osmInfoRepository, vehicleParkingRepository)
.withStaticParkAndRide(true)
.withStaticBikeParkAndRide(true)
.build();
@@ -195,9 +198,11 @@ public static TestOtpModel buildOsmGraph(File osmFile) {
var graph = new Graph(deduplicator);
var timetableRepository = new TimetableRepository(siteRepository, deduplicator);
// Add street data from OSM
- OsmProvider osmProvider = new OsmProvider(osmFile, true);
- OsmModule osmModule = OsmModule
- .of(osmProvider, graph, new DefaultVehicleParkingRepository())
+ var osmProvider = new OsmProvider(osmFile, true);
+ var osmInfoRepository = new DefaultOsmInfoGraphBuildRepository();
+ var vehicleParkingRepository = new DefaultVehicleParkingRepository();
+ var osmModule = OsmModule
+ .of(osmProvider, graph, osmInfoRepository, vehicleParkingRepository)
.build();
osmModule.buildGraph();
return new TestOtpModel(graph, timetableRepository);
@@ -245,8 +250,9 @@ public static TestOtpModel buildNewMinimalNetexGraph() {
var timetableRepository = new TimetableRepository(siteRepository, deduplicator);
// Add street data from OSM
{
- OsmProvider osmProvider = new OsmProvider(OSLO_EAST_OSM, false);
- OsmModule osmModule = OsmModule.of(osmProvider, graph, parkingService).build();
+ var osmProvider = new OsmProvider(OSLO_EAST_OSM, false);
+ var osmInfoRepository = new DefaultOsmInfoGraphBuildRepository();
+ var osmModule = OsmModule.of(osmProvider, graph, osmInfoRepository, parkingService).build();
osmModule.buildGraph();
}
// Add transit data from Netex
diff --git a/application/src/test/java/org/opentripplanner/GtfsTest.java b/application/src/test/java/org/opentripplanner/GtfsTest.java
index 5d548e4012c..05b7bfbf4f6 100644
--- a/application/src/test/java/org/opentripplanner/GtfsTest.java
+++ b/application/src/test/java/org/opentripplanner/GtfsTest.java
@@ -221,7 +221,7 @@ protected void setUp() throws Exception {
try {
InputStream inputStream = new FileInputStream(gtfsRealTime);
- FeedMessage feedMessage = FeedMessage.PARSER.parseFrom(inputStream);
+ FeedMessage feedMessage = FeedMessage.parseFrom(inputStream);
List feedEntityList = feedMessage.getEntityList();
List updates = new ArrayList<>(feedEntityList.size());
for (FeedEntity feedEntity : feedEntityList) {
diff --git a/application/src/test/java/org/opentripplanner/_support/text/TextAssertions.java b/application/src/test/java/org/opentripplanner/_support/text/TextAssertions.java
new file mode 100644
index 00000000000..a009b76237c
--- /dev/null
+++ b/application/src/test/java/org/opentripplanner/_support/text/TextAssertions.java
@@ -0,0 +1,64 @@
+package org.opentripplanner._support.text;
+
+import org.junit.jupiter.api.Assertions;
+
+/**
+ * This class contains test assert methods not supported by the standard JUnit
+ * framework.
+ */
+public final class TextAssertions {
+
+ private static final String LINE_DELIMITERS = "(\n|\r|\r\n)";
+ private static final int END_OF_TEXT = -111;
+
+ /**
+
+ * Assert to texts are equals line by line. Empty lines and white-space in the start and end of
+ * a line is ignored.
+ */
+ public static void assertLinesEquals(String expected, String actual) {
+ var expLines = expected.split(LINE_DELIMITERS);
+ var actLines = actual.split(LINE_DELIMITERS);
+
+ int i = -1;
+ int j = -1;
+
+ while (true) {
+ i = next(expLines, i);
+ j = next(actLines, j);
+
+ if (i == END_OF_TEXT && j == END_OF_TEXT) {
+ return;
+ }
+
+ var exp = getLine(expLines, i);
+ var act = getLine(actLines, j);
+
+ if (i == END_OF_TEXT || j == END_OF_TEXT || !exp.equals(act)) {
+ Assertions.fail(
+ "Expected%s: <%s>%n".formatted(lineText(i), exp) +
+ "Actual %s: <%s>%n".formatted(lineText(j), act)
+ );
+ }
+ }
+ }
+
+ private static String lineText(int index) {
+ return index < 0 ? "(@end-of-text)" : "(@line %d)".formatted(index);
+ }
+
+ private static String getLine(String[] lines, int i) {
+ return i == END_OF_TEXT ? "" : lines[i].trim();
+ }
+
+ private static int next(String[] lines, int index) {
+ ++index;
+ while (index < lines.length) {
+ if (!lines[index].isBlank()) {
+ return index;
+ }
+ ++index;
+ }
+ return END_OF_TEXT;
+ }
+}
diff --git a/application/src/test/java/org/opentripplanner/_support/text/TextAssertionsTest.java b/application/src/test/java/org/opentripplanner/_support/text/TextAssertionsTest.java
new file mode 100644
index 00000000000..739b7b59c4b
--- /dev/null
+++ b/application/src/test/java/org/opentripplanner/_support/text/TextAssertionsTest.java
@@ -0,0 +1,49 @@
+package org.opentripplanner._support.text;
+
+import static org.opentripplanner._support.text.TextAssertions.assertLinesEquals;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class TextAssertionsTest {
+
+ @Test
+ void testIgnoreWhiteSpace() {
+ // Empty text
+ assertLinesEquals("", "\n\n");
+
+ // Text with white-space inserted
+ assertLinesEquals(
+ """
+ A Test
+ Line 2
+ DOS\r\n
+ line-shift
+ """,
+ """
+
+ A Test \t
+ \t
+
+ \tLine 2
+ DOS\rline-shift
+ """
+ );
+ }
+
+ @Test
+ void testEndOfText() {
+ var ex = Assertions.assertThrows(
+ org.opentest4j.AssertionFailedError.class,
+ () -> assertLinesEquals("A\n", "A\nExtra Line")
+ );
+ Assertions.assertTrue(
+ ex.getMessage().contains("Expected(@end-of-text)"),
+ "<" + ex.getMessage() + "> does not contain expected line."
+ );
+ Assertions.assertTrue(
+ ex.getMessage().contains("Actual (@line 1): "),
+ "<" + ex.getMessage() + "> does not contain actual line."
+ );
+ }
+}
diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
index 7e1bf24287a..2f190502ccc 100644
--- a/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
+++ b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
@@ -66,7 +66,6 @@
import org.opentripplanner.routing.alertpatch.TimePeriod;
import org.opentripplanner.routing.alertpatch.TransitAlert;
import org.opentripplanner.routing.api.request.RouteRequest;
-import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.graphfinder.GraphFinder;
import org.opentripplanner.routing.graphfinder.NearbyStop;
import org.opentripplanner.routing.graphfinder.PlaceAtDistance;
@@ -87,6 +86,7 @@
import org.opentripplanner.standalone.config.framework.json.JsonSupport;
import org.opentripplanner.test.support.FilePatternSource;
import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
+import org.opentripplanner.transit.model.basic.Accessibility;
import org.opentripplanner.transit.model.basic.Money;
import org.opentripplanner.transit.model.basic.TransitMode;
import org.opentripplanner.transit.model.framework.AbstractBuilder;
@@ -96,6 +96,7 @@
import org.opentripplanner.transit.model.network.Route;
import org.opentripplanner.transit.model.network.TripPattern;
import org.opentripplanner.transit.model.organization.Agency;
+import org.opentripplanner.transit.model.site.Entrance;
import org.opentripplanner.transit.model.site.RegularStop;
import org.opentripplanner.transit.model.site.StopLocation;
import org.opentripplanner.transit.model.timetable.RealTimeTripTimes;
@@ -137,8 +138,6 @@ class GraphQLIntegrationTest {
.withSystem("Network-1", "https://foo.bar")
.build();
- static final Graph GRAPH = new Graph();
-
static final Instant ALERT_START_TIME = OffsetDateTime
.parse("2023-02-15T12:03:28+01:00")
.toInstant();
@@ -267,9 +266,20 @@ public Set findRoutes(StopLocation stop) {
.withAbsoluteDirection(20)
.build();
var step2 = walkStep("elevator").withRelativeDirection(RelativeDirection.ELEVATOR).build();
+ FeedScopedId entranceId = new FeedScopedId("osm", "123");
+ Entrance entrance = Entrance
+ .of(entranceId)
+ .withCoordinate(new WgsCoordinate(60, 80))
+ .withCode("A")
+ .withWheelchairAccessibility(Accessibility.POSSIBLE)
+ .build();
+ var step3 = walkStep("entrance")
+ .withRelativeDirection(RelativeDirection.ENTER_OR_EXIT_STATION)
+ .withEntrance(entrance)
+ .build();
Itinerary i1 = newItinerary(A, T11_00)
- .walk(20, B, List.of(step1, step2))
+ .walk(20, B, List.of(step1, step2, step3))
.bus(busRoute, 122, T11_01, T11_15, C)
.rail(439, T11_30, T11_50, D)
.carHail(D10m, E)
diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapperTest.java
index 2c69f3dca46..1dcd6e210a3 100644
--- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapperTest.java
+++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapperTest.java
@@ -23,6 +23,7 @@ void absoluteDirection() {
void relativeDirection() {
Arrays
.stream(RelativeDirection.values())
+ .filter(v -> v != RelativeDirection.ENTER_OR_EXIT_STATION)
.forEach(d -> {
var mapped = DirectionMapper.map(d);
assertEquals(d.toString(), mapped.toString());
diff --git a/application/src/test/java/org/opentripplanner/apis/support/graphql/injectdoc/CustomDocumentationTest.java b/application/src/test/java/org/opentripplanner/apis/support/graphql/injectdoc/CustomDocumentationTest.java
new file mode 100644
index 00000000000..dc9356530b6
--- /dev/null
+++ b/application/src/test/java/org/opentripplanner/apis/support/graphql/injectdoc/CustomDocumentationTest.java
@@ -0,0 +1,76 @@
+package org.opentripplanner.apis.support.graphql.injectdoc;
+
+import static java.util.Optional.empty;
+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.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+
+class CustomDocumentationTest {
+
+ private static final String ORIGINAL_DOC = "Original";
+
+ // We use a HashMap to allow inserting 'null' values
+ private static final Map PROPERTIES = new HashMap<>(Map.ofEntries());
+
+ static {
+ PROPERTIES.put("Type1.description", "Doc 1");
+ PROPERTIES.put("Type2.description.append", "Doc 2");
+ PROPERTIES.put("Type3.description", null);
+ PROPERTIES.put("Type.field1.description", "Doc f1");
+ PROPERTIES.put("Type.field2.deprecated", "Deprecated f2");
+ PROPERTIES.put("Type.field3.description.append", "Doc f3");
+ PROPERTIES.put("Type.field4.deprecated.append", "Deprecated f4");
+ PROPERTIES.put("Type.field5.description", null);
+ }
+
+ private final CustomDocumentation subject = new CustomDocumentation(PROPERTIES);
+
+ @Test
+ void testCreate() {
+ var defaultDoc = CustomDocumentation.of(ApiDocumentationProfile.DEFAULT);
+ assertTrue(defaultDoc.isEmpty());
+
+ var enturDoc = CustomDocumentation.of(ApiDocumentationProfile.ENTUR);
+ assertFalse(enturDoc.isEmpty());
+ }
+
+ @Test
+ void testTypeDescriptionWithUnknownKey() {
+ assertEquals(empty(), subject.typeDescription("", ORIGINAL_DOC));
+ assertEquals(empty(), subject.typeDescription("ANY_KEY", ORIGINAL_DOC));
+ assertEquals(empty(), subject.typeDescription("ANY_KEY", null));
+ }
+
+ @Test
+ void testTypeDescription() {
+ assertEquals(Optional.of("Doc 1"), subject.typeDescription("Type1", ORIGINAL_DOC));
+ assertEquals(
+ Optional.of(ORIGINAL_DOC + "\n\nDoc 2"),
+ subject.typeDescription("Type2", ORIGINAL_DOC)
+ );
+ assertEquals(Optional.empty(), subject.typeDescription("Type3", ORIGINAL_DOC));
+ }
+
+ @Test
+ void testFieldDescription() {
+ assertEquals(Optional.of("Doc f1"), subject.fieldDescription("Type", "field1", ORIGINAL_DOC));
+ assertEquals(
+ Optional.of("Deprecated f2"),
+ subject.fieldDeprecatedReason("Type", "field2", ORIGINAL_DOC)
+ );
+ assertEquals(
+ Optional.of("Original\n\nDoc f3"),
+ subject.fieldDescription("Type", "field3", ORIGINAL_DOC)
+ );
+ assertEquals(
+ Optional.of("Original\n\nDeprecated f4"),
+ subject.fieldDeprecatedReason("Type", "field4", ORIGINAL_DOC)
+ );
+ assertEquals(Optional.empty(), subject.fieldDeprecatedReason("Type", "field5", ORIGINAL_DOC));
+ }
+}
diff --git a/application/src/test/java/org/opentripplanner/apis/support/graphql/injectdoc/InjectCustomDocumentationTest.java b/application/src/test/java/org/opentripplanner/apis/support/graphql/injectdoc/InjectCustomDocumentationTest.java
new file mode 100644
index 00000000000..44318d613a4
--- /dev/null
+++ b/application/src/test/java/org/opentripplanner/apis/support/graphql/injectdoc/InjectCustomDocumentationTest.java
@@ -0,0 +1,139 @@
+package org.opentripplanner.apis.support.graphql.injectdoc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import graphql.schema.Coercing;
+import graphql.schema.GraphQLScalarType;
+import graphql.schema.GraphQLSchema;
+import graphql.schema.SchemaTransformer;
+import graphql.schema.idl.RuntimeWiring;
+import graphql.schema.idl.SchemaGenerator;
+import graphql.schema.idl.SchemaParser;
+import graphql.schema.idl.SchemaPrinter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner._support.text.TextAssertions;
+
+/**
+ * This test reads in a schema file, injects documentation and convert the
+ * new schema to an SDL text string. The result is then compared to the
+ * "expected" SDL file. The input and expected files are found in the
+ * resources - with the same name as this test.
+ *
+ * Note! There is a bug in the Java GraphQL library. Existing deprecated reasons
+ * cannot be changed or replaced. This test adds test-cases for this, but excludes
+ * them from the expected result. If this is fixed in the GraphQL library, this
+ * test will fail, and should be updated by updating the expected result.
+ */
+class InjectCustomDocumentationTest {
+
+ private GraphQLSchema schema;
+ private String sdlExpected;
+
+ @BeforeEach
+ void setUp() throws IOException {
+ var sdl = loadSchemaResource(".graphql");
+ sdlExpected = loadSchemaResource(".graphql.expected");
+
+ var parser = new SchemaParser();
+ var generator = new SchemaGenerator();
+ var typeRegistry = parser.parse(sdl);
+ schema = generator.makeExecutableSchema(typeRegistry, buildRuntimeWiring());
+ }
+
+ private static RuntimeWiring buildRuntimeWiring() {
+ return RuntimeWiring
+ .newRuntimeWiring()
+ .type("QueryType", b -> b.dataFetcher("listE", e -> List.of()))
+ .type("En", b -> b.enumValues(n -> n))
+ .type("AB", b -> b.typeResolver(it -> null))
+ .type("AC", b -> b.typeResolver(it -> null))
+ .scalar(
+ GraphQLScalarType
+ .newScalar()
+ .name("Duration")
+ .coercing(new Coercing() {})
+ .build()
+ )
+ .build();
+ }
+
+ /**
+ * Return a map of documentation key/values. The
+ * value is the same as the key for easy recognition.
+ */
+ static Map text() {
+ return Stream
+ .of(
+ "AB.description",
+ "AC.description.append",
+ "AType.description",
+ "AType.a.description",
+ "AType.b.deprecated",
+ "BType.description",
+ "BType.a.description",
+ "BType.a.deprecated",
+ "CType.description.append",
+ "CType.a.description.append",
+ "CType.b.deprecated.append",
+ "QueryType.findAB.description",
+ "QueryType.getAC.deprecated",
+ "AEnum.description",
+ "AEnum.E1.description",
+ "AEnum.E2.deprecated",
+ "AEnum.E3.deprecated",
+ "Duration.description",
+ "InputType.description",
+ "InputType.a.description",
+ "InputType.b.deprecated",
+ "InputType.c.deprecated"
+ )
+ .collect(Collectors.toMap(e -> e, e -> e));
+ }
+
+ @Test
+ void test() {
+ Map texts = text();
+ var customDocumentation = new CustomDocumentation(texts);
+ var visitor = new InjectCustomDocumentation(customDocumentation);
+ var newSchema = SchemaTransformer.transformSchema(schema, visitor);
+ var p = new SchemaPrinter();
+ var result = p.print(newSchema);
+
+ var missingValues = texts
+ .values()
+ .stream()
+ .sorted()
+ .filter(it -> !result.contains(it))
+ .toList();
+
+ // There is a bug in the Java GraphQL API, existing deprecated
+ // doc is not updated or replaced.
+ var expected = List.of(
+ "AEnum.E3.deprecated",
+ "BType.a.deprecated",
+ "CType.b.deprecated.append",
+ "InputType.c.deprecated"
+ );
+
+ assertEquals(expected, missingValues);
+
+ TextAssertions.assertLinesEquals(sdlExpected, result);
+ }
+
+ @SuppressWarnings("DataFlowIssue")
+ String loadSchemaResource(String suffix) throws IOException {
+ var cl = getClass();
+ var name = cl.getName().replace('.', '/') + suffix;
+ return new String(
+ ClassLoader.getSystemResourceAsStream(name).readAllBytes(),
+ StandardCharsets.UTF_8
+ );
+ }
+}
diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaTest.java
index 4cdb0586aa7..3fc33081cda 100644
--- a/application/src/test/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaTest.java
+++ b/application/src/test/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaTest.java
@@ -9,6 +9,7 @@
import java.io.File;
import org.junit.jupiter.api.Test;
import org.opentripplanner._support.time.ZoneIds;
+import org.opentripplanner.apis.support.graphql.injectdoc.ApiDocumentationProfile;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitTuningParameters;
import org.opentripplanner.routing.api.request.RouteRequest;
@@ -23,6 +24,7 @@ void testSchemaBuild() {
var schema = TransmodelGraphQLSchema.create(
new RouteRequest(),
ZoneIds.OSLO,
+ ApiDocumentationProfile.DEFAULT,
TransitTuningParameters.FOR_TEST
);
assertNotNull(schema);
diff --git a/application/src/test/java/org/opentripplanner/ext/transmodelapi/_support/TestDataFetcherDecorator.java b/application/src/test/java/org/opentripplanner/apis/transmodel/_support/TestDataFetcherDecorator.java
similarity index 100%
rename from application/src/test/java/org/opentripplanner/ext/transmodelapi/_support/TestDataFetcherDecorator.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/_support/TestDataFetcherDecorator.java
diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java
index 3d834fced58..9090cd1bdc5 100644
--- a/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java
+++ b/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java
@@ -1,14 +1,23 @@
package org.opentripplanner.apis.transmodel.model;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opentripplanner.apis.transmodel.model.EnumTypes.RELATIVE_DIRECTION;
import static org.opentripplanner.apis.transmodel.model.EnumTypes.ROUTING_ERROR_CODE;
import static org.opentripplanner.apis.transmodel.model.EnumTypes.map;
+import graphql.GraphQLContext;
import java.util.EnumSet;
import java.util.List;
+import java.util.Locale;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.opentripplanner.apis.transmodel.mapping.RelativeDirectionMapper;
import org.opentripplanner.framework.doc.DocumentedEnum;
+import org.opentripplanner.model.plan.RelativeDirection;
import org.opentripplanner.routing.api.response.RoutingErrorCode;
class EnumTypesTest {
@@ -75,6 +84,18 @@ void testMap() {
assertEquals("DocumentedEnumMapping[apiName=iH, internal=Hi]", mapping.toString());
}
+ @ParameterizedTest
+ @EnumSource(RelativeDirection.class)
+ void serializeRelativeDirection(RelativeDirection direction) {
+ var value = RELATIVE_DIRECTION.serialize(
+ RelativeDirectionMapper.map(direction),
+ GraphQLContext.getDefault(),
+ Locale.ENGLISH
+ );
+ assertInstanceOf(String.class, value);
+ assertNotNull(value);
+ }
+
@Test
void assertAllRoutingErrorCodesAreMapped() {
var expected = EnumSet.allOf(RoutingErrorCode.class);
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java
index c55e482e533..a4d5e86ced8 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java
@@ -2,18 +2,27 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
+import org.opentripplanner.framework.i18n.I18NString;
import org.opentripplanner.framework.i18n.NonLocalizedString;
import org.opentripplanner.graph_builder.module.osm.OsmModule;
import org.opentripplanner.osm.OsmProvider;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildService;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.street.model.edge.AreaEdge;
import org.opentripplanner.street.model.edge.BoardingLocationToStopLink;
@@ -32,25 +41,11 @@
import org.opentripplanner.transit.service.SiteRepository;
import org.opentripplanner.transit.service.TimetableRepository;
-/**
- * We test that the platform area at Herrenberg station (https://www.openstreetmap.org/way/27558650)
- * is correctly linked to the stop even though it is not the closest edge to the stop.
- */
class OsmBoardingLocationsModuleTest {
private final TimetableRepositoryForTest testModel = TimetableRepositoryForTest.of();
- File file = ResourceLoader
- .of(OsmBoardingLocationsModuleTest.class)
- .file("herrenberg-minimal.osm.pbf");
- RegularStop platform = testModel
- .stop("de:08115:4512:4:101")
- .withCoordinate(48.59328, 8.86128)
- .build();
- RegularStop busStop = testModel.stop("de:08115:4512:5:C", 48.59434, 8.86452).build();
- RegularStop floatingBusStop = testModel.stop("floating-bus-stop", 48.59417, 8.86464).build();
-
- static Stream testCases() {
+ static Stream herrenbergTestCases() {
return Stream.of(
Arguments.of(
false,
@@ -63,11 +58,25 @@ static Stream testCases() {
);
}
+ /**
+ * We test that the platform area at Herrenberg station (https://www.openstreetmap.org/way/27558650)
+ * is correctly linked to the stop even though it is not the closest edge to the stop.
+ */
@ParameterizedTest(
name = "add boarding locations and link them to platform edges when skipVisibility={0}"
)
- @MethodSource("testCases")
+ @MethodSource("herrenbergTestCases")
void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVertices) {
+ File file = ResourceLoader
+ .of(OsmBoardingLocationsModuleTest.class)
+ .file("herrenberg-minimal.osm.pbf");
+ RegularStop platform = testModel
+ .stop("de:08115:4512:4:101")
+ .withCoordinate(48.59328, 8.86128)
+ .build();
+ RegularStop busStop = testModel.stop("de:08115:4512:5:C", 48.59434, 8.86452).build();
+ RegularStop floatingBusStop = testModel.stop("floating-bus-stop", 48.59417, 8.86464).build();
+
var deduplicator = new Deduplicator();
var graph = new Graph(deduplicator);
var timetableRepository = new TimetableRepository(new SiteRepository(), deduplicator);
@@ -83,8 +92,10 @@ void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVerti
Set.of(floatingBusVertex.getStop().getId().getId()),
new NonLocalizedString("bus stop not connected to street network")
);
+ var osmInfoRepository = new DefaultOsmInfoGraphBuildRepository();
+ var vehicleParkingRepository = new DefaultVehicleParkingRepository();
var osmModule = OsmModule
- .of(provider, graph, new DefaultVehicleParkingRepository())
+ .of(provider, graph, osmInfoRepository, vehicleParkingRepository)
.withBoardingAreaRefTags(Set.of("ref", "ref:IFOPT"))
.withAreaVisibility(areaVisibility)
.build();
@@ -107,7 +118,8 @@ void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVerti
assertEquals(0, platformVertex.getIncoming().size());
assertEquals(0, platformVertex.getOutgoing().size());
- new OsmBoardingLocationsModule(graph, timetableRepository).buildGraph();
+ var osmService = new DefaultOsmInfoGraphBuildService(osmInfoRepository);
+ new OsmBoardingLocationsModule(graph, osmService, timetableRepository).buildGraph();
var boardingLocations = graph.getVerticesOfType(OsmBoardingLocationVertex.class);
assertEquals(5, boardingLocations.size()); // 3 nodes connected to the street network, plus one "floating" and one area centroid created by the module
@@ -141,13 +153,13 @@ void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVerti
assertEquals(1, platformCentroids.size());
- var platform = platformCentroids.get(0);
+ var platformCentroid = platformCentroids.get(0);
- assertConnections(platform, Set.of(BoardingLocationToStopLink.class, AreaEdge.class));
+ assertConnections(platformCentroid, Set.of(BoardingLocationToStopLink.class, AreaEdge.class));
assertEquals(
linkedVertices,
- platform
+ platformCentroid
.getOutgoingStreetEdges()
.stream()
.map(Edge::getToVertex)
@@ -157,7 +169,7 @@ void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVerti
assertEquals(
linkedVertices,
- platform
+ platformCentroid
.getIncomingStreetEdges()
.stream()
.map(Edge::getFromVertex)
@@ -177,6 +189,201 @@ void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVerti
.forEach(e -> assertEquals("Platform 101;102", e.getName().toString()));
}
+ /**
+ * We test that the underground platforms at Moorgate station (https://www.openstreetmap.org/way/1328222021)
+ * is correctly linked to the stop even though it is not the closest edge to the stop.
+ */
+ @Test
+ void testLinearPlatforms() {
+ var deduplicator = new Deduplicator();
+ var graph = new Graph(deduplicator);
+ var osmInfoRepository = new DefaultOsmInfoGraphBuildRepository();
+ var osmModule = OsmModule
+ .of(
+ new OsmProvider(
+ ResourceLoader.of(OsmBoardingLocationsModuleTest.class).file("moorgate.osm.pbf"),
+ false
+ ),
+ graph,
+ osmInfoRepository,
+ new DefaultVehicleParkingRepository()
+ )
+ .withBoardingAreaRefTags(Set.of("naptan:AtcoCode"))
+ .build();
+ osmModule.buildGraph();
+
+ var factory = new VertexFactory(graph);
+
+ class TestCase {
+
+ /**
+ * The linear platform to be tested
+ */
+ public final RegularStop platform;
+
+ /**
+ * The label of a vertex where the centroid should be connected to
+ */
+ public final VertexLabel beginLabel;
+
+ /**
+ * The label of the other vertex where the centroid should be connected to
+ */
+ public final VertexLabel endLabel;
+
+ private TransitStopVertex platformVertex = null;
+
+ public TestCase(RegularStop platform, VertexLabel beginLabel, VertexLabel endLabel) {
+ this.platform = platform;
+ this.beginLabel = beginLabel;
+ this.endLabel = endLabel;
+ }
+
+ /**
+ * Get a TransitStopVertex for the platform in the graph. It is made and added to the graph
+ * on the first call.
+ */
+ TransitStopVertex getPlatformVertex() {
+ if (platformVertex == null) {
+ platformVertex = factory.transitStop(TransitStopVertex.of().withStop(platform));
+ }
+ return platformVertex;
+ }
+ }
+
+ var testCases = List.of(
+ new TestCase(
+ testModel
+ .stop("9100MRGT9")
+ .withName(I18NString.of("Moorgate (Platform 9)"))
+ .withCoordinate(51.51922107872304, -0.08767468698832413)
+ .withPlatformCode("9")
+ .build(),
+ VertexLabel.osm(12288669589L),
+ VertexLabel.osm(12288675219L)
+ ),
+ new TestCase(
+ testModel
+ .stop("9400ZZLUMGT3")
+ .withName(I18NString.of("Moorgate (Platform 7)"))
+ .withCoordinate(51.51919235051611, -0.08769925990953176)
+ .withPlatformCode("7")
+ .build(),
+ VertexLabel.osm(12288669575L),
+ VertexLabel.osm(12288675230L)
+ )
+ );
+
+ for (var testCase : testCases) {
+ // test that the platforms are not connected
+ var platformVertex = testCase.getPlatformVertex();
+ assertEquals(0, platformVertex.getIncoming().size());
+ assertEquals(0, platformVertex.getOutgoing().size());
+
+ // test that the vertices to be connected by the centroid are currently connected
+ var fromVertex = Objects.requireNonNull(graph.getVertex(testCase.beginLabel));
+ var toVertex = Objects.requireNonNull(graph.getVertex(testCase.endLabel));
+ assertTrue(
+ getEdge(fromVertex, toVertex).isPresent(),
+ "malformed test: the vertices where the centroid is supposed to be located between aren't connected"
+ );
+ assertTrue(
+ getEdge(toVertex, fromVertex).isPresent(),
+ "malformed test: the vertices where the centroid is supposed to be located between aren't connected"
+ );
+ }
+
+ var timetableRepository = new TimetableRepository(new SiteRepository(), deduplicator);
+ new OsmBoardingLocationsModule(
+ graph,
+ new DefaultOsmInfoGraphBuildService(osmInfoRepository),
+ timetableRepository
+ )
+ .buildGraph();
+
+ var boardingLocations = graph.getVerticesOfType(OsmBoardingLocationVertex.class);
+
+ for (var testCase : testCases) {
+ var platformVertex = testCase.getPlatformVertex();
+ var fromVertex = Objects.requireNonNull(graph.getVertex(testCase.beginLabel));
+ var toVertex = Objects.requireNonNull(graph.getVertex(testCase.endLabel));
+
+ var centroid = boardingLocations
+ .stream()
+ .filter(b -> b.references.contains(testCase.platform.getId().getId()))
+ .findFirst()
+ .orElseThrow();
+
+ // TODO: we should ideally place the centroid vertex directly on the platform by splitting
+ // the platform edge, but it is too difficult to touch the splitter code to use a given
+ // centroid vertex instead of a generated split vertex, so what we actually do is to directly
+ // connect the platform vertex to the split vertex
+
+ // the actual centroid isn't used
+ assertEquals(0, centroid.getDegreeIn());
+ assertEquals(0, centroid.getDegreeOut());
+
+ for (var vertex : platformVertex.getIncoming()) {
+ assertSplitVertex(vertex.getFromVertex(), centroid, fromVertex, toVertex);
+ }
+
+ for (var vertex : platformVertex.getOutgoing()) {
+ assertSplitVertex(vertex.getToVertex(), centroid, fromVertex, toVertex);
+ }
+ }
+ }
+
+ /**
+ * Assert that a split vertex is near to the given centroid, and it is possible to travel between
+ * the original vertices through the split vertex in a straight line
+ */
+ private static void assertSplitVertex(
+ Vertex splitVertex,
+ OsmBoardingLocationVertex centroid,
+ Vertex begin,
+ Vertex end
+ ) {
+ var distance = SphericalDistanceLibrary.distance(
+ splitVertex.getCoordinate(),
+ centroid.getCoordinate()
+ );
+ // FIXME: I am not sure why the calculated centroid from the original OSM geometry is about 2 m
+ // from the platform
+ assertTrue(distance < 4, "The split vertex is more than 4 m apart from the centroid");
+ assertConnections(splitVertex, begin, end);
+
+ if (splitVertex != begin && splitVertex != end) {
+ var forwardEdges = getEdge(begin, splitVertex)
+ .flatMap(first -> getEdge(splitVertex, end).map(second -> List.of(first, second)));
+ var backwardEdges = getEdge(end, splitVertex)
+ .flatMap(first -> getEdge(splitVertex, begin).map(second -> List.of(first, second)));
+ for (var edgeList : List.of(forwardEdges, backwardEdges)) {
+ edgeList.ifPresent(edges ->
+ assertEquals(
+ edges.getFirst().getOutAngle(),
+ edges.getLast().getInAngle(),
+ "The split vertex is not on a straight line between the connected vertices"
+ )
+ );
+ }
+ }
+ }
+
+ /**
+ * Assert that there is a one-way path from the beginning through the given vertex to the end
+ * or vice versa.
+ */
+ private static void assertConnections(Vertex vertex, Vertex beginning, Vertex end) {
+ if (vertex == beginning || vertex == end) {
+ assertTrue(beginning.isConnected(end));
+ }
+
+ assertTrue(
+ (getEdge(beginning, vertex).isPresent() && getEdge(vertex, end).isPresent()) ||
+ (getEdge(end, vertex).isPresent() && getEdge(vertex, beginning).isPresent())
+ );
+ }
+
private void assertConnections(
OsmBoardingLocationVertex busBoardingLocation,
Set> expected
@@ -187,4 +394,12 @@ private void assertConnections(
assertEquals(expected, edges.stream().map(Edge::getClass).collect(Collectors.toSet()))
);
}
+
+ private static Optional getEdge(Vertex from, Vertex to) {
+ return from
+ .getOutgoingStreetEdges()
+ .stream()
+ .filter(edge -> edge.getToVertex() == to)
+ .findFirst();
+ }
}
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java
index d71a60a972e..8e5a455095b 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java
@@ -5,6 +5,7 @@
import org.opentripplanner.graph_builder.module.osm.OsmModule;
import org.opentripplanner.osm.OsmProvider;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.transit.model.framework.Deduplicator;
import org.opentripplanner.transit.service.SiteRepository;
@@ -24,9 +25,11 @@ static Graph buildOsmGraph(
var graph = new Graph(deduplicator);
var timetableRepository = new TimetableRepository(new SiteRepository(), deduplicator);
// Add street data from OSM
- OsmProvider osmProvider = new OsmProvider(osmFile, true);
- OsmModule osmModule = OsmModule
- .of(osmProvider, graph, new DefaultVehicleParkingRepository())
+ var osmProvider = new OsmProvider(osmFile, true);
+ var osmInfoRepository = new DefaultOsmInfoGraphBuildRepository();
+ var vehicleParkingRepository = new DefaultVehicleParkingRepository();
+ var osmModule = OsmModule
+ .of(osmProvider, graph, osmInfoRepository, vehicleParkingRepository)
.withEdgeNamer(new TestNamer())
.build();
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/linking/LinkingTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/linking/LinkingTest.java
index a6afa89707f..6c51235e703 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/linking/LinkingTest.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/linking/LinkingTest.java
@@ -21,6 +21,7 @@
import org.opentripplanner.graph_builder.module.osm.OsmModule;
import org.opentripplanner.osm.OsmProvider;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.street.model.StreetTraversalPermission;
import org.opentripplanner.street.model._data.StreetModelForTest;
@@ -152,16 +153,20 @@ public void testStopsLinkedIdentically() {
public static TestOtpModel buildGraphNoTransit() {
var deduplicator = new Deduplicator();
var siteRepository = new SiteRepository();
- var gg = new Graph(deduplicator);
+ var graph = new Graph(deduplicator);
var timetableRepository = new TimetableRepository(siteRepository, deduplicator);
File file = ResourceLoader.of(LinkingTest.class).file("columbus.osm.pbf");
- OsmProvider provider = new OsmProvider(file, false);
+ var provider = new OsmProvider(file, false);
+ var osmInfoRepository = new DefaultOsmInfoGraphBuildRepository();
+ var vehicleParkingRepository = new DefaultVehicleParkingRepository();
- OsmModule osmModule = OsmModule.of(provider, gg, new DefaultVehicleParkingRepository()).build();
+ var osmModule = OsmModule
+ .of(provider, graph, osmInfoRepository, vehicleParkingRepository)
+ .build();
osmModule.buildGraph();
- return new TestOtpModel(gg, timetableRepository);
+ return new TestOtpModel(graph, timetableRepository);
}
private static List outgoingStls(final TransitStopVertex tsv) {
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java
index 833b14ade9d..6de345ddd9c 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java
@@ -32,6 +32,7 @@
import org.opentripplanner.routing.api.request.RouteRequest;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.impl.GraphPathFinder;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingService;
@@ -53,30 +54,35 @@ public class OsmModuleTest {
@Test
public void testGraphBuilder() {
var deduplicator = new Deduplicator();
- var gg = new Graph(deduplicator);
+ var graph = new Graph(deduplicator);
File file = RESOURCE_LOADER.file("map.osm.pbf");
OsmProvider provider = new OsmProvider(file, true);
OsmModule osmModule = OsmModule
- .of(provider, gg, new DefaultVehicleParkingRepository())
+ .of(
+ provider,
+ graph,
+ new DefaultOsmInfoGraphBuildRepository(),
+ new DefaultVehicleParkingRepository()
+ )
.withAreaVisibility(true)
.build();
osmModule.buildGraph();
// Kamiennogorska at south end of segment
- Vertex v1 = gg.getVertex(VertexLabel.osm(280592578));
+ Vertex v1 = graph.getVertex(VertexLabel.osm(280592578));
// Kamiennogorska at Mariana Smoluchowskiego
- Vertex v2 = gg.getVertex(VertexLabel.osm(288969929));
+ Vertex v2 = graph.getVertex(VertexLabel.osm(288969929));
// Mariana Smoluchowskiego, north end
- Vertex v3 = gg.getVertex(VertexLabel.osm(280107802));
+ Vertex v3 = graph.getVertex(VertexLabel.osm(280107802));
// Mariana Smoluchowskiego, south end (of segment connected to v2)
- Vertex v4 = gg.getVertex(VertexLabel.osm(288970952));
+ Vertex v4 = graph.getVertex(VertexLabel.osm(288970952));
assertNotNull(v1);
assertNotNull(v2);
@@ -117,9 +123,11 @@ public void testBuildGraphDetailed() {
var gg = new Graph(deduplicator);
File file = RESOURCE_LOADER.file("NYC_small.osm.pbf");
- OsmProvider provider = new OsmProvider(file, true);
- OsmModule osmModule = OsmModule
- .of(provider, gg, new DefaultVehicleParkingRepository())
+ var provider = new OsmProvider(file, true);
+ var osmInfoRepository = new DefaultOsmInfoGraphBuildRepository();
+ var vehicleParkingRepository = new DefaultVehicleParkingRepository();
+ var osmModule = OsmModule
+ .of(provider, gg, osmInfoRepository, vehicleParkingRepository)
.withAreaVisibility(true)
.build();
@@ -315,7 +323,14 @@ void testBarrierAtEnd() {
File file = RESOURCE_LOADER.file("accessno-at-end.pbf");
OsmProvider provider = new OsmProvider(file, false);
- OsmModule loader = OsmModule.of(provider, graph, new DefaultVehicleParkingRepository()).build();
+ OsmModule loader = OsmModule
+ .of(
+ provider,
+ graph,
+ new DefaultOsmInfoGraphBuildRepository(),
+ new DefaultVehicleParkingRepository()
+ )
+ .build();
loader.buildGraph();
Vertex start = graph.getVertex(VertexLabel.osm(1));
@@ -339,7 +354,7 @@ private BuildResult buildParkingLots() {
.map(f -> new OsmProvider(f, false))
.toList();
var module = OsmModule
- .of(providers, graph, service)
+ .of(providers, graph, new DefaultOsmInfoGraphBuildRepository(), service)
.withStaticParkAndRide(true)
.withStaticBikeParkAndRide(true)
.build();
@@ -363,10 +378,12 @@ private void testBuildingAreas(boolean skipVisibility) {
var graph = new Graph(deduplicator);
File file = RESOURCE_LOADER.file("usf_area.osm.pbf");
- OsmProvider provider = new OsmProvider(file, false);
+ var provider = new OsmProvider(file, false);
+ var osmInfoRepository = new DefaultOsmInfoGraphBuildRepository();
+ var vehicleParkingRepository = new DefaultVehicleParkingRepository();
- OsmModule loader = OsmModule
- .of(provider, graph, new DefaultVehicleParkingRepository())
+ var loader = OsmModule
+ .of(provider, graph, osmInfoRepository, vehicleParkingRepository)
.withAreaVisibility(!skipVisibility)
.build();
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/PlatformLinkerTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/PlatformLinkerTest.java
index f952bf90710..97ccbdd7719 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/PlatformLinkerTest.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/PlatformLinkerTest.java
@@ -6,6 +6,7 @@
import org.junit.jupiter.api.Test;
import org.opentripplanner.osm.OsmProvider;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.street.model.edge.AreaEdge;
import org.opentripplanner.street.model.vertex.Vertex;
@@ -24,20 +25,25 @@ public void testLinkEntriesToPlatforms() {
var stairsEndpointLabel = VertexLabel.osm(1028861028);
var deduplicator = new Deduplicator();
- var gg = new Graph(deduplicator);
+ var graph = new Graph(deduplicator);
File file = ResourceLoader.of(this).file("skoyen.osm.pbf");
OsmProvider provider = new OsmProvider(file, false);
OsmModule osmModule = OsmModule
- .of(provider, gg, new DefaultVehicleParkingRepository())
+ .of(
+ provider,
+ graph,
+ new DefaultOsmInfoGraphBuildRepository(),
+ new DefaultVehicleParkingRepository()
+ )
.withPlatformEntriesLinking(true)
.build();
osmModule.buildGraph();
- Vertex stairsEndpoint = gg.getVertex(stairsEndpointLabel);
+ Vertex stairsEndpoint = graph.getVertex(stairsEndpointLabel);
// verify outgoing links
assertTrue(stairsEndpoint.getOutgoing().stream().anyMatch(AreaEdge.class::isInstance));
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java
index ffc1f661dcc..1b8f7c9c58a 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java
@@ -21,6 +21,7 @@
import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter;
import org.opentripplanner.routing.api.request.request.filter.TransitFilter;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.street.model.edge.Edge;
import org.opentripplanner.street.model.vertex.Vertex;
@@ -52,7 +53,12 @@ public static void onlyOnce() {
File file = ResourceLoader.of(TriangleInequalityTest.class).file("NYC_small.osm.pbf");
OsmProvider provider = new OsmProvider(file, true);
OsmModule osmModule = OsmModule
- .of(provider, graph, new DefaultVehicleParkingRepository())
+ .of(
+ provider,
+ graph,
+ new DefaultOsmInfoGraphBuildRepository(),
+ new DefaultVehicleParkingRepository()
+ )
.withAreaVisibility(true)
.build();
osmModule.buildGraph();
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java
index 103dafa61b9..22b486d7cd6 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java
@@ -13,6 +13,7 @@
import org.opentripplanner.graph_builder.module.TestStreetLinkerModule;
import org.opentripplanner.osm.OsmProvider;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.street.model.edge.StreetVehicleParkingLink;
import org.opentripplanner.street.model.edge.VehicleParkingEdge;
@@ -163,7 +164,12 @@ private Graph buildOsmGraph(String osmFileName, DataImportIssueStore issueStore)
var timetableRepository = new TimetableRepository(siteRepository, deduplicator);
OsmProvider provider = new OsmProvider(RESOURCE_LOADER.file(osmFileName), false);
OsmModule loader = OsmModule
- .of(provider, graph, new DefaultVehicleParkingRepository())
+ .of(
+ provider,
+ graph,
+ new DefaultOsmInfoGraphBuildRepository(),
+ new DefaultVehicleParkingRepository()
+ )
.withIssueStore(issueStore)
.withAreaVisibility(true)
.withStaticParkAndRide(true)
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnroutableTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnroutableTest.java
index 138c3e67181..835c5a7fbcb 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnroutableTest.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnroutableTest.java
@@ -10,6 +10,7 @@
import org.opentripplanner.routing.api.request.RouteRequest;
import org.opentripplanner.routing.api.request.StreetMode;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.street.model.edge.Edge;
import org.opentripplanner.street.model.vertex.Vertex;
@@ -39,7 +40,12 @@ public void setUp() throws Exception {
var osmDataFile = ResourceLoader.of(UnroutableTest.class).file("bridge_construction.osm.pbf");
OsmProvider provider = new OsmProvider(osmDataFile, true);
OsmModule osmBuilder = OsmModule
- .of(provider, graph, new DefaultVehicleParkingRepository())
+ .of(
+ provider,
+ graph,
+ new DefaultOsmInfoGraphBuildRepository(),
+ new DefaultVehicleParkingRepository()
+ )
.withAreaVisibility(true)
.build();
osmBuilder.buildGraph();
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilderTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilderTest.java
index b712ee48c5a..1516c9df91a 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilderTest.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilderTest.java
@@ -48,7 +48,7 @@ public Graph buildGraph(final TestInfo testInfo) {
final WalkableAreaBuilder walkableAreaBuilder = new WalkableAreaBuilder(
graph,
osmdb,
- new VertexGenerator(osmdb, graph, Set.of()),
+ new VertexGenerator(osmdb, graph, Set.of(), false),
new DefaultNamer(),
new SafetyValueNormalizer(graph, DataImportIssueStore.NOOP),
DataImportIssueStore.NOOP,
diff --git a/application/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilderTest.java b/application/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilderTest.java
index 8d3d6ed7c1e..c8ae617fd20 100644
--- a/application/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilderTest.java
+++ b/application/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilderTest.java
@@ -1,15 +1,24 @@
package org.opentripplanner.model.plan;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
import java.time.LocalDate;
+import java.util.Set;
import org.junit.jupiter.api.Test;
import org.opentripplanner._support.time.ZoneIds;
+import org.opentripplanner.framework.i18n.I18NString;
+import org.opentripplanner.routing.alertpatch.TransitAlert;
import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
import org.opentripplanner.transit.model.basic.TransitMode;
class ScheduledTransitLegBuilderTest {
+ private static final TransitAlert ALERT = TransitAlert
+ .of(id("alert"))
+ .withDescriptionText(I18NString.of("alert"))
+ .build();
+
@Test
void transferZoneId() {
var pattern = TimetableRepositoryForTest.of().pattern(TransitMode.BUS).build();
@@ -28,4 +37,24 @@ void transferZoneId() {
assertEquals(ZoneIds.BERLIN, withScore.getZoneId());
}
+
+ @Test
+ void alerts() {
+ var pattern = TimetableRepositoryForTest.of().pattern(TransitMode.BUS).build();
+ var leg = new ScheduledTransitLegBuilder<>()
+ .withZoneId(ZoneIds.BERLIN)
+ .withServiceDate(LocalDate.of(2023, 11, 15))
+ .withTripPattern(pattern)
+ .withBoardStopIndexInPattern(0)
+ .withAlightStopIndexInPattern(1)
+ .build();
+
+ leg.addAlert(ALERT);
+
+ var newLeg = new ScheduledTransitLegBuilder<>(leg);
+
+ var withScore = newLeg.withAccessibilityScore(4f).build();
+
+ assertEquals(Set.of(ALERT), withScore.getTransitAlerts());
+ }
}
diff --git a/application/src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java b/application/src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java
index 84b74b8f655..597593f7333 100644
--- a/application/src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java
+++ b/application/src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java
@@ -17,6 +17,7 @@
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.opentripplanner.osm.wayproperty.specifier.WayTestData;
+import org.opentripplanner.transit.model.basic.Accessibility;
public class OsmWithTagsTest {
@@ -215,6 +216,20 @@ void isWheelchairAccessible() {
assertTrue(osm3.isWheelchairAccessible());
}
+ @Test
+ void wheelchairAccessibility() {
+ var osm1 = new OsmWithTags();
+ assertEquals(Accessibility.NO_INFORMATION, osm1.wheelchairAccessibility());
+
+ var osm2 = new OsmWithTags();
+ osm2.addTag("wheelchair", "no");
+ assertEquals(Accessibility.NOT_POSSIBLE, osm2.wheelchairAccessibility());
+
+ var osm3 = new OsmWithTags();
+ osm3.addTag("wheelchair", "yes");
+ assertEquals(Accessibility.POSSIBLE, osm3.wheelchairAccessibility());
+ }
+
@Test
void isRoutable() {
assertFalse(WayTestData.zooPlatform().isRoutable());
diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java
index de9fe21718a..a2bb428a78c 100644
--- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java
+++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java
@@ -13,6 +13,7 @@
import org.opentripplanner.model.plan.WalkStep;
import org.opentripplanner.routing.services.notes.StreetNotesService;
import org.opentripplanner.street.search.state.TestStateBuilder;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
class StatesToWalkStepsMapperTest {
@@ -42,6 +43,7 @@ void enterStation() {
var walkSteps = buildWalkSteps(builder);
assertEquals(2, walkSteps.size());
var enter = walkSteps.get(1);
+ assertEquals(new FeedScopedId("F", "Lichterfelde-Ost"), enter.entrance().get().getId());
assertEquals(ENTER_STATION, enter.getRelativeDirection());
}
@@ -53,8 +55,9 @@ void exitStation() {
.exitStation("Lichterfelde-Ost");
var walkSteps = buildWalkSteps(builder);
assertEquals(3, walkSteps.size());
- var enter = walkSteps.get(2);
- assertEquals(EXIT_STATION, enter.getRelativeDirection());
+ var exit = walkSteps.get(2);
+ assertEquals(new FeedScopedId("F", "Lichterfelde-Ost"), exit.entrance().get().getId());
+ assertEquals(EXIT_STATION, exit.getRelativeDirection());
}
@Test
diff --git a/application/src/test/java/org/opentripplanner/routing/core/MoneyTest.java b/application/src/test/java/org/opentripplanner/routing/core/MoneyTest.java
index 4fdb74d5340..fdfa71c222b 100644
--- a/application/src/test/java/org/opentripplanner/routing/core/MoneyTest.java
+++ b/application/src/test/java/org/opentripplanner/routing/core/MoneyTest.java
@@ -11,6 +11,7 @@
import java.util.Currency;
import java.util.Locale;
import java.util.stream.Stream;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -39,6 +40,7 @@ static Stream testCases() {
);
}
+ @Disabled
@ParameterizedTest(name = "{0} with locale {1} should localise to \"{2}\"")
@MethodSource("testCases")
void localize(Money money, Locale locale, String expected) {
diff --git a/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java b/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java
index 400a9eba2ba..9ccd6177cfd 100644
--- a/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java
+++ b/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java
@@ -23,6 +23,8 @@
import org.opentripplanner.ext.emissions.EmissionsDataModel;
import org.opentripplanner.framework.geometry.HashGridSpatialIndex;
import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary;
+import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
+import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository;
@@ -67,11 +69,13 @@ public class GraphSerializationTest {
@Test
public void testRoundTripSerializationForGTFSGraph() throws Exception {
TestOtpModel model = ConstantsForTests.buildNewPortlandGraph(true);
+ var osmGraphBuildRepository = new DefaultOsmInfoGraphBuildRepository();
var weRepo = new DefaultWorldEnvelopeRepository();
var emissionsDataModel = new EmissionsDataModel();
var parkingRepository = new DefaultVehicleParkingRepository();
testRoundTrip(
model.graph(),
+ osmGraphBuildRepository,
model.timetableRepository(),
weRepo,
parkingRepository,
@@ -85,11 +89,13 @@ public void testRoundTripSerializationForGTFSGraph() throws Exception {
@Test
public void testRoundTripSerializationForNetexGraph() throws Exception {
TestOtpModel model = ConstantsForTests.buildNewMinimalNetexGraph();
+ var osmGraphBuildRepository = new DefaultOsmInfoGraphBuildRepository();
var worldEnvelopeRepository = new DefaultWorldEnvelopeRepository();
var emissionsDataModel = new EmissionsDataModel();
var parkingRepository = new DefaultVehicleParkingRepository();
testRoundTrip(
model.graph(),
+ osmGraphBuildRepository,
model.timetableRepository(),
worldEnvelopeRepository,
parkingRepository,
@@ -191,6 +197,7 @@ private static void assertNoDifferences(Graph g1, Graph g2) {
*/
private void testRoundTrip(
Graph originalGraph,
+ OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
TimetableRepository originalTimetableRepository,
WorldEnvelopeRepository worldEnvelopeRepository,
VehicleParkingRepository vehicleParkingRepository,
@@ -202,6 +209,7 @@ private void testRoundTrip(
streetLimitationParameters.initMaxCarSpeed(40);
SerializedGraphObject serializedObj = new SerializedGraphObject(
originalGraph,
+ osmInfoGraphBuildRepository,
originalTimetableRepository,
worldEnvelopeRepository,
vehicleParkingRepository,
diff --git a/application/src/test/java/org/opentripplanner/updater/spi/PollingGraphUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/spi/PollingGraphUpdaterTest.java
new file mode 100644
index 00000000000..6132988d92b
--- /dev/null
+++ b/application/src/test/java/org/opentripplanner/updater/spi/PollingGraphUpdaterTest.java
@@ -0,0 +1,78 @@
+package org.opentripplanner.updater.spi;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.framework.application.OTPFeature;
+import org.opentripplanner.updater.GraphWriterRunnable;
+
+public class PollingGraphUpdaterTest {
+
+ private static final PollingGraphUpdaterParameters config = new PollingGraphUpdaterParameters() {
+ @Override
+ public Duration frequency() {
+ return Duration.ZERO;
+ }
+
+ @Override
+ public String configRef() {
+ return "";
+ }
+ };
+
+ private static final PollingGraphUpdater subject = new PollingGraphUpdater(config) {
+ @Override
+ protected void runPolling() {}
+ };
+
+ private boolean updateCompleted;
+
+ @BeforeAll
+ static void beforeAll() {
+ subject.setup(runnable -> CompletableFuture.runAsync(() -> runnable.run(null)));
+ }
+
+ @BeforeEach
+ void setUp() {
+ updateCompleted = false;
+ }
+
+ private final GraphWriterRunnable graphWriterRunnable = context -> {
+ try {
+ Thread.sleep(100);
+ updateCompleted = true;
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ };
+
+ @Test
+ void testUpdateGraphWithWaitFeatureOn() {
+ OTPFeature.WaitForGraphUpdateInPollingUpdaters.testOn(() -> {
+ callUpdater();
+ assertTrue(updateCompleted);
+ });
+ }
+
+ @Test
+ void testProcessGraphUpdaterResultWithWaitFeatureOff() {
+ OTPFeature.WaitForGraphUpdateInPollingUpdaters.testOff(() -> {
+ callUpdater();
+ assertFalse(updateCompleted);
+ });
+ }
+
+ private void callUpdater() {
+ try {
+ subject.updateGraph(graphWriterRunnable);
+ } catch (ExecutionException | InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/walk-steps.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/walk-steps.json
index 49908207d44..95adec34ea8 100644
--- a/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/walk-steps.json
+++ b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/walk-steps.json
@@ -11,13 +11,27 @@
"streetName": "street",
"area": false,
"relativeDirection": "DEPART",
- "absoluteDirection": "NORTHEAST"
+ "absoluteDirection": "NORTHEAST",
+ "feature": null
},
{
"streetName": "elevator",
"area": false,
"relativeDirection": "ELEVATOR",
- "absoluteDirection": null
+ "absoluteDirection": null,
+ "feature": null
+ },
+ {
+ "streetName": "entrance",
+ "area": false,
+ "relativeDirection": "CONTINUE",
+ "absoluteDirection": null,
+ "feature": {
+ "__typename": "Entrance",
+ "publicCode": "A",
+ "entranceId": "osm:123",
+ "wheelchairAccessible": "POSSIBLE"
+ }
}
]
},
diff --git a/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql
index dd2b96395ad..18cb5a8d49d 100644
--- a/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql
+++ b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql
@@ -20,6 +20,14 @@
area
relativeDirection
absoluteDirection
+ feature {
+ __typename
+ ... on Entrance {
+ publicCode
+ entranceId
+ wheelchairAccessible
+ }
+ }
}
}
}
diff --git a/application/src/test/resources/org/opentripplanner/apis/support/graphql/injectdoc/InjectCustomDocumentationTest.graphql b/application/src/test/resources/org/opentripplanner/apis/support/graphql/injectdoc/InjectCustomDocumentationTest.graphql
new file mode 100644
index 00000000000..33deaa2a364
--- /dev/null
+++ b/application/src/test/resources/org/opentripplanner/apis/support/graphql/injectdoc/InjectCustomDocumentationTest.graphql
@@ -0,0 +1,54 @@
+schema {
+ query: QueryType
+}
+
+"REPLACE"
+union AB = AType | BType
+
+"APPEND TO"
+union AC = AType | BType
+
+# Add doc to an undocumented type
+type AType {
+ a: Duration
+ b: String
+}
+
+# Replace existing doc
+"REPLACE"
+type BType {
+ a: String @deprecated(reason: "REPLACE")
+}
+
+# Append doc to existing documentation
+"APPEND TO"
+type CType {
+ "APPENT TO"
+ a: Duration
+ b: String @deprecated(reason: "APPEND TO")
+}
+
+type QueryType {
+ # Add doc to method - args is currently not supported
+ findAB(args: InputType): AB
+ getAC: AC
+ listCs: CType
+ listEs: [AEnum]
+}
+
+# Add doc to enums
+enum AEnum {
+ E1
+ E2
+ E3 @deprecated(reason: "REPLACE")
+}
+
+# Add doc to scalar
+scalar Duration
+
+# Add doc to input type
+input InputType {
+ a: String
+ b: String
+ c: String @deprecated(reason: "REPLACE")
+}
diff --git a/application/src/test/resources/org/opentripplanner/apis/support/graphql/injectdoc/InjectCustomDocumentationTest.graphql.expected b/application/src/test/resources/org/opentripplanner/apis/support/graphql/injectdoc/InjectCustomDocumentationTest.graphql.expected
new file mode 100644
index 00000000000..47319e07ae0
--- /dev/null
+++ b/application/src/test/resources/org/opentripplanner/apis/support/graphql/injectdoc/InjectCustomDocumentationTest.graphql.expected
@@ -0,0 +1,95 @@
+schema {
+ query: QueryType
+}
+
+"Marks the field, argument, input field or enum value as deprecated"
+directive @deprecated(
+ "The reason for the deprecation"
+ reason: String = "No longer supported"
+ ) on FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM_VALUE | INPUT_FIELD_DEFINITION
+
+"Directs the executor to include this field or fragment only when the `if` argument is true"
+directive @include(
+ "Included when true."
+ if: Boolean!
+ ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+"Indicates an Input Object is a OneOf Input Object."
+directive @oneOf on INPUT_OBJECT
+
+"Directs the executor to skip this field or fragment when the `if` argument is true."
+directive @skip(
+ "Skipped when true."
+ if: Boolean!
+ ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+"Exposes a URL that specifies the behaviour of this scalar."
+directive @specifiedBy(
+ "The URL that specifies the behaviour of this scalar."
+ url: String!
+ ) on SCALAR
+
+"AB.description"
+union AB = AType | BType
+
+"""
+APPEND TO
+
+AC.description.append
+"""
+union AC = AType | BType
+
+"AType.description"
+type AType {
+ "AType.a.description"
+ a: Duration
+ b: String @deprecated(reason : "AType.b.deprecated")
+}
+
+"BType.description"
+type BType {
+ "BType.a.description"
+ a: String @deprecated(reason : "REPLACE")
+}
+
+"""
+APPEND TO
+
+CType.description.append
+"""
+type CType {
+ """
+ APPENT TO
+
+ CType.a.description.append
+ """
+ a: Duration
+ b: String @deprecated(reason : "APPEND TO")
+}
+
+type QueryType {
+ "QueryType.findAB.description"
+ findAB(args: InputType): AB
+ getAC: AC @deprecated(reason : "QueryType.getAC.deprecated")
+ listCs: CType
+ listEs: [AEnum]
+}
+
+"AEnum.description"
+enum AEnum {
+ "AEnum.E1.description"
+ E1
+ E2 @deprecated(reason : "AEnum.E2.deprecated")
+ E3 @deprecated(reason : "REPLACE")
+}
+
+"Duration.description"
+scalar Duration
+
+"InputType.description"
+input InputType {
+ "InputType.a.description"
+ a: String
+ b: String @deprecated(reason : "InputType.b.deprecated")
+ c: String @deprecated(reason : "REPLACE")
+}
diff --git a/application/src/test/resources/org/opentripplanner/graph_builder/module/moorgate.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/moorgate.osm.pbf
new file mode 100644
index 00000000000..ee95a0e7c51
Binary files /dev/null and b/application/src/test/resources/org/opentripplanner/graph_builder/module/moorgate.osm.pbf differ
diff --git a/client/package-lock.json b/client/package-lock.json
index a50d6d07f73..bb145274bd4 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -17,21 +17,21 @@
"react": "19.0.0",
"react-bootstrap": "2.10.7",
"react-dom": "19.0.0",
- "react-map-gl": "7.1.7"
+ "react-map-gl": "7.1.8"
},
"devDependencies": {
- "@eslint/compat": "1.2.4",
- "@eslint/js": "9.17.0",
+ "@eslint/compat": "1.2.5",
+ "@eslint/js": "9.18.0",
"@graphql-codegen/cli": "5.0.3",
"@graphql-codegen/client-preset": "4.5.1",
"@graphql-codegen/introspection": "4.0.3",
"@parcel/watcher": "2.5.0",
"@testing-library/react": "16.1.0",
- "@types/react": "19.0.1",
+ "@types/react": "19.0.4",
"@types/react-dom": "19.0.2",
"@vitejs/plugin-react": "4.3.4",
"@vitest/coverage-v8": "2.1.8",
- "eslint": "9.17.0",
+ "eslint": "9.18.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jsx-a11y": "6.10.2",
@@ -39,11 +39,11 @@
"eslint-plugin-react-hooks": "5.1.0",
"eslint-plugin-react-refresh": "0.4.16",
"globals": "15.14.0",
- "jsdom": "25.0.1",
+ "jsdom": "26.0.0",
"prettier": "3.4.2",
- "typescript": "5.7.2",
- "typescript-eslint": "8.19.0",
- "vite": "6.0.3",
+ "typescript": "5.7.3",
+ "typescript-eslint": "8.19.1",
+ "vite": "6.0.7",
"vitest": "2.1.8"
}
},
@@ -207,6 +207,30 @@
"node": ">=14"
}
},
+ "node_modules/@asamuzakjp/css-color": {
+ "version": "2.8.2",
+ "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-2.8.2.tgz",
+ "integrity": "sha512-RtWv9jFN2/bLExuZgFFZ0I3pWWeezAHGgrmjqGGWclATl1aDe3yhCUaI0Ilkp6OCk9zX7+FjvDasEX8Q9Rxc5w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@csstools/css-calc": "^2.1.1",
+ "@csstools/css-color-parser": "^3.0.7",
+ "@csstools/css-parser-algorithms": "^3.0.4",
+ "@csstools/css-tokenizer": "^3.0.3",
+ "lru-cache": "^11.0.2"
+ }
+ },
+ "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
+ "version": "11.0.2",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz",
+ "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": "20 || >=22"
+ }
+ },
"node_modules/@babel/code-frame": {
"version": "7.26.2",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
@@ -1007,6 +1031,121 @@
"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
"dev": true
},
+ "node_modules/@csstools/color-helpers": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.1.tgz",
+ "integrity": "sha512-MKtmkA0BX87PKaO1NFRTFH+UnkgnmySQOvNxJubsadusqPEC2aJ9MOQiMceZJJ6oitUl/i0L6u0M1IrmAOmgBA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/csstools"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ }
+ ],
+ "license": "MIT-0",
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@csstools/css-calc": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.1.tgz",
+ "integrity": "sha512-rL7kaUnTkL9K+Cvo2pnCieqNpTKgQzy5f+N+5Iuko9HAoasP+xgprVh7KN/MaJVvVL1l0EzQq2MoqBHKSrDrag==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/csstools"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ }
+ ],
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "peerDependencies": {
+ "@csstools/css-parser-algorithms": "^3.0.4",
+ "@csstools/css-tokenizer": "^3.0.3"
+ }
+ },
+ "node_modules/@csstools/css-color-parser": {
+ "version": "3.0.7",
+ "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.7.tgz",
+ "integrity": "sha512-nkMp2mTICw32uE5NN+EsJ4f5N+IGFeCFu4bGpiKgb2Pq/7J/MpyLBeQ5ry4KKtRFZaYs6sTmcMYrSRIyj5DFKA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/csstools"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "@csstools/color-helpers": "^5.0.1",
+ "@csstools/css-calc": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "peerDependencies": {
+ "@csstools/css-parser-algorithms": "^3.0.4",
+ "@csstools/css-tokenizer": "^3.0.3"
+ }
+ },
+ "node_modules/@csstools/css-parser-algorithms": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
+ "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/csstools"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ }
+ ],
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "peerDependencies": {
+ "@csstools/css-tokenizer": "^3.0.3"
+ }
+ },
+ "node_modules/@csstools/css-tokenizer": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
+ "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/csstools"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ }
+ ],
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/@envelop/core": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/@envelop/core/-/core-5.0.2.tgz",
@@ -1472,10 +1611,11 @@
}
},
"node_modules/@eslint/compat": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.2.4.tgz",
- "integrity": "sha512-S8ZdQj/N69YAtuqFt7653jwcvuUj131+6qGLUyDqfDg1OIoBQ66OCuXC473YQfO2AaxITTutiRQiDwoo7ZLYyg==",
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.2.5.tgz",
+ "integrity": "sha512-5iuG/StT+7OfvhoBHPlmxkPA9om6aDUFgmD4+mWKAGsYt4vCe8rypneG03AuseyRHBmcCLXQtIH5S26tIoggLg==",
"dev": true,
+ "license": "Apache-2.0",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
@@ -1503,10 +1643,11 @@
}
},
"node_modules/@eslint/core": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz",
- "integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==",
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
+ "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
"dev": true,
+ "license": "Apache-2.0",
"dependencies": {
"@types/json-schema": "^7.0.15"
},
@@ -1550,10 +1691,11 @@
}
},
"node_modules/@eslint/js": {
- "version": "9.17.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
- "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
+ "version": "9.18.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz",
+ "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
}
@@ -1568,11 +1710,13 @@
}
},
"node_modules/@eslint/plugin-kit": {
- "version": "0.2.4",
- "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz",
- "integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==",
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
+ "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
"dev": true,
+ "license": "Apache-2.0",
"dependencies": {
+ "@eslint/core": "^0.10.0",
"levn": "^0.4.1"
},
"engines": {
@@ -3736,9 +3880,10 @@
"integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ=="
},
"node_modules/@types/react": {
- "version": "19.0.1",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.1.tgz",
- "integrity": "sha512-YW6614BDhqbpR5KtUYzTA+zlA7nayzJRA9ljz9CQoxthR0sDisYZLuvSMsil36t4EH/uAt8T52Xb4sVw17G+SQ==",
+ "version": "19.0.4",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.4.tgz",
+ "integrity": "sha512-3O4QisJDYr1uTUMZHA2YswiQZRq+Pd8D+GdVFYikTutYsTz+QZgWkAPnP7rx9txoI6EXKcPiluMqWPFV3tT9Wg==",
+ "license": "MIT",
"dependencies": {
"csstype": "^3.0.2"
}
@@ -3783,20 +3928,21 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.0.tgz",
- "integrity": "sha512-NggSaEZCdSrFddbctrVjkVZvFC6KGfKfNK0CU7mNK/iKHGKbzT4Wmgm08dKpcZECBu9f5FypndoMyRHkdqfT1Q==",
+ "version": "8.19.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.1.tgz",
+ "integrity": "sha512-tJzcVyvvb9h/PB96g30MpxACd9IrunT7GF9wfA9/0TJ1LxGOJx1TdPzSbBBnNED7K9Ka8ybJsnEpiXPktolTLg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@eslint-community/regexpp": "^4.10.0",
- "@typescript-eslint/scope-manager": "8.19.0",
- "@typescript-eslint/type-utils": "8.19.0",
- "@typescript-eslint/utils": "8.19.0",
- "@typescript-eslint/visitor-keys": "8.19.0",
+ "@typescript-eslint/scope-manager": "8.19.1",
+ "@typescript-eslint/type-utils": "8.19.1",
+ "@typescript-eslint/utils": "8.19.1",
+ "@typescript-eslint/visitor-keys": "8.19.1",
"graphemer": "^1.4.0",
"ignore": "^5.3.1",
"natural-compare": "^1.4.0",
- "ts-api-utils": "^1.3.0"
+ "ts-api-utils": "^2.0.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3812,15 +3958,16 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.0.tgz",
- "integrity": "sha512-6M8taKyOETY1TKHp0x8ndycipTVgmp4xtg5QpEZzXxDhNvvHOJi5rLRkLr8SK3jTgD5l4fTlvBiRdfsuWydxBw==",
+ "version": "8.19.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.1.tgz",
+ "integrity": "sha512-67gbfv8rAwawjYx3fYArwldTQKoYfezNUT4D5ioWetr/xCrxXxvleo3uuiFuKfejipvq+og7mjz3b0G2bVyUCw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@typescript-eslint/scope-manager": "8.19.0",
- "@typescript-eslint/types": "8.19.0",
- "@typescript-eslint/typescript-estree": "8.19.0",
- "@typescript-eslint/visitor-keys": "8.19.0",
+ "@typescript-eslint/scope-manager": "8.19.1",
+ "@typescript-eslint/types": "8.19.1",
+ "@typescript-eslint/typescript-estree": "8.19.1",
+ "@typescript-eslint/visitor-keys": "8.19.1",
"debug": "^4.3.4"
},
"engines": {
@@ -3836,13 +3983,14 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz",
- "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==",
+ "version": "8.19.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.1.tgz",
+ "integrity": "sha512-60L9KIuN/xgmsINzonOcMDSB8p82h95hoBfSBtXuO4jlR1R9L1xSkmVZKgCPVfavDlXihh4ARNjXhh1gGnLC7Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.19.0",
- "@typescript-eslint/visitor-keys": "8.19.0"
+ "@typescript-eslint/types": "8.19.1",
+ "@typescript-eslint/visitor-keys": "8.19.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3853,15 +4001,16 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.0.tgz",
- "integrity": "sha512-TZs0I0OSbd5Aza4qAMpp1cdCYVnER94IziudE3JU328YUHgWu9gwiwhag+fuLeJ2LkWLXI+F/182TbG+JaBdTg==",
+ "version": "8.19.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.1.tgz",
+ "integrity": "sha512-Rp7k9lhDKBMRJB/nM9Ksp1zs4796wVNyihG9/TU9R6KCJDNkQbc2EOKjrBtLYh3396ZdpXLtr/MkaSEmNMtykw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@typescript-eslint/typescript-estree": "8.19.0",
- "@typescript-eslint/utils": "8.19.0",
+ "@typescript-eslint/typescript-estree": "8.19.1",
+ "@typescript-eslint/utils": "8.19.1",
"debug": "^4.3.4",
- "ts-api-utils": "^1.3.0"
+ "ts-api-utils": "^2.0.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3876,10 +4025,11 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
- "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
+ "version": "8.19.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.1.tgz",
+ "integrity": "sha512-JBVHMLj7B1K1v1051ZaMMgLW4Q/jre5qGK0Ew6UgXz1Rqh+/xPzV1aW581OM00X6iOfyr1be+QyW8LOUf19BbA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
@@ -3889,19 +4039,20 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz",
- "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==",
+ "version": "8.19.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.1.tgz",
+ "integrity": "sha512-jk/TZwSMJlxlNnqhy0Eod1PNEvCkpY6MXOXE/WLlblZ6ibb32i2We4uByoKPv1d0OD2xebDv4hbs3fm11SMw8Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.19.0",
- "@typescript-eslint/visitor-keys": "8.19.0",
+ "@typescript-eslint/types": "8.19.1",
+ "@typescript-eslint/visitor-keys": "8.19.1",
"debug": "^4.3.4",
"fast-glob": "^3.3.2",
"is-glob": "^4.0.3",
"minimatch": "^9.0.4",
"semver": "^7.6.0",
- "ts-api-utils": "^1.3.0"
+ "ts-api-utils": "^2.0.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3919,6 +4070,7 @@
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0"
}
@@ -3928,6 +4080,7 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
"dev": true,
+ "license": "ISC",
"dependencies": {
"brace-expansion": "^2.0.1"
},
@@ -3943,6 +4096,7 @@
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
"dev": true,
+ "license": "ISC",
"bin": {
"semver": "bin/semver.js"
},
@@ -3951,15 +4105,16 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz",
- "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==",
+ "version": "8.19.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.1.tgz",
+ "integrity": "sha512-IxG5gLO0Ne+KaUc8iW1A+XuKLd63o4wlbI1Zp692n1xojCl/THvgIKXJXBZixTh5dd5+yTJ/VXH7GJaaw21qXA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0",
- "@typescript-eslint/scope-manager": "8.19.0",
- "@typescript-eslint/types": "8.19.0",
- "@typescript-eslint/typescript-estree": "8.19.0"
+ "@typescript-eslint/scope-manager": "8.19.1",
+ "@typescript-eslint/types": "8.19.1",
+ "@typescript-eslint/typescript-estree": "8.19.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3974,12 +4129,13 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz",
- "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==",
+ "version": "8.19.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.1.tgz",
+ "integrity": "sha512-fzmjU8CHK853V/avYZAvuVut3ZTfwN5YtMaoi+X9Y9MA9keaWNHC3zEQ9zvyX/7Hj+5JkNyK1l7TOR2hevHB6Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.19.0",
+ "@typescript-eslint/types": "8.19.1",
"eslint-visitor-keys": "^4.2.0"
},
"engines": {
@@ -5178,12 +5334,14 @@
}
},
"node_modules/cssstyle": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.1.0.tgz",
- "integrity": "sha512-h66W1URKpBS5YMI/V8PyXvTMFT8SupJ1IzoIV8IeBC/ji8WVmrO8dGlTi+2dh6whmdk6BiKJLD/ZBkhWbcg6nA==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.2.1.tgz",
+ "integrity": "sha512-9+vem03dMXG7gDmZ62uqmRiMRNtinIZ9ZyuF6BdxzfOD+FdN5hretzynkn0ReS2DO2GSw76RWHs0UmJPI2zUjw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "rrweb-cssom": "^0.7.1"
+ "@asamuzakjp/css-color": "^2.8.2",
+ "rrweb-cssom": "^0.8.0"
},
"engines": {
"node": ">=18"
@@ -5774,18 +5932,19 @@
}
},
"node_modules/eslint": {
- "version": "9.17.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
- "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
+ "version": "9.18.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz",
+ "integrity": "sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.12.1",
"@eslint/config-array": "^0.19.0",
- "@eslint/core": "^0.9.0",
+ "@eslint/core": "^0.10.0",
"@eslint/eslintrc": "^3.2.0",
- "@eslint/js": "9.17.0",
- "@eslint/plugin-kit": "^0.2.3",
+ "@eslint/js": "9.18.0",
+ "@eslint/plugin-kit": "^0.2.5",
"@humanfs/node": "^0.16.6",
"@humanwhocodes/module-importer": "^1.0.1",
"@humanwhocodes/retry": "^0.4.1",
@@ -7761,22 +7920,23 @@
"integrity": "sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g=="
},
"node_modules/jsdom": {
- "version": "25.0.1",
- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-25.0.1.tgz",
- "integrity": "sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==",
+ "version": "26.0.0",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz",
+ "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "cssstyle": "^4.1.0",
+ "cssstyle": "^4.2.1",
"data-urls": "^5.0.0",
"decimal.js": "^10.4.3",
- "form-data": "^4.0.0",
+ "form-data": "^4.0.1",
"html-encoding-sniffer": "^4.0.0",
"http-proxy-agent": "^7.0.2",
- "https-proxy-agent": "^7.0.5",
+ "https-proxy-agent": "^7.0.6",
"is-potential-custom-element-name": "^1.0.1",
- "nwsapi": "^2.2.12",
- "parse5": "^7.1.2",
- "rrweb-cssom": "^0.7.1",
+ "nwsapi": "^2.2.16",
+ "parse5": "^7.2.1",
+ "rrweb-cssom": "^0.8.0",
"saxes": "^6.0.0",
"symbol-tree": "^3.2.4",
"tough-cookie": "^5.0.0",
@@ -7784,7 +7944,7 @@
"webidl-conversions": "^7.0.0",
"whatwg-encoding": "^3.1.1",
"whatwg-mimetype": "^4.0.0",
- "whatwg-url": "^14.0.0",
+ "whatwg-url": "^14.1.0",
"ws": "^8.18.0",
"xml-name-validator": "^5.0.0"
},
@@ -7792,7 +7952,7 @@
"node": ">=18"
},
"peerDependencies": {
- "canvas": "^2.11.2"
+ "canvas": "^3.0.0"
},
"peerDependenciesMeta": {
"canvas": {
@@ -9175,9 +9335,10 @@
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"node_modules/react-map-gl": {
- "version": "7.1.7",
- "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-7.1.7.tgz",
- "integrity": "sha512-mwjc0obkBJOXCcoXQr3VoLqmqwo9vS4bXfbGsdxXzEgVCv/PM0v+1QggL7W0d/ccIy+VCjbXNlGij+PENz6VNg==",
+ "version": "7.1.8",
+ "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-7.1.8.tgz",
+ "integrity": "sha512-zwF16XMOdOKH4py5ehS1bgQIChqW8UN3b1bXps+JnADbYLSbOoUPQ3tNw0EZ2OTBWArR5aaQlhlEqg4lE47T8A==",
+ "license": "MIT",
"dependencies": {
"@maplibre/maplibre-gl-style-spec": "^19.2.1",
"@types/mapbox-gl": ">=1.0.0"
@@ -9201,6 +9362,7 @@
"version": "19.3.3",
"resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz",
"integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==",
+ "license": "ISC",
"dependencies": {
"@mapbox/jsonlint-lines-primitives": "~2.0.2",
"@mapbox/unitbezier": "^0.0.1",
@@ -9218,7 +9380,8 @@
"node_modules/react-map-gl/node_modules/json-stringify-pretty-compact": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz",
- "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA=="
+ "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==",
+ "license": "MIT"
},
"node_modules/react-refresh": {
"version": "0.14.2",
@@ -9455,10 +9618,11 @@
}
},
"node_modules/rrweb-cssom": {
- "version": "0.7.1",
- "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz",
- "integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==",
- "dev": true
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
+ "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
+ "dev": true,
+ "license": "MIT"
},
"node_modules/run-async": {
"version": "2.4.1",
@@ -10386,15 +10550,16 @@
}
},
"node_modules/ts-api-utils": {
- "version": "1.4.3",
- "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
- "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
+ "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">=16"
+ "node": ">=18.12"
},
"peerDependencies": {
- "typescript": ">=4.2.0"
+ "typescript": ">=4.8.4"
}
},
"node_modules/ts-log": {
@@ -10531,10 +10696,11 @@
}
},
"node_modules/typescript": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
- "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
+ "version": "5.7.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
+ "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
"dev": true,
+ "license": "Apache-2.0",
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -10544,14 +10710,15 @@
}
},
"node_modules/typescript-eslint": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.19.0.tgz",
- "integrity": "sha512-Ni8sUkVWYK4KAcTtPjQ/UTiRk6jcsuDhPpxULapUDi8A/l8TSBk+t1GtJA1RsCzIJg0q6+J7bf35AwQigENWRQ==",
+ "version": "8.19.1",
+ "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.19.1.tgz",
+ "integrity": "sha512-LKPUQpdEMVOeKluHi8md7rwLcoXHhwvWp3x+sJkMuq3gGm9yaYJtPo8sRZSblMFJ5pcOGCAak/scKf1mvZDlQw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@typescript-eslint/eslint-plugin": "8.19.0",
- "@typescript-eslint/parser": "8.19.0",
- "@typescript-eslint/utils": "8.19.0"
+ "@typescript-eslint/eslint-plugin": "8.19.1",
+ "@typescript-eslint/parser": "8.19.1",
+ "@typescript-eslint/utils": "8.19.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -10756,12 +10923,13 @@
}
},
"node_modules/vite": {
- "version": "6.0.3",
- "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
- "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
+ "version": "6.0.7",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.7.tgz",
+ "integrity": "sha512-RDt8r/7qx9940f8FcOIAH9PTViRrghKaK2K1jY3RaAURrEUbm9Du1mJ72G+jlhtG3WwodnfzY8ORQZbBavZEAQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "esbuild": "^0.24.0",
+ "esbuild": "^0.24.2",
"postcss": "^8.4.49",
"rollup": "^4.23.0"
},
diff --git a/client/package.json b/client/package.json
index b16a1fe8527..78180de6b6a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -26,21 +26,21 @@
"react": "19.0.0",
"react-bootstrap": "2.10.7",
"react-dom": "19.0.0",
- "react-map-gl": "7.1.7"
+ "react-map-gl": "7.1.8"
},
"devDependencies": {
- "@eslint/compat": "1.2.4",
- "@eslint/js": "9.17.0",
+ "@eslint/compat": "1.2.5",
+ "@eslint/js": "9.18.0",
"@graphql-codegen/cli": "5.0.3",
"@graphql-codegen/client-preset": "4.5.1",
"@graphql-codegen/introspection": "4.0.3",
"@parcel/watcher": "2.5.0",
"@testing-library/react": "16.1.0",
- "@types/react": "19.0.1",
+ "@types/react": "19.0.4",
"@types/react-dom": "19.0.2",
"@vitejs/plugin-react": "4.3.4",
"@vitest/coverage-v8": "2.1.8",
- "eslint": "9.17.0",
+ "eslint": "9.18.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jsx-a11y": "6.10.2",
@@ -48,11 +48,11 @@
"eslint-plugin-react-hooks": "5.1.0",
"eslint-plugin-react-refresh": "0.4.16",
"globals": "15.14.0",
- "jsdom": "25.0.1",
+ "jsdom": "26.0.0",
"prettier": "3.4.2",
- "typescript": "5.7.2",
- "typescript-eslint": "8.19.0",
- "vite": "6.0.3",
+ "typescript": "5.7.3",
+ "typescript-eslint": "8.19.1",
+ "vite": "6.0.7",
"vitest": "2.1.8"
}
}
diff --git a/doc/user/BuildConfiguration.md b/doc/user/BuildConfiguration.md
index 99e98066e73..c5fdfa8095b 100644
--- a/doc/user/BuildConfiguration.md
+++ b/doc/user/BuildConfiguration.md
@@ -84,10 +84,12 @@ Sections follow that describe particular settings in more depth.
| [sharedGroupFilePattern](#nd_sharedGroupFilePattern) | `regexp` | Pattern for matching shared group NeTEx files in a NeTEx bundle. | *Optional* | `"(\w{3})-.*-shared\.xml"` | 2.0 |
| [ferryIdsNotAllowedForBicycle](#nd_ferryIdsNotAllowedForBicycle) | `string[]` | List ferries which do not allow bikes. | *Optional* | | 2.0 |
| [osm](#osm) | `object[]` | Configure properties for a given OpenStreetMap feed. | *Optional* | | 2.2 |
+| includeOsmSubwayEntrances | `boolean` | Whether to include subway entrances from the OSM data. Overrides the value specified in `osmDefaults`. | *Optional* | `false` | 2.7 |
| [osmTagMapping](#osm_0_osmTagMapping) | `enum` | The named set of mapping rules applied when parsing OSM tags. Overrides the value specified in `osmDefaults`. | *Optional* | `"default"` | 2.2 |
| source | `uri` | The unique URI pointing to the data file. | *Required* | | 2.2 |
| timeZone | `time-zone` | The timezone used to resolve opening hours in OSM data. Overrides the value specified in `osmDefaults`. | *Optional* | | 2.2 |
| osmDefaults | `object` | Default properties for OpenStreetMap feeds. | *Optional* | | 2.2 |
+| includeOsmSubwayEntrances | `boolean` | Whether to include subway entrances from the OSM data. | *Optional* | `false` | 2.7 |
| [osmTagMapping](#od_osmTagMapping) | `enum` | The named set of mapping rules applied when parsing OSM tags. | *Optional* | `"default"` | 2.2 |
| timeZone | `time-zone` | The timezone used to resolve opening hours in OSM data. | *Optional* | | 2.2 |
| [transferRequests](RouteRequest.md) | `object[]` | Routing requests to use for pre-calculating stop-to-stop transfers. | *Optional* | | 2.1 |
diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md
index b859f87f19a..a01ad18a8fb 100644
--- a/doc/user/Changelog.md
+++ b/doc/user/Changelog.md
@@ -70,6 +70,12 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
- Add fallback name for corridors [#6303](https://github.com/opentripplanner/OpenTripPlanner/pull/6303)
- Implement SIRI Lite [#6284](https://github.com/opentripplanner/OpenTripPlanner/pull/6284)
- Add a matcher API for filters in the transit service used for regularStop lookup [#6234](https://github.com/opentripplanner/OpenTripPlanner/pull/6234)
+- Make all polling updaters wait for graph update finish [#6262](https://github.com/opentripplanner/OpenTripPlanner/pull/6262)
+- When using ScheduledTransitLeg's copy builder, also copy alerts [#6368](https://github.com/opentripplanner/OpenTripPlanner/pull/6368)
+- Process boarding location for OSM ways (linear platforms) [#6247](https://github.com/opentripplanner/OpenTripPlanner/pull/6247)
+- Fix `bookWhen` field is `null` in the Transmodel API [#6385](https://github.com/opentripplanner/OpenTripPlanner/pull/6385)
+- Make it possible to add custom API documentation based on the deployment location [#6355](https://github.com/opentripplanner/OpenTripPlanner/pull/6355)
+- If configured, add subway station entrances from OSM to walk steps [#6343](https://github.com/opentripplanner/OpenTripPlanner/pull/6343)
[](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
## 2.6.0 (2024-09-18)
diff --git a/doc/user/Configuration.md b/doc/user/Configuration.md
index bec637fe51c..326ccfa8a77 100644
--- a/doc/user/Configuration.md
+++ b/doc/user/Configuration.md
@@ -221,39 +221,40 @@ Here is a list of all features which can be toggled on/off and their default val
-| Feature | Description | Enabled by default | Sandbox |
-|--------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------------------:|:-------:|
-| `APIBikeRental` | Enable the bike rental endpoint. | ✓️ | |
-| `APIServerInfo` | Enable the server info endpoint. | ✓️ | |
-| `APIUpdaterStatus` | Enable endpoint for graph updaters status. | ✓️ | |
-| `IncludeEmptyRailStopsInTransfers` | Turning this on guarantees that Rail stops without scheduled departures still get included when generating transfers using `ConsiderPatternsForDirectTransfers`. It is common for stops to be assign at real-time for Rail. Turning this on will help to avoid dropping transfers which are needed, when the stop is in use later. Turning this on, if ConsiderPatternsForDirectTransfers is off has no effect. | | |
-| `ConsiderPatternsForDirectTransfers` | Enable limiting transfers so that there is only a single transfer to each pattern. | ✓️ | |
-| `DebugUi` | Enable the debug GraphQL client and web UI and located at the root of the web server as well as the debug map tiles it uses. Be aware that the map tiles are not a stable API and can change without notice. Use the [vector tiles feature if](sandbox/MapboxVectorTilesApi.md) you want a stable map tiles API. | ✓️ | |
-| `ExtraTransferLegOnSameStop` | Should there be a transfer leg when transferring on the very same stop. Note that for in-seat/interlined transfers no transfer leg will be generated. | | |
-| `FloatingBike` | Enable floating bike routing. | ✓️ | |
-| `GtfsGraphQlApi` | Enable the [GTFS GraphQL API](apis/GTFS-GraphQL-API.md). | ✓️ | |
-| `MinimumTransferTimeIsDefinitive` | If the minimum transfer time is a lower bound (default) or the definitive time for the transfer. Set this to `true` if you want to set a transfer time lower than what OTP derives from OSM data. | | |
-| `OptimizeTransfers` | OTP will inspect all itineraries found and optimize where (which stops) the transfer will happen. Waiting time, priority and guaranteed transfers are taken into account. | ✓️ | |
-| `ParallelRouting` | Enable performing parts of the trip planning in parallel. | | |
-| `TransferConstraints` | Enforce transfers to happen according to the _transfers.txt_ (GTFS) and Interchanges (NeTEx). Turning this _off_ will increase the routing performance a little. | ✓️ | |
-| `TransmodelGraphQlApi` | Enable the [Transmodel (NeTEx) GraphQL API](apis/TransmodelApi.md). | ✓️ | ✓️ |
-| `ActuatorAPI` | Endpoint for actuators (service health status). | | ✓️ |
-| `AsyncGraphQLFetchers` | Whether the @async annotation in the GraphQL schema should lead to the fetch being executed asynchronously. This allows batch or alias queries to run in parallel at the cost of consuming extra threads. | | |
-| `Co2Emissions` | Enable the emissions sandbox module. | | ✓️ |
-| `DataOverlay` | Enable usage of data overlay when calculating costs for the street network. | | ✓️ |
-| `FaresV2` | Enable import of GTFS-Fares v2 data. | | ✓️ |
-| `FlexRouting` | Enable FLEX routing. | | ✓️ |
-| `GoogleCloudStorage` | Enable Google Cloud Storage integration. | | ✓️ |
-| `LegacyRestApi` | Enable legacy REST API. This API will be removed in the future. | | ✓️ |
-| `MultiCriteriaGroupMaxFilter` | Keep the best itinerary with respect to each criteria used in the transit-routing search. For example the itinerary with the lowest cost, fewest transfers, and each unique transit-group (transit-group-priority) is kept, even if the max-limit is exceeded. This is turned off by default for now, until this feature is well tested. | | |
-| `RealtimeResolver` | When routing with ignoreRealtimeUpdates=true, add an extra step which populates results with real-time data | | ✓️ |
-| `ReportApi` | Enable the report API. | | ✓️ |
-| `RestAPIPassInDefaultConfigAsJson` | Enable a default RouteRequest to be passed in as JSON on the REST API - FOR DEBUGGING ONLY! | | |
-| `SandboxAPIGeocoder` | Enable the Geocoder API. | | ✓️ |
-| `SandboxAPIMapboxVectorTilesApi` | Enable Mapbox vector tiles API. | | ✓️ |
-| `SandboxAPIParkAndRideApi` | Enable park-and-ride endpoint. | | ✓️ |
-| `Sorlandsbanen` | Include train Sørlandsbanen in results when searching in south of Norway. Only relevant in Norway. | | ✓️ |
-| `TransferAnalyzer` | Analyze transfers during graph build. | | ✓️ |
+| Feature | Description | Enabled by default | Sandbox |
+|---------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------------------:|:-------:|
+| `APIBikeRental` | Enable the bike rental endpoint. | ✓️ | |
+| `APIServerInfo` | Enable the server info endpoint. | ✓️ | |
+| `APIUpdaterStatus` | Enable endpoint for graph updaters status. | ✓️ | |
+| `IncludeEmptyRailStopsInTransfers` | Turning this on guarantees that Rail stops without scheduled departures still get included when generating transfers using `ConsiderPatternsForDirectTransfers`. It is common for stops to be assign at real-time for Rail. Turning this on will help to avoid dropping transfers which are needed, when the stop is in use later. Turning this on, if ConsiderPatternsForDirectTransfers is off has no effect. | | |
+| `ConsiderPatternsForDirectTransfers` | Enable limiting transfers so that there is only a single transfer to each pattern. | ✓️ | |
+| `DebugUi` | Enable the debug GraphQL client and web UI and located at the root of the web server as well as the debug map tiles it uses. Be aware that the map tiles are not a stable API and can change without notice. Use the [vector tiles feature if](sandbox/MapboxVectorTilesApi.md) you want a stable map tiles API. | ✓️ | |
+| `ExtraTransferLegOnSameStop` | Should there be a transfer leg when transferring on the very same stop. Note that for in-seat/interlined transfers no transfer leg will be generated. | | |
+| `FloatingBike` | Enable floating bike routing. | ✓️ | |
+| `GtfsGraphQlApi` | Enable the [GTFS GraphQL API](apis/GTFS-GraphQL-API.md). | ✓️ | |
+| `MinimumTransferTimeIsDefinitive` | If the minimum transfer time is a lower bound (default) or the definitive time for the transfer. Set this to `true` if you want to set a transfer time lower than what OTP derives from OSM data. | | |
+| `OptimizeTransfers` | OTP will inspect all itineraries found and optimize where (which stops) the transfer will happen. Waiting time, priority and guaranteed transfers are taken into account. | ✓️ | |
+| `ParallelRouting` | Enable performing parts of the trip planning in parallel. | | |
+| `TransferConstraints` | Enforce transfers to happen according to the _transfers.txt_ (GTFS) and Interchanges (NeTEx). Turning this _off_ will increase the routing performance a little. | ✓️ | |
+| `TransmodelGraphQlApi` | Enable the [Transmodel (NeTEx) GraphQL API](apis/TransmodelApi.md). | ✓️ | ✓️ |
+| `ActuatorAPI` | Endpoint for actuators (service health status). | | ✓️ |
+| `AsyncGraphQLFetchers` | Whether the @async annotation in the GraphQL schema should lead to the fetch being executed asynchronously. This allows batch or alias queries to run in parallel at the cost of consuming extra threads. | | |
+| `WaitForGraphUpdateInPollingUpdaters` | Make all polling updaters wait for graph updates to complete before finishing. If this is not enabled, the updaters will finish after submitting the task to update the graph. | ✓️ | |
+| `Co2Emissions` | Enable the emissions sandbox module. | | ✓️ |
+| `DataOverlay` | Enable usage of data overlay when calculating costs for the street network. | | ✓️ |
+| `FaresV2` | Enable import of GTFS-Fares v2 data. | | ✓️ |
+| `FlexRouting` | Enable FLEX routing. | | ✓️ |
+| `GoogleCloudStorage` | Enable Google Cloud Storage integration. | | ✓️ |
+| `LegacyRestApi` | Enable legacy REST API. This API will be removed in the future. | | ✓️ |
+| `MultiCriteriaGroupMaxFilter` | Keep the best itinerary with respect to each criteria used in the transit-routing search. For example the itinerary with the lowest cost, fewest transfers, and each unique transit-group (transit-group-priority) is kept, even if the max-limit is exceeded. This is turned off by default for now, until this feature is well tested. | | |
+| `RealtimeResolver` | When routing with ignoreRealtimeUpdates=true, add an extra step which populates results with real-time data | | ✓️ |
+| `ReportApi` | Enable the report API. | | ✓️ |
+| `RestAPIPassInDefaultConfigAsJson` | Enable a default RouteRequest to be passed in as JSON on the REST API - FOR DEBUGGING ONLY! | | |
+| `SandboxAPIGeocoder` | Enable the Geocoder API. | | ✓️ |
+| `SandboxAPIMapboxVectorTilesApi` | Enable Mapbox vector tiles API. | | ✓️ |
+| `SandboxAPIParkAndRideApi` | Enable park-and-ride endpoint. | | ✓️ |
+| `Sorlandsbanen` | Include train Sørlandsbanen in results when searching in south of Norway. Only relevant in Norway. | | ✓️ |
+| `TransferAnalyzer` | Analyze transfers during graph build. | | ✓️ |
diff --git a/doc/user/RouterConfiguration.md b/doc/user/RouterConfiguration.md
index 82d14f36392..b5cbf15a4a5 100644
--- a/doc/user/RouterConfiguration.md
+++ b/doc/user/RouterConfiguration.md
@@ -31,45 +31,46 @@ A full list of them can be found in the [RouteRequest](RouteRequest.md).
-| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since |
-|-------------------------------------------------------------------------------------------|:---------------------:|-------------------------------------------------------------------------------------------------------|:----------:|---------------|:-----:|
-| [configVersion](#configVersion) | `string` | Deployment version of the *router-config.json*. | *Optional* | | 2.1 |
-| [flex](sandbox/Flex.md) | `object` | Configuration for flex routing. | *Optional* | | 2.1 |
-| [rideHailingServices](sandbox/RideHailing.md) | `object[]` | Configuration for interfaces to external ride hailing services like Uber. | *Optional* | | 2.3 |
-| [routingDefaults](RouteRequest.md) | `object` | The default parameters for the routing query. | *Optional* | | 2.0 |
-| [server](#server) | `object` | Configuration for router server. | *Optional* | | 2.4 |
-| [apiProcessingTimeout](#server_apiProcessingTimeout) | `duration` | Maximum processing time for an API request | *Optional* | `"PT-1S"` | 2.4 |
-| [traceParameters](#server_traceParameters) | `object[]` | Trace OTP request using HTTP request/response parameter(s) combined with logging. | *Optional* | | 2.4 |
-| generateIdIfMissing | `boolean` | If `true` a unique value is generated if no http request header is provided, or the value is missing. | *Optional* | `false` | 2.4 |
-| httpRequestHeader | `string` | The header-key to use when fetching the trace parameter value | *Optional* | | 2.4 |
-| httpResponseHeader | `string` | The header-key to use when saving the value back into the http response | *Optional* | | 2.4 |
-| [logKey](#server_traceParameters_0_logKey) | `string` | The log event key used. | *Optional* | | 2.4 |
-| timetableUpdates | `object` | Global configuration for timetable updaters. | *Optional* | | 2.2 |
-| [maxSnapshotFrequency](#timetableUpdates_maxSnapshotFrequency) | `duration` | How long a snapshot should be cached. | *Optional* | `"PT1S"` | 2.2 |
-| purgeExpiredData | `boolean` | Should expired real-time data be purged from the graph. Apply to GTFS-RT and Siri updates. | *Optional* | `true` | 2.2 |
-| [transit](#transit) | `object` | Configuration for transit searches with RAPTOR. | *Optional* | | na |
-| [iterationDepartureStepInSeconds](#transit_iterationDepartureStepInSeconds) | `integer` | Step for departure times between each RangeRaptor iterations. | *Optional* | `60` | na |
-| [maxNumberOfTransfers](#transit_maxNumberOfTransfers) | `integer` | This parameter is used to allocate enough memory space for Raptor. | *Optional* | `12` | na |
-| [maxSearchWindow](#transit_maxSearchWindow) | `duration` | Upper limit of the request parameter searchWindow. | *Optional* | `"PT24H"` | 2.4 |
-| [scheduledTripBinarySearchThreshold](#transit_scheduledTripBinarySearchThreshold) | `integer` | This threshold is used to determine when to perform a binary trip schedule search. | *Optional* | `50` | na |
-| [searchThreadPoolSize](#transit_searchThreadPoolSize) | `integer` | Split a travel search in smaller jobs and run them in parallel to improve performance. | *Optional* | `0` | na |
-| [transferCacheMaxSize](#transit_transferCacheMaxSize) | `integer` | The maximum number of distinct transfers parameters to cache pre-calculated transfers for. | *Optional* | `25` | na |
-| [dynamicSearchWindow](#transit_dynamicSearchWindow) | `object` | The dynamic search window coefficients used to calculate the EDT, LAT and SW. | *Optional* | | 2.1 |
-| [maxWindow](#transit_dynamicSearchWindow_maxWindow) | `duration` | Upper limit for the search-window calculation. | *Optional* | `"PT3H"` | 2.2 |
-| [minTransitTimeCoefficient](#transit_dynamicSearchWindow_minTransitTimeCoefficient) | `double` | The coefficient to multiply with `minTransitTime`. | *Optional* | `0.5` | 2.1 |
-| [minWaitTimeCoefficient](#transit_dynamicSearchWindow_minWaitTimeCoefficient) | `double` | The coefficient to multiply with `minWaitTime`. | *Optional* | `0.5` | 2.1 |
-| [minWindow](#transit_dynamicSearchWindow_minWindow) | `duration` | The constant minimum duration for a raptor-search-window. | *Optional* | `"PT40M"` | 2.2 |
-| [stepMinutes](#transit_dynamicSearchWindow_stepMinutes) | `integer` | Used to set the steps the search-window is rounded to. | *Optional* | `10` | 2.1 |
-| [pagingSearchWindowAdjustments](#transit_pagingSearchWindowAdjustments) | `duration[]` | The provided array of durations is used to increase the search-window for the next/previous page. | *Optional* | | na |
-| [stopBoardAlightDuringTransferCost](#transit_stopBoardAlightDuringTransferCost) | `enum map of integer` | Costs for boarding and alighting during transfers at stops with a given transfer priority. | *Optional* | | 2.0 |
-| [transferCacheRequests](#transit_transferCacheRequests) | `object[]` | Routing requests to use for pre-filling the stop-to-stop transfer cache. | *Optional* | | 2.3 |
-| transmodelApi | `object` | Configuration for the Transmodel GraphQL API. | *Optional* | | 2.1 |
-| [hideFeedId](#transmodelApi_hideFeedId) | `boolean` | Hide the FeedId in all API output, and add it to input. | *Optional* | `false` | na |
-| [maxNumberOfResultFields](#transmodelApi_maxNumberOfResultFields) | `integer` | The maximum number of fields in a GraphQL result | *Optional* | `1000000` | 2.6 |
-| [tracingHeaderTags](#transmodelApi_tracingHeaderTags) | `string[]` | Used to group requests when monitoring OTP. | *Optional* | | na |
-| [updaters](UpdaterConfig.md) | `object[]` | Configuration for the updaters that import various types of data into OTP. | *Optional* | | 1.5 |
-| [vectorTiles](sandbox/MapboxVectorTilesApi.md) | `object` | Vector tile configuration | *Optional* | | na |
-| [vehicleRentalServiceDirectory](sandbox/VehicleRentalServiceDirectory.md) | `object` | Configuration for the vehicle rental service directory. | *Optional* | | 2.0 |
+| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since |
+|-------------------------------------------------------------------------------------------|:---------------------:|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:----------:|---------------|:-----:|
+| [configVersion](#configVersion) | `string` | Deployment version of the *router-config.json*. | *Optional* | | 2.1 |
+| [flex](sandbox/Flex.md) | `object` | Configuration for flex routing. | *Optional* | | 2.1 |
+| [rideHailingServices](sandbox/RideHailing.md) | `object[]` | Configuration for interfaces to external ride hailing services like Uber. | *Optional* | | 2.3 |
+| [routingDefaults](RouteRequest.md) | `object` | The default parameters for the routing query. | *Optional* | | 2.0 |
+| [server](#server) | `object` | Configuration for router server. | *Optional* | | 2.4 |
+| [apiDocumentationProfile](#server_apiDocumentationProfile) | `enum` | List of available custom documentation profiles. A profile is used to inject custom documentation like type and field description or a deprecated reason. Currently, ONLY the Transmodel API supports this feature. | *Optional* | `"default"` | 2.7 |
+| [apiProcessingTimeout](#server_apiProcessingTimeout) | `duration` | Maximum processing time for an API request | *Optional* | `"PT-1S"` | 2.4 |
+| [traceParameters](#server_traceParameters) | `object[]` | Trace OTP request using HTTP request/response parameter(s) combined with logging. | *Optional* | | 2.4 |
+| generateIdIfMissing | `boolean` | If `true` a unique value is generated if no http request header is provided, or the value is missing. | *Optional* | `false` | 2.4 |
+| httpRequestHeader | `string` | The header-key to use when fetching the trace parameter value | *Optional* | | 2.4 |
+| httpResponseHeader | `string` | The header-key to use when saving the value back into the http response | *Optional* | | 2.4 |
+| [logKey](#server_traceParameters_0_logKey) | `string` | The log event key used. | *Optional* | | 2.4 |
+| timetableUpdates | `object` | Global configuration for timetable updaters. | *Optional* | | 2.2 |
+| [maxSnapshotFrequency](#timetableUpdates_maxSnapshotFrequency) | `duration` | How long a snapshot should be cached. | *Optional* | `"PT1S"` | 2.2 |
+| purgeExpiredData | `boolean` | Should expired real-time data be purged from the graph. Apply to GTFS-RT and Siri updates. | *Optional* | `true` | 2.2 |
+| [transit](#transit) | `object` | Configuration for transit searches with RAPTOR. | *Optional* | | na |
+| [iterationDepartureStepInSeconds](#transit_iterationDepartureStepInSeconds) | `integer` | Step for departure times between each RangeRaptor iterations. | *Optional* | `60` | na |
+| [maxNumberOfTransfers](#transit_maxNumberOfTransfers) | `integer` | This parameter is used to allocate enough memory space for Raptor. | *Optional* | `12` | na |
+| [maxSearchWindow](#transit_maxSearchWindow) | `duration` | Upper limit of the request parameter searchWindow. | *Optional* | `"PT24H"` | 2.4 |
+| [scheduledTripBinarySearchThreshold](#transit_scheduledTripBinarySearchThreshold) | `integer` | This threshold is used to determine when to perform a binary trip schedule search. | *Optional* | `50` | na |
+| [searchThreadPoolSize](#transit_searchThreadPoolSize) | `integer` | Split a travel search in smaller jobs and run them in parallel to improve performance. | *Optional* | `0` | na |
+| [transferCacheMaxSize](#transit_transferCacheMaxSize) | `integer` | The maximum number of distinct transfers parameters to cache pre-calculated transfers for. | *Optional* | `25` | na |
+| [dynamicSearchWindow](#transit_dynamicSearchWindow) | `object` | The dynamic search window coefficients used to calculate the EDT, LAT and SW. | *Optional* | | 2.1 |
+| [maxWindow](#transit_dynamicSearchWindow_maxWindow) | `duration` | Upper limit for the search-window calculation. | *Optional* | `"PT3H"` | 2.2 |
+| [minTransitTimeCoefficient](#transit_dynamicSearchWindow_minTransitTimeCoefficient) | `double` | The coefficient to multiply with `minTransitTime`. | *Optional* | `0.5` | 2.1 |
+| [minWaitTimeCoefficient](#transit_dynamicSearchWindow_minWaitTimeCoefficient) | `double` | The coefficient to multiply with `minWaitTime`. | *Optional* | `0.5` | 2.1 |
+| [minWindow](#transit_dynamicSearchWindow_minWindow) | `duration` | The constant minimum duration for a raptor-search-window. | *Optional* | `"PT40M"` | 2.2 |
+| [stepMinutes](#transit_dynamicSearchWindow_stepMinutes) | `integer` | Used to set the steps the search-window is rounded to. | *Optional* | `10` | 2.1 |
+| [pagingSearchWindowAdjustments](#transit_pagingSearchWindowAdjustments) | `duration[]` | The provided array of durations is used to increase the search-window for the next/previous page. | *Optional* | | na |
+| [stopBoardAlightDuringTransferCost](#transit_stopBoardAlightDuringTransferCost) | `enum map of integer` | Costs for boarding and alighting during transfers at stops with a given transfer priority. | *Optional* | | 2.0 |
+| [transferCacheRequests](#transit_transferCacheRequests) | `object[]` | Routing requests to use for pre-filling the stop-to-stop transfer cache. | *Optional* | | 2.3 |
+| transmodelApi | `object` | Configuration for the Transmodel GraphQL API. | *Optional* | | 2.1 |
+| [hideFeedId](#transmodelApi_hideFeedId) | `boolean` | Hide the FeedId in all API output, and add it to input. | *Optional* | `false` | na |
+| [maxNumberOfResultFields](#transmodelApi_maxNumberOfResultFields) | `integer` | The maximum number of fields in a GraphQL result | *Optional* | `1000000` | 2.6 |
+| [tracingHeaderTags](#transmodelApi_tracingHeaderTags) | `string[]` | Used to group requests when monitoring OTP. | *Optional* | | na |
+| [updaters](UpdaterConfig.md) | `object[]` | Configuration for the updaters that import various types of data into OTP. | *Optional* | | 1.5 |
+| [vectorTiles](sandbox/MapboxVectorTilesApi.md) | `object` | Vector tile configuration | *Optional* | | na |
+| [vehicleRentalServiceDirectory](sandbox/VehicleRentalServiceDirectory.md) | `object` | Configuration for the vehicle rental service directory. | *Optional* | | 2.0 |
@@ -108,6 +109,22 @@ These parameters are used to configure the router server. Many parameters are sp
domain, these are set in the routing request.
+apiDocumentationProfile
+
+**Since version:** `2.7` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"default"`
+**Path:** /server
+**Enum values:** `default` | `entur`
+
+List of available custom documentation profiles. A profile is used to inject custom
+documentation like type and field description or a deprecated reason.
+
+Currently, ONLY the Transmodel API supports this feature.
+
+
+ - `default` Default documentation is used.
+ - `entur` Entur specific documentation. This deprecate features not supported at Entur, Norway.
+
+
apiProcessingTimeout
**Since version:** `2.4` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT-1S"`
diff --git a/gtfs-realtime-protobuf/pom.xml b/gtfs-realtime-protobuf/pom.xml
index e4465a4d366..dd3990207c9 100644
--- a/gtfs-realtime-protobuf/pom.xml
+++ b/gtfs-realtime-protobuf/pom.xml
@@ -11,6 +11,7 @@
gtfs-realtime-protobuf
OpenTripPlanner - GTFS Realtime (protobuf)
+
com.google.protobuf
@@ -46,7 +47,7 @@
- com.google.protobuf:protoc:3.22.0:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
diff --git a/pom.xml b/pom.xml
index 0e43acff179..f1d1729b936 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,21 +58,25 @@
- 176
+ 177
+
32.1
- 2.53
+ 2.54
2.18.2
- 3.1.9
+ 4.0.5
+ 3.1.10
5.11.4
- 1.14.2
+ 1.14.1
5.6.0
1.5.12
10.1.0
- 2.0.16
+ 1.14.1
2.0.15
+ 5.6.0
+ 4.28.3
1.28
- 4.0.5
+ 2.0.16
UTF-8
opentripplanner/OpenTripPlanner
@@ -389,14 +393,26 @@
-
+
com.google.cloud
libraries-bom
- 26.48.0
+ 26.51.0
pom
import
+
+ com.google.protobuf
+ protobuf-java
+ ${protobuf.version}
+
+
+
+ com.google.guava
+ guava
+ 33.4.0-jre
+
+
org.slf4j
@@ -419,11 +435,6 @@
trove4j
3.0.3
-
- com.google.guava
- guava
- 33.3.1-jre
-
diff --git a/renovate.json5 b/renovate.json5
index 557857bf54c..30a5c6a99c1 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -101,8 +101,10 @@
"com.google.cloud:libraries-bom",
"com.google.guava:guava",
"io.micrometer:micrometer-registry-prometheus",
- "io.micrometer:micrometer-registry-influx"
+ "io.micrometer:micrometer-registry-influx",
+ "com.google.protobuf:protobuf-java"
],
+ "matchUpdateTypes": ["major", "minor"],
"schedule": "on the 7th through 8th day of the month"
},
{
@@ -142,6 +144,22 @@
"automerge": true,
"schedule": "on the 4th day of the month"
},
+ {
+ "groupName": "highly trusted dependencies (patch)",
+ "matchUpdateTypes": ["patch"],
+ "schedule": ["on the 27th day of the month"],
+ "matchPackageNames": [
+ "org.onebusaway:onebusaway-gtfs",
+ "org.glassfish.jersey.{/,}**",
+ "com.google.guava:guava",
+ "com.google.cloud:libraries-bom",
+ "com.google.protobuf:protobuf-java",
+ "io.micrometer:micrometer-registry-prometheus",
+ "io.micrometer:micrometer-registry-influx",
+ "com.fasterxml.jackson:{/,}**",
+ "com.fasterxml.jackson.datatype::{/,}**"
+ ]
+ },
{
"description": "give some projects time to publish a changelog before opening the PR",
"matchPackageNames": [
diff --git a/utils/src/main/java/org/opentripplanner/utils/text/TextVariablesSubstitution.java b/utils/src/main/java/org/opentripplanner/utils/text/TextVariablesSubstitution.java
new file mode 100644
index 00000000000..95226ed4bd0
--- /dev/null
+++ b/utils/src/main/java/org/opentripplanner/utils/text/TextVariablesSubstitution.java
@@ -0,0 +1,102 @@
+package org.opentripplanner.utils.text;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * This utility class substitute variable placeholders in a given text on the format ${variable}.
+ *
+ * The pattern matching a placeholder must start with '${' and end with '}'. The variable name
+ * must consist of only alphanumerical characters (a-z, A-Z, 0-9), dot `.` and underscore '_'.
+ */
+public class TextVariablesSubstitution {
+
+ private static final Pattern PATTERN = Pattern.compile("\\$\\{([.\\w]+)}");
+
+ /**
+ * This method uses the {@link #insertVariables(String, Function, Consumer)} to substitute
+ * all variable tokens in all values in the given {@code properties}. It supports nesting, but
+ * you must avoid cyclic references.
+ *
+ * Example:
+ *
+ * a -> My car is a ${b} car, with an ${c} look.
+ * b -> good old ${c}
+ * c -> fancy
+ *
+ * This will resolve to:
+ *
+ * a -> My car is a good old fancy car, with an fancy look.
+ * b -> good old fancy
+ * c -> fancy
+ *
+ */
+ public static Map insertVariables(
+ Map properties,
+ Consumer errorHandler
+ ) {
+ var result = new HashMap(properties);
+
+ for (String key : result.keySet()) {
+ var value = result.get(key);
+ var sub = insertVariables(value, result::get, errorHandler);
+ if (!value.equals(sub)) {
+ result.put(key, sub);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Replace all variables({@code ${variable.name}}) in the given {@code text}. The given
+ * {@code variableProvider} is used to look up values to insert into the text replacing the
+ * variable token.
+ *
+ * @param errorHandler The error handler is called if a variable key does not exist in the
+ * {@code variableProvider}.
+ * @return the new value with all variables replaced.
+ */
+ public static String insertVariables(
+ String text,
+ Function variableProvider,
+ Consumer errorHandler
+ ) {
+ return insert(text, PATTERN.matcher(text), variableProvider, errorHandler);
+ }
+
+ private static String insert(
+ String text,
+ Matcher matcher,
+ Function variableProvider,
+ Consumer errorHandler
+ ) {
+ boolean matchFound = matcher.find();
+ if (!matchFound) {
+ return text;
+ }
+
+ Map substitutions = new HashMap<>();
+
+ while (matchFound) {
+ String subKey = matcher.group(0);
+ String nameOnly = matcher.group(1);
+ if (!substitutions.containsKey(nameOnly)) {
+ String value = variableProvider.apply(nameOnly);
+ if (value != null) {
+ substitutions.put(subKey, value);
+ } else {
+ errorHandler.accept(nameOnly);
+ }
+ }
+ matchFound = matcher.find();
+ }
+ for (Map.Entry entry : substitutions.entrySet()) {
+ text = text.replace(entry.getKey(), entry.getValue());
+ }
+ return insert(text, PATTERN.matcher(text), variableProvider, errorHandler);
+ }
+}
diff --git a/utils/src/test/java/org/opentripplanner/utils/text/TextVariablesSubstitutionTest.java b/utils/src/test/java/org/opentripplanner/utils/text/TextVariablesSubstitutionTest.java
new file mode 100644
index 00000000000..5c1c2014cc2
--- /dev/null
+++ b/utils/src/test/java/org/opentripplanner/utils/text/TextVariablesSubstitutionTest.java
@@ -0,0 +1,56 @@
+package org.opentripplanner.utils.text;
+
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opentripplanner.utils.text.TextVariablesSubstitution.insertVariables;
+
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class TextVariablesSubstitutionTest {
+
+ @Test
+ void testInsertVariablesInProperties() {
+ Map map = Map.ofEntries(
+ entry("a", "A"),
+ entry("b", "B"),
+ entry("ab", "${a}${b}"),
+ entry("ab2", "${ab} - ${a} - ${b}")
+ );
+
+ var result = insertVariables(map, this::errorHandler);
+
+ assertEquals("A", result.get("a"));
+ assertEquals("B", result.get("b"));
+ assertEquals("AB", result.get("ab"));
+ assertEquals("AB - A - B", result.get("ab2"));
+ }
+
+ @Test
+ void testInsertVariablesInValue() {
+ var map = Map.ofEntries(
+ entry("a", "A"),
+ entry("b", "B"),
+ entry("ab", "${a}${b}"),
+ entry("ab2", "${ab} - ${a} - ${b}")
+ );
+
+ assertEquals(
+ "No substitution",
+ insertVariables("No substitution", map::get, this::errorHandler)
+ );
+ assertEquals("A B", insertVariables("${a} ${b}", map::get, this::errorHandler));
+ assertEquals("AB", insertVariables("${ab}", map::get, this::errorHandler));
+ assertEquals("AB - A - B", insertVariables("${ab2}", map::get, this::errorHandler));
+ var ex = assertThrows(
+ IllegalArgumentException.class,
+ () -> insertVariables("${c}", map::get, this::errorHandler)
+ );
+ assertEquals("c", ex.getMessage());
+ }
+
+ private void errorHandler(String name) {
+ throw new IllegalArgumentException(name);
+ }
+}