Merge pull request opentripplanner#7081 from leonardehrenfried/remove-generic-location

Remove `GenericLocation` from street model

Author: leonardehrenfried

application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestBuilder.java

@@ -8,7 +8,6 @@
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Envelope;
 import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
-import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.routing.api.request.StreetMode;
 
 public class StreetSearchRequestBuilder {
@@ -70,12 +69,12 @@ public StreetSearchRequestBuilder withWheelchair(Consumer<WheelchairRequest.Buil
     return this;
   }
 
-  public StreetSearchRequestBuilder withFrom(GenericLocation from) {
+  public StreetSearchRequestBuilder withFrom(@Nullable Coordinate from) {
     this.fromEnvelope = createEnvelope(from);
     return this;
   }
 
-  public StreetSearchRequestBuilder withTo(GenericLocation to) {
+  public StreetSearchRequestBuilder withTo(@Nullable Coordinate to) {
     this.toEnvelope = createEnvelope(to);
     return this;
   }
@@ -131,12 +130,7 @@ public StreetSearchRequest build() {
   }
 
   @Nullable
-  private static Envelope createEnvelope(GenericLocation location) {
-    if (location == null) {
-      return null;
-    }
-
-    Coordinate coordinate = location.getCoordinate();
+  private static Envelope createEnvelope(@Nullable Coordinate coordinate) {
     if (coordinate == null) {
       return null;
     }

application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestMapper.java

@@ -2,6 +2,9 @@
 
 import java.time.Instant;
 import java.util.List;
+import javax.annotation.Nullable;
+import org.locationtech.jts.geom.Coordinate;
+import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.preference.AccessibilityPreferences;
 import org.opentripplanner.routing.api.request.preference.BikePreferences;
@@ -29,8 +32,8 @@ public static StreetSearchRequestBuilder mapInternal(RouteRequest request) {
     return StreetSearchRequest.of()
       .withStartTime(time)
       .withArriveBy(request.arriveBy())
-      .withFrom(request.from())
-      .withTo(request.to())
+      .withFrom(mapGenericLocation(request.from()))
+      .withTo(mapGenericLocation(request.to()))
       .withWheelchairEnabled(request.journey().wheelchair())
       .withGeoidElevation(preferences.system().geoidElevation())
       .withTurnReluctance(preferences.street().turnReluctance())
@@ -54,6 +57,15 @@ public static StreetSearchRequestBuilder mapToTransferRequest(RouteRequest reque
 
   // private methods
 
+  @Nullable
+  private static Coordinate mapGenericLocation(@Nullable GenericLocation location) {
+    if (location != null) {
+      return location.getCoordinate();
+    } else {
+      return null;
+    }
+  }
+
   private static void mapWheelchair(WheelchairRequest.Builder b, WheelchairPreferences wheelchair) {
     b
       .withStop(mapAccessibility(wheelchair.stop()))

application/src/test/java/org/opentripplanner/street/search/request/StreetSearchRequestMapperTest.java

@@ -24,11 +24,55 @@
 
 class StreetSearchRequestMapperTest {
 
+  private static final double DELTA = 0.00001;
+  private static final Instant INSTANT = Instant.parse("2022-11-10T10:00:00Z");
+
+  @Test
+  void mapFromToCoordinates() {
+    var builder = builder();
+
+    var from = GenericLocation.fromCoordinate(10, 11);
+    var to = GenericLocation.fromCoordinate(20, 21);
+
+    var req = builder.withDateTime(INSTANT).withFrom(from).withTo(to).buildRequest();
+
+    var subject = StreetSearchRequestMapper.mapInternal(req).build();
+
+    assertEquals(INSTANT, subject.startTime());
+
+    var fromEnvelope = subject.fromEnvelope();
+    assertEquals(10.9954339685, fromEnvelope.getMinX(), DELTA);
+    assertEquals(9.99550339902, fromEnvelope.getMinY(), DELTA);
+    assertEquals(11.0045660314, fromEnvelope.getMaxX(), DELTA);
+    assertEquals(10.0044966009, fromEnvelope.getMaxY(), DELTA);
+
+    var toEnvelope = subject.toEnvelope();
+    assertEquals(20.9952146804, toEnvelope.getMinX(), DELTA);
+    assertEquals(19.9955033990, toEnvelope.getMinY(), DELTA);
+    assertEquals(21.0047853195, toEnvelope.getMaxX(), DELTA);
+    assertEquals(20.0044966009, toEnvelope.getMaxY(), DELTA);
+  }
+
+  @Test
+  void mapFromToStopIds() {
+    var builder = builder();
+
+    var from = GenericLocation.fromStopId("S1", "A", "STOP1");
+    var to = GenericLocation.fromStopId("S2", "A", "STOP2");
+
+    var req = builder.withDateTime(INSTANT).withFrom(from).withTo(to).buildRequest();
+
+    var subject = StreetSearchRequestMapper.mapInternal(req).build();
+
+    assertNull(subject.fromEnvelope());
+    assertNull(subject.toEnvelope());
+  }
+
   @Test
   void mapVehicleWalking() {
     var builder = builder();
 
-    Instant dateTime = Instant.parse("2022-11-10T10:00:00Z");
+    Instant dateTime = INSTANT;
     builder.withDateTime(dateTime);
     var from = new GenericLocation(null, id("STOP"), null, null);
     builder.withFrom(from);
@@ -54,10 +98,9 @@ void mapVehicleWalking() {
   void mapTransferRequest(boolean arriveBy) {
     var from = new GenericLocation(null, id("STOP"), null, null);
     var to = GenericLocation.fromCoordinate(60.0, 20.0);
-    var dateTime = Instant.parse("2022-11-10T10:00:00Z");
     var builder = builder()
       .withArriveBy(arriveBy)
-      .withDateTime(dateTime)
+      .withDateTime(INSTANT)
       .withFrom(from)
       .withTo(to)
       .withPreferences(it -> it.withWalk(walk -> walk.withSpeed(2.4)))
@@ -67,12 +110,11 @@ void mapTransferRequest(boolean arriveBy) {
 
     var subject = StreetSearchRequestMapper.mapToTransferRequest(request).build();
 
-    assertEquals(Instant.EPOCH, subject.startTime());
     assertNull(subject.fromEnvelope());
     assertNull(subject.toEnvelope());
     assertTrue(subject.wheelchairEnabled());
     assertEquals(2.4, subject.walk().speed());
-    assertEquals(Instant.ofEpochSecond(0), subject.startTime());
+    assertEquals(Instant.EPOCH, subject.startTime());
     // arrive by must always be false for transfer requests
     assertFalse(subject.arriveBy());
   }