use a service to store platform data

application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java

@@ -20,7 +20,6 @@
 import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.model.edge.ElevatorHopEdge;
 import org.opentripplanner.street.model.edge.EscalatorEdge;
-import org.opentripplanner.street.model.edge.LinearPlatformEdge;
 import org.opentripplanner.street.model.edge.PathwayEdge;
 import org.opentripplanner.street.model.edge.StreetEdge;
 import org.opentripplanner.street.model.edge.StreetStationCentroidLink;
@@ -81,7 +80,6 @@ public class DebugStyleSpec {
   private static final Class<Edge>[] EDGES_TO_DISPLAY = new Class[] {
     StreetEdge.class,
     AreaEdge.class,
-    LinearPlatformEdge.class,
     EscalatorEdge.class,
     PathwayEdge.class,
     ElevatorHopEdge.class,

application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java

@@ -2,9 +2,9 @@
 
 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;
@@ -18,12 +18,11 @@
 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;
 import org.opentripplanner.street.model.edge.Edge;
-import org.opentripplanner.street.model.edge.LinearPlatform;
-import org.opentripplanner.street.model.edge.LinearPlatformEdge;
 import org.opentripplanner.street.model.edge.NamedArea;
 import org.opentripplanner.street.model.edge.StreetEdge;
 import org.opentripplanner.street.model.edge.StreetEdgeBuilder;
@@ -149,25 +148,24 @@ private boolean connectVertexToStop(TransitStopVertex ts, StreetIndex index) {
 
     // if the boarding location is a non-area way we are finding the vertex representing the
     // center of the way, splitting if needed
-    var nearbyLinearPlatformEdges = new HashMap<LinearPlatform, List<LinearPlatformEdge>>();
+    var nearbyEdges = new HashMap<Platform, List<Edge>>();
 
     for (var edge : index.getEdgesForEnvelope(envelope)) {
-      if (edge instanceof LinearPlatformEdge platformEdge) {
-        var platform = platformEdge.platform;
+      osmInfoGraphBuildService.findPlatform(edge).ifPresent(platform -> {
         if (matchesReference(stop, platform.references())) {
-          if (!nearbyLinearPlatformEdges.containsKey(platform)) {
-            var list = new ArrayList<LinearPlatformEdge>();
-            list.add(platformEdge);
-            nearbyLinearPlatformEdges.put(platform, list);
+          if (!nearbyEdges.containsKey(platform)) {
+            var list = new ArrayList<Edge>();
+            list.add(edge);
+            nearbyEdges.put(platform, list);
           } else {
-            nearbyLinearPlatformEdges.get(platform).add(platformEdge);
+            nearbyEdges.get(platform).add(edge);
           }
         }
-      }
+      });
     }
 
-    for (var platformEdgeList : nearbyLinearPlatformEdges.entrySet()) {
-      LinearPlatform platform = platformEdgeList.getKey();
+    for (var platformEdgeList : nearbyEdges.entrySet()) {
+      Platform platform = platformEdgeList.getKey();
       var name = platform.name();
       var label = "platform-centroid/%s".formatted(stop.getId().toString());
       var centroid = platform.geometry().getCentroid();
@@ -269,7 +267,7 @@ private void linkBoardingLocationToStop(
     );
   }
 
-  private boolean matchesReference(StationElement<?, ?> stop, Set<String> references) {
+  private boolean matchesReference(StationElement<?, ?> stop, Collection<String> references) {
     var stopCode = stop.getCode();
     var stopId = stop.getId().getId();
 

application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java

@@ -27,13 +27,11 @@
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.util.ElevationUtils;
 import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
-import org.opentripplanner.service.osminfo.model.OsmWayReferences;
+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;
 import org.opentripplanner.street.model.StreetTraversalPermission;
-import org.opentripplanner.street.model.edge.LinearPlatform;
-import org.opentripplanner.street.model.edge.LinearPlatformEdgeBuilder;
 import org.opentripplanner.street.model.edge.StreetEdge;
 import org.opentripplanner.street.model.edge.StreetEdgeBuilder;
 import org.opentripplanner.street.model.vertex.BarrierVertex;
@@ -57,7 +55,6 @@ public class OsmModule implements GraphBuilderModule {
    */
   private final List<OsmProvider> providers;
   private final Graph graph;
-  // TODO: Use this to store edge stop references
   private final OsmInfoGraphBuildRepository osmInfoGraphBuildRepository;
   private final VehicleParkingRepository parkingRepository;
 
@@ -355,7 +352,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());
         }
 
@@ -413,8 +410,7 @@ private void buildBasicGraph() {
             way,
             i,
             permissions,
-            geometry,
-            platform
+            geometry
           );
 
           params.edgeNamer().recordEdges(way, streets);
@@ -423,7 +419,10 @@ private void buildBasicGraph() {
           StreetEdge backStreet = streets.back();
           normalizer.applyWayProperties(street, backStreet, wayData, way);
 
-          osmInfoGraphBuildRepository.addReferences(street, new OsmWayReferences(List.of(street.toString())));
+          platform.ifPresent(plat -> {
+            osmInfoGraphBuildRepository.addPlatform(street, plat);
+            osmInfoGraphBuildRepository.addPlatform(backStreet, plat);
+          });
 
           applyEdgesToTurnRestrictions(way, startNode, endNode, street, backStreet);
           startNode = endNode;
@@ -439,7 +438,7 @@ private void buildBasicGraph() {
     LOG.info(progress.completeMessage());
   }
 
-  private Optional<LinearPlatform> getPlatform(OsmWay way) {
+  private Optional<Platform> getPlatform(OsmWay way) {
     if (way.isBoardingLocation()) {
       var nodeRefs = way.getNodeRefs();
       var size = nodeRefs.size();
@@ -455,7 +454,7 @@ private Optional<LinearPlatform> getPlatform(OsmWay way) {
       var references = way.getMultiTagValues(params.boardingAreaRefTags());
 
       return Optional.of(
-        new LinearPlatform(
+        new Platform(
           params.edgeNamer().getNameForWay(way, "platform " + way.getId()),
           geometry,
           references
@@ -523,8 +522,7 @@ private StreetEdgePair getEdgesForStreet(
     OsmWay way,
     int index,
     StreetTraversalPermission permissions,
-    LineString geometry,
-    Optional<LinearPlatform> platform
+    LineString geometry
   ) {
     // No point in returning edges that can't be traversed by anyone.
     if (permissions.allowsNothing()) {
@@ -550,8 +548,7 @@ private StreetEdgePair getEdgesForStreet(
           length,
           permissionsFront,
           geometry,
-          false,
-          platform
+          false
         );
     }
     if (permissionsBack.allowsAnything()) {
@@ -564,8 +561,7 @@ private StreetEdgePair getEdgesForStreet(
           length,
           permissionsBack,
           backGeometry,
-          true,
-          platform
+          true
         );
     }
     if (street != null && backStreet != null) {
@@ -582,19 +578,14 @@ private StreetEdge getEdgeForStreet(
     double length,
     StreetTraversalPermission permissions,
     LineString geometry,
-    boolean back,
-    Optional<LinearPlatform> platform
+    boolean back
   ) {
     String label = "way " + way.getId() + " from " + index;
     label = label.intern();
     I18NString name = params.edgeNamer().getNameForWay(way, label);
     float carSpeed = way.getOsmProvider().getOsmTagMapper().getCarSpeedForWay(way, back);
 
-    var seb = platform
-      .<StreetEdgeBuilder<?>>map(p -> new LinearPlatformEdgeBuilder().withPlatform(p))
-      .orElse(new StreetEdgeBuilder<>());
-
-    seb
+    StreetEdgeBuilder<?> seb = new StreetEdgeBuilder<>()
       .withFromVertex(startEndpoint)
       .withToVertex(endEndpoint)
       .withGeometry(geometry)

application/src/main/java/org/opentripplanner/service/osminfo/OsmInfoGraphBuildRepository.java

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 import java.util.Optional;
-import org.opentripplanner.service.osminfo.model.OsmWayReferences;
+import org.opentripplanner.service.osminfo.model.Platform;
 import org.opentripplanner.street.model.edge.Edge;
 
 /**
@@ -12,12 +12,12 @@
  */
 public interface OsmInfoGraphBuildRepository extends Serializable {
   /**
-   * TODO Add doc
+   * Associate the edge with a platform
    */
-  void addReferences(Edge edge, OsmWayReferences info);
+  void addPlatform(Edge edge, Platform platform);
 
   /**
-   * TODO Add doc
+   * Find the platform the edge belongs to
    */
-  Optional<OsmWayReferences> findReferences(Edge edge);
+  Optional<Platform> findPlatform(Edge edge);
 }

application/src/main/java/org/opentripplanner/service/osminfo/OsmInfoGraphBuildService.java

@@ -1,7 +1,7 @@
 package org.opentripplanner.service.osminfo;
 
 import java.util.Optional;
-import org.opentripplanner.service.osminfo.model.OsmWayReferences;
+import org.opentripplanner.service.osminfo.model.Platform;
 import org.opentripplanner.street.model.edge.Edge;
 
 /**
@@ -16,7 +16,10 @@
  */
 public interface OsmInfoGraphBuildService {
   /**
-   * TODO Add doc
+   * Find the platform the given edge is part of.
+   * <p>
+   * TODO: This service currently only stores linear platforms, but area platforms and
+   * node platforms should be supported as well.
    */
-  Optional<OsmWayReferences> findReferences(Edge edge);
+  Optional<Platform> findPlatform(Edge edge);
 }

application/src/main/java/org/opentripplanner/service/osminfo/internal/DefaultOsmInfoGraphBuildRepository.java

@@ -7,31 +7,31 @@
 import java.util.Objects;
 import java.util.Optional;
 import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
-import org.opentripplanner.service.osminfo.model.OsmWayReferences;
+import org.opentripplanner.service.osminfo.model.Platform;
 import org.opentripplanner.street.model.edge.Edge;
 
 public class DefaultOsmInfoGraphBuildRepository
   implements OsmInfoGraphBuildRepository, Serializable {
 
-  private final Map<Edge, OsmWayReferences> references = new HashMap<>();
+  private final Map<Edge, Platform> platforms = new HashMap<>();
 
   @Inject
   public DefaultOsmInfoGraphBuildRepository() {}
 
   @Override
-  public void addReferences(Edge edge, OsmWayReferences info) {
+  public void addPlatform(Edge edge, Platform platform) {
     Objects.requireNonNull(edge);
-    Objects.requireNonNull(info);
-    this.references.put(edge, info);
+    Objects.requireNonNull(platform);
+    this.platforms.put(edge, platform);
   }
 
   @Override
-  public Optional<OsmWayReferences> findReferences(Edge edge) {
-    return Optional.ofNullable(references.get(edge));
+  public Optional<Platform> findPlatform(Edge edge) {
+    return Optional.ofNullable(platforms.get(edge));
   }
 
   @Override
   public String toString() {
-    return "DefaultOsmInfoGraphBuildRepository{references size = " + references.size() + "}";
+    return "DefaultOsmInfoGraphBuildRepository{platforms size = " + platforms.size() + "}";
   }
 }

application/src/main/java/org/opentripplanner/service/osminfo/internal/DefaultOsmInfoGraphBuildService.java

@@ -4,7 +4,7 @@
 import java.util.Optional;
 import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
 import org.opentripplanner.service.osminfo.OsmInfoGraphBuildService;
-import org.opentripplanner.service.osminfo.model.OsmWayReferences;
+import org.opentripplanner.service.osminfo.model.Platform;
 import org.opentripplanner.street.model.edge.Edge;
 
 public class DefaultOsmInfoGraphBuildService implements OsmInfoGraphBuildService {
@@ -17,8 +17,8 @@ public DefaultOsmInfoGraphBuildService(OsmInfoGraphBuildRepository repository) {
   }
 
   @Override
-  public Optional<OsmWayReferences> findReferences(Edge edge) {
-    return repository.findReferences(edge);
+  public Optional<Platform> findPlatform(Edge edge) {
+    return repository.findPlatform(edge);
   }
 
   @Override

application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java

@@ -0,0 +1,8 @@
+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<String> references) {
+}