correct flow issues (non location group)

Author: miles-grant-ibigroup

lib/editor/actions/location.js

@@ -4,7 +4,7 @@ import {getMapFromGtfsStrategy, entityIsNew} from '../util/objects'
 import { getEditorNamespace } from '../util/gtfs'
 import {fetchGTFSEntities} from '../../manager/actions/versions'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
-import type {GtfsLocationGroup} from '../../types'
+import type {GtfsLocation} from '../../types'
 
 import { receivedNewEntity, savedGtfsEntity } from './active'
 

lib/editor/actions/map/stopStrategies.js

@@ -9,6 +9,7 @@ import lineSlice from 'turf-line-slice'
 import lineString from 'turf-linestring'
 import point from 'turf-point'
 import turfPolygon from 'turf-polygon'
+// $FlowFixMe flow doesn't understand new packages
 import centerOfMass from '@turf/center-of-mass'
 
 import {updateActiveGtfsEntity, saveActiveGtfsEntity} from '../active'
@@ -230,7 +231,7 @@ export function addStopAtInterval (latlng: LatLng, activePattern: Pattern, contr
   }
 }
 
-export function addStopToPattern (pattern: Pattern, stop: GtfsStop | GtfsLocation, index?: ?number) {
+export function addStopToPattern (pattern: Pattern, origStop: GtfsStop | GtfsLocation, index?: ?number) {
   // eslint-disable-next-line complexity
   return async function (dispatch: dispatchFn, getState: getStateFn) {
     const {data, editSettings} = getState().editor
@@ -243,6 +244,9 @@ export function addStopToPattern (pattern: Pattern, stop: GtfsStop | GtfsLocatio
     const {controlPoints, patternSegments} = getControlPoints(getState())
     const hasShapePoints = shapePoints && shapePoints.length > 1
 
+    // $FlowFixMe this is a bit of a hack to get locations to work with methods built for stops. We do the work required to have all methods work.
+    const stop: GtfsStop = clone(origStop)
+
     if (stop.stop_id === undefined || stop.stop_id === null) {
       // convert stop to turf polygon
       const polygon = stop.location_shapes.map(ls => [ls.geometry_pt_lat, ls.geometry_pt_lon])
@@ -306,7 +310,7 @@ export function addStopToPattern (pattern: Pattern, stop: GtfsStop | GtfsLocatio
           const locationgroups = getTableById(data.tables, 'locationgroup')
           const previousStop = stops.find(s => s.stop_id === previousStopId) || locations.find(s => s.location_id === previousStopId) || locationgroups.find(s => s.location_group_id === previousStopId)
           if (!previousStop) {
-            throw new Error(`Stop not found for stop_id ${previousStopId}.`)
+            throw new Error(`Stop not found for stop_id ${previousStopId || '(no previous stop id)'}.`)
           }
           const points = [previousStop, stop]
             .map((stop, index) => ({lng: stop.stop_lon, lat: stop.stop_lat}))
@@ -551,6 +555,7 @@ export function removeStopFromPattern (pattern: Pattern, stop: GtfsLocation | Gt
     const clonedControlPoints = clone(controlPoints)
     const clonedPatternSegments = clone(patternSegments)
     const {shapePoints, patternStops} = pattern
+    // $FlowFixMe Flow doesn't understand this property check
     const stopIsStop = stop.hasOwnProperty('stopId') && stop.stopId !== null
     // Use control points to determine control point index for removed stop.
     // This is distinct from the index arg supplied because there may be more

lib/editor/actions/trip.js

@@ -63,7 +63,7 @@ export const updateCellValue = createAction(
   (payload: {
     key: string,
     rowIndex: number,
-    value: ?(number | string | { stopId: string })
+    value: ?(number | string | { stopId: ?string })
   }) => payload
 )
 

lib/editor/actions/tripPattern.js

@@ -12,7 +12,7 @@ import {fetchGTFSEntities, receiveGTFSEntities} from '../../manager/actions/vers
 import {getEditorNamespace} from '../util/gtfs'
 import {resequenceShapePoints, resequenceStops} from '../util/map'
 import {entityIsNew} from '../util/objects'
-import type { ControlPoint, Pattern } from '../../types'
+import type { ControlPoint, Pattern, PatternStop } from '../../types'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
 
 import {fetchTripCounts} from './trip'

lib/editor/components/map/PatternStopsLayer.js

@@ -94,6 +94,7 @@ export default class PatternStopsLayer extends Component<Props> {
           }
           if (
             editSettings.hideInactiveSegments &&
+            cpIndex &&
             (cpIndex > patternSegment + 1 || cpIndex < patternSegment - 1)
           ) {
             // Do not render pattern stop if hiding inactive segments and
@@ -131,6 +132,7 @@ export default class PatternStopsLayer extends Component<Props> {
               location={location}
               setActiveStop={setActiveStop}
               // fallback to index if/when id changes
+              // $FlowFixMe
               ref={`${patternStop.id || patternStop.locationId || patternStop.locationGroupId}`}
               removeStopFromPattern={removeStopFromPattern}
               stop={stop}

lib/editor/components/pattern/AddPatternStopDropdown.js

@@ -5,7 +5,7 @@ import React, {Component} from 'react'
 import { Button, Dropdown, MenuItem } from 'react-bootstrap'
 
 import * as stopStrategiesActions from '../../actions/map/stopStrategies'
-import type {GtfsLocation, GtfsStop, Pattern, Style} from '../../../types'
+import type {GtfsLocation, GtfsStop, Pattern, Style, PatternStop} from '../../../types'
 
 type Props = {
   activePattern: Pattern,

lib/editor/components/pattern/EditShapePanel.js

@@ -100,7 +100,7 @@ export default class EditShapePanel extends Component<Props> {
         .map((s, index) => {
           const stop = stops.find(st => st.stop_id === s.stopId)
           if (!stop) {
-            console.warn(`Could not locate stop with stop_id=${s.stopId}`)
+            console.warn(`Could not locate stop with stop_id=${s.stopId || '(no stop id found)'}`)
             return {lng: 0, lat: 0}
           }
           return {lng: stop.stop_lon, lat: stop.stop_lat}

lib/editor/components/pattern/PatternStopCard.js

@@ -22,8 +22,8 @@ import * as tripPatternActions from '../../actions/tripPattern'
 import { getEntityName, getAbbreviatedStopName, getTableById } from '../../util/gtfs'
 import MinuteSecondInput from '../MinuteSecondInput'
 import { getComponentMessages, getGtfsSpecField } from '../../../common/util/config'
-import type { Feed, Pattern } from '../../../types'
-import type { AppState, RouterProps } from '../../../types/reducers'
+import type { Feed, Pattern, PatternStop } from '../../../types'
+import type { EditorTables, AppState, RouterProps } from '../../../types/reducers'
 
 import NormalizeStopTimesTip from './NormalizeStopTimesTip'
 import PatternStopButtons from './PatternStopButtons'
@@ -199,6 +199,7 @@ class PatternStopCard extends Component<Props> {
   _formatTravelTime (cumulativeTravelTime, patternStop) {
     if (!patternStop.defaultTravelTime || !patternStop.defaultDwellTime) return
 
+    // $FlowFixMe Flow doesn't understand our type check above
     return `${Math.round(cumulativeTravelTime / 60)} (+${Math.round(patternStop.defaultTravelTime / 60)}${patternStop.defaultDwellTime > 0 ? ` +${Math.round(patternStop.defaultDwellTime / 60)}` : ''})`
   }
 
@@ -241,6 +242,7 @@ class PatternStopCard extends Component<Props> {
     if (patternStop.locationId !== null || patternStop.locationGroupId !== null) {
       cardBackground = 'hsla(187, 84%, 87%, 0.5)'
     }
+    // $FlowFixMe flexDefaultTravelTime doens't exist on a PatternStop, which is the point of this check
     if ((!patternStop.defaultTravelTime && !patternStop.flexDefaultTravelTime) && index !== 0) {
       cardBackground = 'hsla(35, 84%, 87%, 1)'
     }
@@ -300,15 +302,15 @@ class PatternStopContents extends Component<Props, State> {
 
     if (patternStop.stopId !== null) {
       this.setState({
-        initialDwellTime: patternStop.defaultDwellTime,
-        initialTravelTime: patternStop.defaultTravelTime,
+        initialDwellTime: patternStop.defaultDwellTime || undefined,
+        initialTravelTime: patternStop.defaultTravelTime || undefined,
         update: false
       })
     } else {
       // If patternStop is not a fixed stop, it is a flex location/location group.
       this.setState({
-        defaultDwellTime: patternStop.defaultDwellTime,
-        defaultTravelTime: patternStop.defaultTravelTime,
+        defaultDwellTime: patternStop.defaultDwellTime || undefined,
+        defaultTravelTime: patternStop.defaultTravelTime || undefined,
         update: false
       })
     }

lib/editor/components/pattern/PatternStopContainer.js

@@ -9,7 +9,7 @@ import HTML5Backend from 'react-dnd-html5-backend'
 import * as activeActions from '../../actions/active'
 import * as stopStrategiesActions from '../../actions/map/stopStrategies'
 import * as tripPatternActions from '../../actions/tripPattern'
-import type {GtfsLocation, GtfsStop, Feed, Pattern} from '../../../types'
+import type {GtfsLocation, GtfsStop, Feed, Pattern, PatternStop} from '../../../types'
 
 import PatternStopCard from './PatternStopCard'
 

lib/editor/components/timetable/TimetableGrid.js

@@ -28,6 +28,8 @@ import {
   WRAPPER_STYLE
 } from '../../util/timetable'
 import type {Pattern, TimetableColumn} from '../../../types'
+import type { TimetableState } from '../../../types/reducers'
+import type {TripValidationIssues} from '../../../editor/selectors/timetable'
 
 import EditableCell from './EditableCell'
 import HeaderCell from './HeaderCell'