feat(fare_leg_rules): add fare_leg_rules.txt data to editor

Author: josh-willis-arcadis

gtfs.yml

@@ -1096,7 +1096,7 @@
   fields:
     - name: leg_group_id
       required: false
-      inputType: GTFS_ID # FARE-TODO: should this be text or id?
+      inputType: TEXT # FARE-TODO: should this be text or id?
     - name: network_id
       required: false
       inputType: TEXT # FARE-TODO: Needs to reference networks.network_id or routes.network_id

lib/editor/actions/editor.js

@@ -508,21 +508,12 @@ export function fetchBaseGtfs ({
             fare_media_id
           }
           fare_transfer_rule (limit: -1) {
+            id
             from_leg_group_id
             to_leg_group_id
-            fare_product_id
-            transfer_count
-            duration_limit
           }
-          fare_leg_rule {
-            leg_group_id
-            network_id
-            from_area_id
-            to_area_id
-            from_timeframe_group_id
-            to_timeframe_group_id
+          fare_leg_rule (limit: -1) {
             fare_product_id
-            rule_priority
             id
           }
           routes (limit: -1) {

lib/editor/util/ui.js

@@ -101,7 +101,7 @@ export const GTFS_ICONS = [
   {
     id: 'fare_leg_rule',
     tableName: 'fare_leg_rule',
-    icon: 'link',
+    icon: 'book',
     addable: true,
     title: 'FARE LEG RULE TEST TITLE',
     label: 'FARE LEG RULE TEST LABEL'

lib/gtfs/util/index.js

@@ -21,10 +21,8 @@ export function getEntityIdField (type: string): string {
       return 'fare_media_id'
     case 'fare_transfer_rule':
       return 'id'
-    // FARE-TODO: what to do with fare_transfer_rules.txt
     case 'fare_leg_rule':
       return 'id'
-    // FARE-TODO: what to do with fare_leg_rules.txt
     case 'calendar':
       return 'service_id'
     case 'stop':
@@ -123,10 +121,12 @@ export function getGraphQLFieldsForEntity (type: string, editor: boolean = false
       `
     case 'fare_transfer_rule':
       return `
+      id
       ${fields}
       `
     case 'fare_leg_rule':
       return `
+      id
       ${fields}
       `
     case 'pattern':
@@ -172,7 +172,7 @@ export function getEntityGraphQLRoot (type: string): string {
       return 'fare_product'
     case 'fare_media':
       return 'fare_media'
-    case 'fare_transer_rule':
+    case 'fare_transfer_rule':
       return 'fare_transfer_rule'
     case 'fare_leg_rule':
       return 'fare_leg_rule'
@@ -207,18 +207,18 @@ export function getEntityTableString (type: string): string {
       return 'agency'
     case 'calendar':
       return 'calendar'
-    case 'fare':
-      return 'fare_attributes'
+    case 'fare': // Fares v1
+      return 'fare_attributes' // Fares v1
     case 'fare_product':
       return 'fare_product'
     case 'fare_media':
       return 'fare_media'
-    case 'fare_rules':
-      return 'fare_rules'
+    case 'fare_rules': // Fares v1
+      return 'fare_rules' // Fares v1
     case 'fare_transfer_rule':
-      return 'fare_transfer_rules'
+      return 'fare_transfer_rule'
     case 'fare_leg_rule':
-      return 'fare_leg_rules'
+      return 'fare_leg_rule'
     case 'feedinfo':
       return 'feedinfo'
     case 'stop':