use new GtfsLocation where previously GtfsLocationGroup was used

Author: miles-grant-ibigroup

lib/editor/actions/location.js

@@ -10,7 +10,7 @@ import { receivedNewEntity, savedGtfsEntity } from './active'
 
 export function saveLocationGroup (
   feedId: ?string,
-  locationGroup: GtfsLocationGroup,
+  locationGroup: GtfsLocation,
   refetch: ?boolean = true
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {

lib/editor/components/pattern/EditShapePanel.js

@@ -21,7 +21,7 @@ import {
   getPatternDistance,
   isValidStopControlPoint
 } from '../../util/map'
-import type {ControlPoint, LatLng, Pattern, GtfsStop, GtfsLocation, GtfsLocationGroup} from '../../../types'
+import type {ControlPoint, LatLng, Pattern, GtfsStop, GtfsLocation} from '../../../types'
 import type {EditSettingsUndoState} from '../../../types/reducers'
 
 import EditSettings from './EditSettings'
@@ -30,7 +30,7 @@ type Props = {
   activePattern: Pattern,
   controlPoints: Array<ControlPoint>,
   editSettings: EditSettingsUndoState,
-  locationGroups: Array<GtfsLocationGroup>,
+  locationGroups: Array<GtfsLocation>,
   locations: Array<GtfsLocation>,
   patternSegment: number,
   resetActiveGtfsEntity: typeof activeActions.resetActiveGtfsEntity,

lib/editor/selectors/index.js

@@ -432,7 +432,7 @@ function addPatternStopsToShapePoints (
   patternStops: Array<PatternStop>,
   activePatternStops: Array<GtfsStop>,
   activePatternLocations: Array<GtfsLocation>,
-  activePatternLocationGroups: Array<GtfsLocationGroup>,
+  activePatternLocationGroups: Array<GtfsLocation>,
   projectStops: boolean = false,
   totalShapePointsDistTraveled: number
 ): {patternSegments: Array<Coordinates>, shapePoints: Array<ShapePoint>} {

lib/editor/util/map.js

@@ -25,7 +25,6 @@ import type {
   GeoJsonLinestring,
   GeoJsonPoint,
   GtfsLocation,
-  GtfsLocationGroup,
   GtfsStop,
   LatLng,
   Pattern,
@@ -875,7 +874,7 @@ export function straightLineDistancesBetweenStopAnchors (
 export function generateControlPointsFromPatternStops (
   patternStops: Array<PatternStop>,
   stops: Array<GtfsStop>,
-  locationGroups: Array<GtfsLocationGroup>,
+  locationGroups: Array<GtfsLocation>,
   locations: Array<GtfsLocation>
 ): any { // FIXME: fix flow return type
   const controlPoints = []
@@ -915,7 +914,7 @@ export function generateControlPointsFromPatternStops (
   }
 }
 
-export function stopToPoint (stop: GtfsStop | GtfsLocation | GtfsLocationGroup) {
+export function stopToPoint (stop: GtfsStop | GtfsLocation) {
   if (!stop.stop_lon || !stop.stop_lat) {
     console.error('Serious issue: stopToPoint called without a point! Using 0, 0 coordinates. This is a very bad thing')
     return point([0, 0])

lib/types/index.js

@@ -824,6 +824,13 @@ export type GtfsLocation = {|
   zone_id?: string
 |}
 
+// export type GtfsLocationGroup = {
+//   id: number,
+//   location_group_id: string,
+//   location_group_name: ?string,
+//   stop_id: ?string[]
+// }
+
 export type StopWithFeed = GtfsStop & {child_stops?: Array<GtfsStop>, feed: Feed}
 
 export type LatLng = {