fix(editor): handle travel time calc for patterns without shapes

fixes #107

lib/editor/components/pattern/CalculateDefaultTimesForm.js

@@ -3,6 +3,7 @@ import React, {Component, PropTypes} from 'react'
 import { Button, FormGroup, InputGroup, Form, FormControl, ControlLabel } from 'react-bootstrap'
 
 import MinuteSecondInput from '../MinuteSecondInput'
+import {straightLineDistancesBetweenStopAnchors} from '../../util/map'
 
 const DEFAULT_SPEED = 20 // km/hr
 
@@ -19,23 +20,32 @@ export default class CalculateDefaultTimesForm extends Component {
   }
 
   _calculateDefaultTimes = () => {
-    const {activePattern, saveActiveEntity, updateActiveEntity} = this.props
+    const {activePattern, controlPoints, saveActiveEntity, updateActiveEntity} = this.props
     const {dwellTime, speed} = this.state
     const patternStops = [...activePattern.patternStops]
     const convertedSpeed = speed * 1000 / 60 / 60 // km/hr -> m/s
+    const straightLineDistances = straightLineDistancesBetweenStopAnchors(controlPoints)
     for (var i = 0; i < patternStops.length; i++) {
+      let interStopDistance = 0
       patternStops[i].defaultDwellTime = dwellTime
       if (i > 0) {
-        // Only set travel time for stops after the first stop (time to travel to
-        // first stop should be zero).
-        const interStopDistance = patternStops[i].shapeDistTraveled - patternStops[i - 1].shapeDistTraveled
-        patternStops[i].defaultTravelTime = Math.floor(interStopDistance / convertedSpeed)
-        console.log(interStopDistance, patternStops[i].defaultTravelTime)
-      } else {
-        // Set first stop travel time to zero (in case it was previously some
-        // other value).
-        patternStops[i].defaultTravelTime = 0
+        // Only update travel time for stops after the first stop because the
+        // time to travel to the first stop (from the first stop) should be zero.
+        if (activePattern.shape) {
+          // If there is a pattern shape, use the shape distance traveled values
+          interStopDistance = patternStops[i].shapeDistTraveled - patternStops[i - 1].shapeDistTraveled
+        } else {
+          // Otherwise, use straight line distances between stops (there are
+          // only n - 1 distances between n stops, hence the i - 1 for the index).
+          interStopDistance = straightLineDistances[i - 1]
+        }
       }
+      // Never permit the calculation of negative stop distance values (if that
+      // were somehow to occur).
+      patternStops[i].defaultTravelTime = interStopDistance > 0
+        ? Math.floor(interStopDistance / convertedSpeed)
+        : 0
+      // console.log(interStopDistance, patternStops[i].defaultTravelTime)
     }
     updateActiveEntity(activePattern, 'trippattern', {patternStops})
     saveActiveEntity('trippattern')

lib/editor/util/map.js

@@ -754,3 +754,21 @@ export async function street (from: LatLng, to: LatLng): Promise<any | null> {
     return json
   }
 }
+
+/**
+ * Generate straight line inter-stop distances (in meters) from control points.
+ * @param  {[type]} controlPoints [description]
+ * @return {[type]}               [description]
+ */
+export function straightLineDistancesBetweenStopAnchors (
+  controlPoints: Array<ControlPoint>
+): Array<number> {
+  // Ensure that only stop control points are considered.
+  const stopControlPoints = controlPoints.filter(cp => cp.pointType === POINT_TYPE.STOP)
+  const interStopDistances = []
+  for (var i = 1; i < stopControlPoints.length; i++) {
+    const dist = distance(controlPoints[i].point, controlPoints[i - 1].point, {units: 'meters'})
+    interStopDistances.push(dist)
+  }
+  return interStopDistances
+}