feat(gtfs.yml and validation.js): Updated GTFS Spec for stops.txt and agency.txt

Rob Gregg · Rob Gregg · commit b2997454b4de · 2021-05-06T16:50:55.000+01:00
#663
diff --git a/gtfs.yml b/gtfs.yml
@@ -151,12 +151,12 @@
     columnWidth: 12
     helpContent: "The stop_desc field contains a description of a stop. Please provide useful, quality information. Do not simply duplicate the name of the stop."
   - name: "stop_lat"
-    required: true
+    required: false
     inputType: LATITUDE
     columnWidth: 6
     helpContent: "The stop_lat field contains the latitude of a stop or station. The field value must be a valid WGS 84 latitude."
   - name: "stop_lon"
-    required: true
+    required: false
     inputType: LONGITUDE
     columnWidth: 6
     helpContent: "The stop_lon field contains the longitude of a stop or station. The field value must be a valid WGS 84 longitude value from -180 to 180."
@@ -180,6 +180,12 @@
       text: Stop (0)
     - value: '1'
       text: Station (1)
+    - value: '2'
+      text: Entrance/Exit (2)
+    - value: '3'
+      text: Generic Node (3)
+    - value: '4'
+      text: Boarding Area (4)
     columnWidth: 12
     helpContent: "The location_type field identifies whether this stop ID represents a stop or station. If no location type is specified, or the location_type is blank, stop IDs are treated as stops. Stations may have different properties from stops when they are represented on a map or used in trip planning."
   - name: "parent_station"
diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
@@ -25,6 +25,7 @@ export function doesNotExist (value: any): boolean {
  * Returns false if the value is ok.
  * Returns an EditorValidationIssue object if the value is not ok.
  */
+// eslint-disable-next-line complexity
 export function validate (
   field: GtfsSpecField,
   value: any,
@@ -36,8 +37,8 @@ export function validate (
   const valueDoesNotExist = doesNotExist(value)
   const isRequiredButEmpty = required && valueDoesNotExist
   const isOptionalAndEmpty = !required && valueDoesNotExist
-  let reason = 'Required field must not be empty'
   const agencies = getTableById(tableData, 'agency')
+  let reason = 'Required field must not be empty'
 
   // setting as a variable here because of eslint bug
   type CheckPositiveOutput = {
@@ -100,12 +101,19 @@ export function validate (
         (indices.length > 1 ||
           (indices.length > 0 && entities[indices[0]].id !== entity.id))
       )
+      console.log(idList.length)
+      console.log({entity})
+      if (agencies.length > 1 && entity.agency_id === null) {
+        reason = 'Identifier is required if more than one agency exists'
+        return {field: name, invalid: isRequiredButEmpty, reason}
+      }
       if (isRequiredButEmpty || isNotUnique) {
         if (isNotUnique) {
           reason = 'Identifier must be unique'
         }
         return {field: name, invalid: isRequiredButEmpty || isNotUnique, reason}
-      } else {
+      } 
+      else {
         return false
       }
     case 'TEXT':
@@ -175,21 +183,29 @@ export function validate (
       }
     case 'LATITUDE':
       const isNotLat = value > 90 || value < -90
-      if (isRequiredButEmpty || isNotLat) {
-        if (isNotLat) {
-          reason = 'Field must be valid latitude.'
+      if (isNotLat) {
+        reason = 'Field must be valid latitude.'
+        return {field: name, invalid: isOptionalAndEmpty || isNotLat, reason}
+      }
+      if (entity && entity.location_type >= 2) {
+        if (isOptionalAndEmpty) {
+          reason = '1 Latitude and Longitude are required for your current location type'
+          return {field: name, invalid: isOptionalAndEmpty || isNotLat, reason}
         }
-        return {field: name, invalid: isRequiredButEmpty || isNotLat, reason}
       } else {
         return false
       }
     case 'LONGITUDE':
       const isNotLng = value > 180 || value < -180
-      if (isRequiredButEmpty || isNotLng) {
-        if (isNotLng) {
-          reason = 'Field must be valid longitude.'
+      if (isNotLng) {
+        reason = 'Field must be valid longitude.'
+        return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
+      }
+      if (entity && entity.location_type >= 2) {
+        if (isOptionalAndEmpty) {
+          reason = '1 Latitude and Longitude are required for your current location type'
+          return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
         }
-        return {field: name, invalid: isRequiredButEmpty || isNotLng, reason}
       } else {
         return false
       }
