Updates to gtfs spec changes - front end UI fields only

lib/editor/util/validation.js

@@ -38,8 +38,14 @@ export function validate (
   const isRequiredButEmpty = required && valueDoesNotExist
   const isOptionalAndEmpty = !required && valueDoesNotExist
   const agencies = getTableById(tableData, 'agency')
+  let locationType: ?number = 0
   let reason = 'Required field must not be empty'
 
+  // entity.locationtype is a string.  Convert to number for conditinals later on.
+  if (entity && entity.location_type) {
+    locationType = parseInt(entity.location_type)
+  }
+
   // setting as a variable here because of eslint bug
   type CheckPositiveOutput = {
     num?: number,
@@ -101,9 +107,11 @@ 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) {
+      if (
+        name === 'agency_id' &&
+        idList.length > 1 &&
+        valueDoesNotExist
+      ) {
         reason = 'Identifier is required if more than one agency exists'
         return {field: name, invalid: isRequiredButEmpty, reason}
       }
@@ -184,30 +192,28 @@ export function validate (
       const isNotLat = value > 90 || value < -90
       if (isNotLat) {
         reason = 'Field must be valid latitude.'
-        return {field: name, invalid: isOptionalAndEmpty || isNotLat, reason}
+        return {field: name, invalid: isNotLat, reason}
       }
-      if (entity && entity.location_type >= 2) {
+      if (!locationType || locationType < 2) {
         if (isOptionalAndEmpty) {
-          reason = '1 Latitude and Longitude are required for your current location type'
-          return {field: name, invalid: isOptionalAndEmpty || isNotLat, reason}
+          reason = 'Latitude and Longitude are required for your current location type'
+          return {field: name, invalid: isOptionalAndEmpty, reason}
         }
-      } else {
-        return false
       }
+      return false
     case 'LONGITUDE':
       const isNotLng = value > 180 || value < -180
       if (isNotLng) {
         reason = 'Field must be valid longitude.'
         return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
       }
-      if (entity && entity.location_type >= 2) {
+      if (!locationType || locationType < 2) {
         if (isOptionalAndEmpty) {
-          reason = '1 Latitude and Longitude are required for your current location type'
+          reason = 'Latitude and Longitude are required for your current location type'
           return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
         }
-      } else {
-        return false
       }
+      return false
     case 'TIME':
     case 'NUMBER':
       const isNotANumber = isNaN(value)