Merge remote-tracking branch 'otp/dev-2.x' into via_coordinate

Author: t2gran

application/src/main/java/org/opentripplanner/routing/graph/index/StreetIndex.java

@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.locationtech.jts.geom.Coordinate;
@@ -102,7 +101,7 @@ public static TemporaryStreetLocation createTemporaryStreetLocationForTest(
   ) {
     boolean wheelchairAccessible = false;
 
-    var location = new TemporaryStreetLocation(label, nearestPoint, name);
+    TemporaryStreetLocation location = new TemporaryStreetLocation(nearestPoint, name);
 
     for (StreetEdge street : edges) {
       Vertex fromv = street.getFromVertex();
@@ -372,8 +371,7 @@ private Vertex createVertexFromCoordinate(
       name = new NonLocalizedString(label);
     }
 
-    String id = UUID.randomUUID().toString();
-    var temporaryStreetLocation = new TemporaryStreetLocation(id, coordinate, name);
+    var temporaryStreetLocation = new TemporaryStreetLocation(coordinate, name);
 
     TraverseMode nonTransitMode = getTraverseModeForLinker(streetMode, endVertex);
 

application/src/main/java/org/opentripplanner/routing/via/service/DefaultViaCoordinateTransferFactory.java

@@ -61,7 +61,6 @@ public List<ViaCoordinateTransfer> createViaTransfers(
       );
 
       var viaVertex = new TemporaryStreetLocation(
-        UUID.randomUUID().toString(),
         coordinate.asJtsCoordinate(),
         name
       );

application/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java

@@ -1,5 +1,6 @@
 package org.opentripplanner.street.model.vertex;
 
+import java.util.concurrent.atomic.AtomicLong;
 import org.locationtech.jts.geom.Coordinate;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.street.model.edge.Edge;
@@ -15,8 +16,10 @@
  */
 public final class TemporaryStreetLocation extends StreetLocation implements TemporaryVertex {
 
-  public TemporaryStreetLocation(String id, Coordinate nearestPoint, I18NString name) {
-    super(id, nearestPoint, name);
+  private static final AtomicLong idCounter = new AtomicLong(0);
+
+  public TemporaryStreetLocation(Coordinate nearestPoint, I18NString name) {
+    super("TempVertex-" + idCounter.incrementAndGet(), nearestPoint, name);
   }
 
   @Override

application/src/test/java/org/opentripplanner/astar/AStarTest.java

@@ -164,14 +164,12 @@ public void testForwardExtraEdges() {
     request.withPreferences(pref -> pref.withWalk(w -> w.withSpeed(1.0)));
 
     TemporaryStreetLocation from = new TemporaryStreetLocation(
-      "near_shilshole_22nd",
       new Coordinate(-122.385050, 47.666620),
       new NonLocalizedString("near_shilshole_22nd")
     );
     TemporaryConcreteEdge.createTemporaryConcreteEdge(from, graph.getVertex("shilshole_22nd"));
 
     TemporaryStreetLocation to = new TemporaryStreetLocation(
-      "near_56th_20th",
       new Coordinate(-122.382347, 47.669518),
       new NonLocalizedString("near_56th_20th")
     );
@@ -191,15 +189,15 @@ public void testForwardExtraEdges() {
 
     assertEquals(9, states.size());
 
-    assertEquals("near_shilshole_22nd", states.get(0).getVertex().getLabelString());
+    assertEquals("near_shilshole_22nd", states.get(0).getVertex().getDefaultName());
     assertEquals("shilshole_22nd", states.get(1).getVertex().getLabelString());
     assertEquals("ballard_22nd", states.get(2).getVertex().getLabelString());
     assertEquals("market_22nd", states.get(3).getVertex().getLabelString());
     assertEquals("market_leary", states.get(4).getVertex().getLabelString());
     assertEquals("market_russell", states.get(5).getVertex().getLabelString());
     assertEquals("market_20th", states.get(6).getVertex().getLabelString());
     assertEquals("56th_20th", states.get(7).getVertex().getLabelString());
-    assertEquals("near_56th_20th", states.get(8).getVertex().getLabelString());
+    assertEquals("near_56th_20th", states.get(8).getVertex().getDefaultName());
   }
 
   @Test
@@ -210,14 +208,12 @@ public void testBackExtraEdges() {
     request.setArriveBy(true);
 
     TemporaryStreetLocation from = new TemporaryStreetLocation(
-      "near_shilshole_22nd",
       new Coordinate(-122.385050, 47.666620),
       new NonLocalizedString("near_shilshole_22nd")
     );
     TemporaryConcreteEdge.createTemporaryConcreteEdge(from, graph.getVertex("shilshole_22nd"));
 
     TemporaryStreetLocation to = new TemporaryStreetLocation(
-      "near_56th_20th",
       new Coordinate(-122.382347, 47.669518),
       new NonLocalizedString("near_56th_20th")
     );
@@ -237,15 +233,15 @@ public void testBackExtraEdges() {
 
     assertEquals(9, states.size());
 
-    assertEquals("near_shilshole_22nd", states.get(0).getVertex().getLabelString());
+    assertEquals("near_shilshole_22nd", states.get(0).getVertex().getDefaultName());
     assertEquals("shilshole_22nd", states.get(1).getVertex().getLabelString());
     assertEquals("ballard_22nd", states.get(2).getVertex().getLabelString());
     assertEquals("market_22nd", states.get(3).getVertex().getLabelString());
     assertEquals("market_leary", states.get(4).getVertex().getLabelString());
     assertEquals("market_russell", states.get(5).getVertex().getLabelString());
     assertEquals("market_20th", states.get(6).getVertex().getLabelString());
     assertEquals("56th_20th", states.get(7).getVertex().getLabelString());
-    assertEquals("near_56th_20th", states.get(8).getVertex().getLabelString());
+    assertEquals("near_56th_20th", states.get(8).getVertex().getDefaultName());
   }
 
   @Test

application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java

@@ -353,14 +353,9 @@ public PathwayEdge pathway(Vertex from, Vertex to, int time, int length) {
     }
 
     // -- Street linking
-    public TemporaryStreetLocation streetLocation(
-      String name,
-      double latitude,
-      double longitude,
-      boolean endVertex
-    ) {
+    public TemporaryStreetLocation streetLocation(String name, double latitude, double longitude) {
       var nearestPoint = new Coordinate(longitude, latitude);
-      return new TemporaryStreetLocation(name, nearestPoint, new NonLocalizedString(name));
+      return new TemporaryStreetLocation(nearestPoint, new NonLocalizedString(name));
     }
 
     public TemporaryFreeEdge link(TemporaryVertex from, StreetVertex to) {

application/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java

@@ -65,8 +65,8 @@ public void build() {
           D = intersection("D", 47.530, 19.000);
           E1 = entrance("E1", 47.530, 19.001);
 
-          T1 = streetLocation("T1", 47.500, 18.999, false);
-          T2 = streetLocation("T1", 47.530, 18.999, true);
+          T1 = streetLocation("T1", 47.500, 18.999);
+          T2 = streetLocation("T1", 47.530, 18.999);
 
           B1 = vehicleRentalStation("B1", 47.510, 19.001);
           B2 = vehicleRentalStation("B2", 47.520, 19.001);