Set effectiveWalk distance as coefficient instead of mm

Author: Teemu Peltonen

Diff for: src/main/java/org/opentripplanner/routing/edgetype/StreetWithElevationEdge.java

@@ -30,7 +30,7 @@ public class StreetWithElevationEdge extends StreetEdge {
 
     private boolean flattened;
 
-    private int effectiveWalkLength_mm;
+    private double effectiveWalkFactor = 1.0;
 
     /**
      * Remember to call the {@link #setElevationProfile(PackedCoordinateSequence, boolean)} to initiate elevation data.
@@ -39,8 +39,6 @@ public StreetWithElevationEdge(StreetVertex v1, StreetVertex v2, LineString geom
             I18NString name, double length, StreetTraversalPermission permission, boolean back) {
         super(v1, v2, geometry, name, length, permission, back);
 
-        // Initiate to "flat" distance, use #setElevationProfile() to set elevation adjusted value
-        this.effectiveWalkLength_mm = getLength_mm();
     }
 
     public StreetWithElevationEdge(StreetVertex v1, StreetVertex v2, LineString geometry,
@@ -68,7 +66,7 @@ public boolean setElevationProfile(PackedCoordinateSequence elev, boolean comput
         slopeWorkFactor = (float)costs.slopeWorkFactor;
         maxSlope = (float)costs.maxSlope;
         flattened = costs.flattened;
-        effectiveWalkLength_mm = costs.effectiveWalkDistance_mm;
+        effectiveWalkFactor = costs.effectiveWalkFactor;
 
         bicycleSafetyFactor *= costs.lengthMultiplier;
         bicycleSafetyFactor += costs.slopeSafetyCost / getDistance();
@@ -106,20 +104,7 @@ public double getSlopeWorkCostEffectiveLength() {
     @Override
     public double getSlopeWalkSpeedEffectiveLength() {
         // Convert from fixed millimeters to double meters
-        return effectiveWalkLength_mm / 1000d;
-    }
-
-    @Override
-    protected void calculateLengthFromGeometry () {
-        double accumulatedMeters = 0;
-
-        LineString geom = getGeometry();
-
-        for (int i = 1; i < geom.getNumPoints(); i++) {
-            accumulatedMeters += SphericalDistanceLibrary.distance(geom.getCoordinateN(i - 1), geom.getCoordinateN(i));
-        }
-
-        effectiveWalkLength_mm = (int) (accumulatedMeters * 1000);
+        return effectiveWalkFactor * getDistance();
     }
 
     @Override

Diff for: src/main/java/org/opentripplanner/routing/util/ElevationUtils.java

@@ -72,7 +72,7 @@ public static SlopeCosts getSlopeCosts(CoordinateSequence elev, boolean slopeLim
         double flatLength = lengths[1];
         if (flatLength < 1e-3) {
             log.error("Too small edge, returning neutral slope costs.");
-            return new SlopeCosts(1.0, 1.0, 0.0, 0.0, 1.0, false, (int)(flatLength*1000d));
+            return new SlopeCosts(1.0, 1.0, 0.0, 0.0, 1.0, false, 1.0);
         }
         double lengthMultiplier = trueLength / flatLength;
         for (int i = 0; i < coordinates.length - 1; ++i) {
@@ -117,7 +117,7 @@ public static SlopeCosts getSlopeCosts(CoordinateSequence elev, boolean slopeLim
          * length of the street edge which is the flat one.
          */
         return new SlopeCosts(slopeSpeedEffectiveLength / flatLength, slopeWorkCost / flatLength,
-                slopeSafetyCost, maxSlope, lengthMultiplier, flattened, (int)(effectiveWalkLength * 1000d));
+                slopeSafetyCost, maxSlope, lengthMultiplier, flattened, effectiveWalkLength / flatLength);
     }
 
     /** constants for slope computation */

Diff for: src/main/java/org/opentripplanner/routing/util/SlopeCosts.java

@@ -14,16 +14,16 @@ public class SlopeCosts {
      * to calculate the increase of 19% to walk such a distance. We add that
      * percentage to the 'flat' distance and get 1190m.
      */
-    public final int effectiveWalkDistance_mm;
+    public final double effectiveWalkFactor;
 
     SlopeCosts(double slopeSpeedFactor, double slopeWorkFactor, double slopeSafetyCost,
-                      double maxSlope, double lengthMultiplier, boolean flattened, int effectiveWalkDistance_mm) {
+                      double maxSlope, double lengthMultiplier, boolean flattened, double effectiveWalkFactor) {
         this.slopeSpeedFactor = slopeSpeedFactor;
         this.slopeWorkFactor = slopeWorkFactor;
         this.slopeSafetyCost = slopeSafetyCost;
         this.maxSlope = maxSlope;
         this.lengthMultiplier = lengthMultiplier;
         this.flattened = flattened;
-        this.effectiveWalkDistance_mm = effectiveWalkDistance_mm;
+        this.effectiveWalkFactor = effectiveWalkFactor;
     }
 }