Merge pull request #1017 from ibi-group/pattern-location-groups-july-2024

Location Groups July 2024

Author: miles-grant-ibigroup

gtfs.yml

@@ -650,10 +650,20 @@
       inputType: TIME
       columnWidth: 6
     - name: "stop_id"
-      required: true
+      required: false
       inputType: GTFS_STOP
       columnWidth: 6
       helpContent: "The stop_id field contains an ID that uniquely identifies a stop. Multiple routes may use the same stop. The stop_id is referenced from the stops.txt file. If location_type is used in stops.txt, all stops referenced in stop_times.txt must have location_type of 0."
+    - name: "location_id"
+      required: false
+      inputType: GTFS_ID
+      columnWidth: 6
+      helpContent: "The location_id field contains an ID that uniquely identifies a location. Multiple routes may use the same stop. The stop_id is referenced from the stops.txt file. If location_type is used in stops.txt, all stops referenced in stop_times.txt must have location_type of 0."
+    - name: "location_group_id"
+      required: false
+      inputType: TEXT
+      columnWidth: 6
+      helpContent: "The location_group_id field contains an ID that uniquely identifies a location group. Multiple routes may use the same stop. The stop_id is referenced from the stops.txt file. If location_type is used in stops.txt, all stops referenced in stop_times.txt must have location_type of 0."
     - name: "stop_sequence"
       required: true
       inputType: POSITIVE_INT
@@ -1162,6 +1172,16 @@
     helpContent: "The stop_url field contains the URL of a web page about a particular location. This should be different from the agency_url and the route_url fields."
 
   # FIXME: helpContent is lifted from https://github.com/MobilityData/gtfs-flex/blob/master/spec/reference.md
+- id: locationgroupstop
+  flex: true
+  name: location_group_stops.txt
+  fields:
+  - name: "location_group_id"
+    required: true
+    inputType: TEXT
+  - name: "stop_id"
+    required: true
+    inputType: GTFS_ID
 - id: locationgroup
   flex: true
   name: location_groups.txt
@@ -1178,9 +1198,11 @@
     inputType: TEXT
     columnWidth: 12
     helpContent: "Name of the location group. Must be defined either once, or exhaustively for a single location_group_id."
-  # TODO: enable validation to match spec (only appear when appropriate)
-  - name: "location_id"
-    required: false
-    inputType: GTFS_STOP_OR_LOCATION_LIST
-    columnWidth: 12
-    helpContent: "Identifies a stop or location belonging to the location group."
+  extraFields:
+   - name: "stop_id"
+     required: false
+     inputType: GTFS_STOP_OR_LOCATION_LIST
+     columnWidth: 12
+     helpContent: "Identifies a stop or location belonging to the location group."
+     activeComponentOverride: "locationgroupstop"
+

i18n/polish.yml

@@ -381,6 +381,7 @@ components:
     autoPublish: Automatycznie publikuj
     dateFormat: MMM D, YYYY
     deployable: Rozmieszczany
+    flex: Flexible service
     edit: Edytować
     lastUpdatedDate: Last updated %date%
     noUpdates: No updates
@@ -632,6 +633,10 @@ components:
         title: Real-time updaters
       walkSpeed: Walk Speed
   GeneralSettings:
+    flex:
+      title: Flex Service
+      checkbox: Feed includes flex service
+      description: Enable this feed source to include flex service. Checking this checkbox will enable flex tools in the editor. Flex service describes operations that follow a schedule, but also include flexible features such as dial-a-ride service, route deviation, continuous stops, or point to zone service.
     autoFetch:
       checkbox: Auto fetch feed source
       hint: Set this feed source to fetch automatically. (Feed source URL must be
@@ -744,6 +749,8 @@ components:
     stop:
       label: Stops
       title: Edit stops
+  GtfsServiceSelect: 
+    placeholder: Select existing service ID
   GtfsValidationExplorer:
     accessibilityValidation: Accessibility Explorer
     table:

lib/editor/actions/active.js

@@ -30,7 +30,7 @@ import {
   removeEditorLock
 } from './editor'
 import {saveTripPattern} from './tripPattern'
-import { saveLocation } from './location'
+import { saveLocation, saveLocationGroup } from './location'
 
 export const clearGtfsContent = createVoidPayloadAction('CLEAR_GTFSEDITOR_CONTENT')
 export const receivedNewEntity = createAction(
@@ -373,6 +373,8 @@ export function saveActiveGtfsEntity (
         return dispatch(saveTripPattern(feedId, (entity: any)))
       case 'location':
         return dispatch(saveLocation(feedId, (entity: any), refetch))
+      case 'locationgroup':
+        return dispatch(saveLocationGroup(feedId, (entity: any), refetch))
       default:
         // Default method for agencies, stops, routes, fares, calendars.
         // Trip patterns and feed info are handled above. Trips are handled in

lib/editor/actions/editor.js

@@ -77,8 +77,6 @@ function getCloneProps (entityId: number, component: string, state: AppState) {
         patternId: newPatternId,
         shapeId: newShapeId,
         shapePoints: pattern.shapePoints.map(sp => ({...sp, shapeId: newShapeId})),
-        patternLocationGroups: pattern.patternLocationGroups && pattern.patternLocationGroups.map(plg => ({...plg, patternId: newPatternId})),
-        patternLocations: pattern.patternLocations.map(pl => ({...pl, patternId: newPatternId})),
         patternStops: pattern.patternStops.map(ps => ({...ps, patternId: newPatternId}))
       }
     case 'route':
@@ -480,9 +478,12 @@ export function fetchBaseGtfs ({
           location_groups {
             id
             location_group_id
-            location_id
             location_group_name
           }
+          location_group_stops {
+            location_group_id
+            stop_id
+          }
           feed_info {
             id
             feed_id

lib/editor/actions/location.js

@@ -8,6 +8,71 @@ import type {GtfsLocation} from '../../types'
 
 import { receivedNewEntity, savedGtfsEntity } from './active'
 
+// FLEX TODO: The two big dispatch blocks are almost the same... Would it be possible to extract them (such as saveEntity('locationgroup', locationGroupUrl) and same for locationgroupstop)?
+export function saveLocationGroup (
+  feedId: ?string,
+  locationGroup: GtfsLocation,
+  refetch: ?boolean = true
+) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    if (!feedId || !locationGroup) {
+      return
+    }
+    // dispatch(savingActiveLocation()) //Update this?
+
+    const notNew = !entityIsNew(locationGroup) // Checks if id is -2 or undefined
+    const method = notNew ? 'put' : 'post'
+    const idParam = notNew ? `/${locationGroup.id || ''}` : ''
+    const {sessionId} = getState().editor.data.lock
+
+    const mappingStrategy = getMapFromGtfsStrategy('locationGroup')
+    const data = mappingStrategy(locationGroup)
+
+    const locationGroupUrl = `/api/editor/secure/locationgroup${idParam}?feedId=${feedId}&sessionId=${sessionId || ''}`
+    const locationGroupStopsUrl = `/api/editor/secure/locationgroupstop${idParam}?feedId=${feedId}&sessionId=${sessionId || ''}`
+
+    dispatch(secureFetch(locationGroupStopsUrl, method, data))
+      .then(res => res.json())
+      .then(savedEntity => {
+        dispatch(savedGtfsEntity())
+        const namespace = getEditorNamespace(feedId, getState())
+        // Refetch entity and replace in store
+        if (refetch) {
+          dispatch(fetchGTFSEntities({
+            editor: true,
+            id: savedEntity.id,
+            namespace,
+            replaceNew: !notNew,
+            type: 'locationgroupstop'
+          }))
+        } else {
+          // Push new entity into store.
+          dispatch(receivedNewEntity({component: 'locationgroupstop', entity: savedEntity}))
+        }
+      })
+    return dispatch(secureFetch(locationGroupUrl, method, data))
+      .then(res => res.json())
+      .then(savedEntity => {
+        dispatch(savedGtfsEntity())
+        const namespace = getEditorNamespace(feedId, getState())
+        // Refetch entity and replace in store
+        if (refetch) {
+          dispatch(fetchGTFSEntities({
+            editor: true,
+            id: savedEntity.id,
+            namespace,
+            replaceNew: !notNew,
+            type: 'locationgroup'
+          }))
+        } else {
+          // Push new entity into store.
+          dispatch(receivedNewEntity({component: 'locationgroup', entity: savedEntity}))
+          Promise.resolve(savedEntity)
+        }
+      })
+  }
+}
+
 export function saveLocation (
   feedId: ?string,
   location: GtfsLocation,