Merge remote-tracking branch 'origin/zero-split-elevation-extension-nan-fix' into v2

Author: optionsome

street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java

@@ -773,7 +773,7 @@ protected void copyPropertiesToSplitEdge(
     );
 
     StreetElevationExtensionBuilder.of(seb)
-      .withDistanceInMeters(defaultMillimeterLength(seb.geometry()) / 1000.)
+      .withDistanceInMeters(toDistance - fromDistance)
       .withElevationProfile(partialElevationProfileFromParent)
       .build()
       .ifPresent(seb::withElevationExtension);

street/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilder.java

@@ -39,7 +39,11 @@ public static StreetElevationExtensionBuilder of(StreetEdgeBuilder<?> seb) {
   }
 
   public Optional<StreetElevationExtension> build() {
-    if (elevationProfileHasAtLeastTwoPoints() && (!isSlopeOverride || computed)) {
+    if (
+      distanceInMeters > 0.01 &&
+      elevationProfileHasAtLeastTwoPoints() &&
+      (!isSlopeOverride || computed)
+    ) {
       return Optional.of(buildInternal());
     }
     return Optional.empty();

street/src/test/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilderTest.java

@@ -30,8 +30,14 @@ class StreetElevationExtensionBuilderTest {
     new Coordinate(0, 0),
     new Coordinate(1, 1),
   };
+  private static final Coordinate[] COORDINATES_ONE_POINT_TWICE = new Coordinate[] {
+    new Coordinate(0, 0),
+    new Coordinate(0, 0),
+  };
   private static final PackedCoordinateSequence ELEVATION_PROFILE_TWO_POINTS =
     new PackedCoordinateSequence.Double(COORDINATES_TWO_POINTS, 2);
+  private static final PackedCoordinateSequence ELEVATION_PROFILE_ONE_POINT_TWICE =
+    new PackedCoordinateSequence.Double(COORDINATES_ONE_POINT_TWICE, 2);
 
   private static final LineString GEOMETRY = GeometryUtils.getGeometryFactory().createLineString(
     new Coordinate[] {
@@ -68,6 +74,15 @@ void testValidElevationProfile() {
     assertFalse(streetElevationExtension.isEmpty());
   }
 
+  @Test
+  void testZeroLengthEdge() {
+    StreetElevationExtensionBuilder seeb = new StreetElevationExtensionBuilder()
+      .withDistanceInMeters(0)
+      .withElevationProfile(ELEVATION_PROFILE_ONE_POINT_TWICE);
+    Optional<StreetElevationExtension> streetElevationExtension = seeb.build();
+    assertTrue(streetElevationExtension.isEmpty());
+  }
+
   @Test
   void testBuildFromStreetEdge() {
     StreetEdge se = streetEdgeBuilder.buildAndConnect();