fix(editor): fix view all route alignments on editor map

landonreed · landonreed · commit e98debfc29f0 · 2018-04-29T12:07:47.000-04:00
fixes #76
diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
@@ -19,9 +19,28 @@ export function updateEditSetting (setting, value, activePattern) {
   }
 }
 
+export function updateActiveGtfsEntity (entity, component, props) {
+  return {
+    type: 'UPDATE_ACTIVE_GTFS_ENTITY',
+    entity,
+    component,
+    props
+  }
+}
+
+export function resetActiveGtfsEntity (entity, component) {
+  return {
+    type: 'RESET_ACTIVE_GTFS_ENTITY',
+    entity,
+    component
+  }
+}
+
 export const clearGtfsContent = createAction('CLEAR_GTFSEDITOR_CONTENT')
 export const savedGtfsEntity = createAction('SAVED_GTFS_ENTITY')
+export const deletingEntity = createAction('DELETING_ENTITY')
 const settingActiveGtfsEntity = createAction('SETTING_ACTIVE_GTFS_ENTITY')
+export const savingActiveGtfsEntity = createAction('SAVING_ACTIVE_GTFS_ENTITY')
 
 export function enterTimetableEditor () {
   return function (dispatch, getState) {
@@ -96,8 +115,8 @@ export function setActiveGtfsEntity (feedSourceId, component, entityId, subCompo
     const activeEntity = component === 'feedinfo'
       ? clone(activeTable)[0]
       : activeTable && entityId
-      ? clone(activeTable.find(e => e.id === entityId))
-      : null
+        ? clone(activeTable.find(e => e.id === entityId))
+        : null
     const activeSubEntity = activeEntity && activeEntity.tripPatterns
       ? clone(activeEntity.tripPatterns.find(p => p.id === subEntityId))
       : null
@@ -156,8 +175,6 @@ function constructEditorURL (feedSourceId, component, entityId, subComponent, su
   return url
 }
 
-export const savingActiveGtfsEntity = createAction('SAVING_ACTIVE_GTFS_ENTITY')
-
 export function saveActiveGtfsEntity (component, optionalEntity, refetch = true) {
   return function (dispatch, getState) {
     const {active} = getState().editor.data
@@ -224,8 +241,6 @@ export function saveEntity (feedId, entity, component, refetch = true) {
   }
 }
 
-export const deletingEntity = createAction('DELETING_ENTITY')
-
 /**
  * Generic delete function for editor GTFS entities.
  */
@@ -259,20 +274,3 @@ export function deleteGtfsEntity (feedId, component, entityId, routeId) {
       })
   }
 }
-
-export function updateActiveGtfsEntity (entity, component, props) {
-  return {
-    type: 'UPDATE_ACTIVE_GTFS_ENTITY',
-    entity,
-    component,
-    props
-  }
-}
-
-export function resetActiveGtfsEntity (entity, component) {
-  return {
-    type: 'RESET_ACTIVE_GTFS_ENTITY',
-    entity,
-    component
-  }
-}
diff --git a/lib/editor/actions/tripPattern.js b/lib/editor/actions/tripPattern.js
@@ -7,10 +7,6 @@ import {savedGtfsEntity, updateEditSetting} from './active'
 import {entityIsNew} from '../util/objects'
 import {getEditorNamespace} from '../util/gtfs'
 
-// TRIP PATTERNS
-
-const requestingTripPatterns = createAction('REQUESTING_TRIP_PATTERNS')
-const receiveTripPatterns = createAction('RECEIVE_TRIP_PATTERNS')
 export const undoActiveTripPatternEdits = createAction('UNDO_TRIP_PATTERN_EDITS')
 export const setActiveStop = createAction('SET_ACTIVE_PATTERN_STOP')
 export const togglingPatternEditing = createAction('TOGGLE_PATTERN_EDITING')
@@ -25,20 +21,14 @@ export function togglePatternEditing () {
   }
 }
 
+/**
+ * Fetch all trip patterns for the feed. Used to display pattern shapes in map
+ * layer.
+ */
 export function fetchTripPatterns (feedId) {
   return function (dispatch, getState) {
-    dispatch(requestingTripPatterns(feedId))
-    const {sessionId} = getState().editor.data.lock
-    const url = `/api/editor/secure/pattern?feedId=${feedId}&sessionId=${sessionId}`
-    return dispatch(secureFetch(url))
-      .then(res => {
-        if (res.status >= 400) return []
-        return res.json()
-      })
-      .then(tripPatterns => {
-        dispatch(receiveTripPatterns({feedId, tripPatterns}))
-        return tripPatterns
-      })
+    const namespace = getEditorNamespace(feedId, getState())
+    return dispatch(fetchGTFSEntities({namespace, type: 'pattern', editor: true}))
   }
 }
 
diff --git a/lib/editor/components/map/EditorMapLayersControl.js b/lib/editor/components/map/EditorMapLayersControl.js
@@ -30,7 +30,7 @@ export default class EditorMapLayersControl extends Component {
                   weight={2}
                   color='#888'>
                   <Tooltip sticky>
-                    <span>{tp.name}</span>
+                    <span>{tp.name} ({tp.route_id})</span>
                   </Tooltip>
                 </Polyline>
               )
diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
@@ -222,20 +222,6 @@ const data = (state = defaultState, action) => {
         })
       }
       return state
-    // Handle trip patterns to be drawn as overlay layer in editor
-    case 'RECEIVE_TRIP_PATTERNS':
-      return update(state, {
-        tripPatterns: {$set:
-          // FIXME: Update for new trip pattern data structure
-          action.payload.tripPatterns.map(pattern => {
-            return {
-              id: pattern.id,
-              name: pattern.name,
-              latLngs: pattern.shape ? (pattern.shape.coordinates.map(c => ll.fromCoordinates(c))) : null
-            }
-          })
-        }
-      })
     case 'DELETING_STOP':
       stopIndex = stops.findIndex(s => s.id === action.stop.id)
       return update(state, {
@@ -251,6 +237,29 @@ const data = (state = defaultState, action) => {
         // for viewing validation result details).
         return state
       }
+      if (component === 'pattern') {
+        // Handle trip patterns to be drawn as overlay layer in editor
+        console.log('setting trip patterns', data)
+        return update(state, {
+          tripPatterns: {$set:
+            // FIXME: Update for new trip pattern data structure
+            data.feed.patterns.map(pattern => {
+              return {
+                id: pattern.id,
+                name: pattern.name,
+                route_id: pattern.route_id,
+                latLngs: pattern.shape_points
+                  ? (pattern.shape_points.map(sp =>
+                    ({
+                      lon: sp.shape_pt_lon,
+                      lat: sp.shape_pt_lat
+                    })))
+                  : null
+              }
+            })
+          }
+        })
+      }
       const tableName = getKeyForId(component, 'tableName')
       // get entities from payload
       const mappingStrategy = getMapToGtfsStrategy(component)
diff --git a/lib/editor/util/gtfs.js b/lib/editor/util/gtfs.js
@@ -51,7 +51,7 @@ export const COMPONENT_LIST = [
 export function getTableById (tableData: any, id: string, emptyArrayOnNull: boolean = true): any {
   const tableName = getKeyForId(id, 'tableName')
   if (!tableName) {
-    console.error(`Component ${id} not found in list of tables.`)
+    console.warn(`Component ${id} not found in list of tables.`)
     return null
   }
   const table = tableData[tableName]
@@ -315,8 +315,8 @@ export function getAbbreviatedStopName (stop: GtfsStop, maxCharactersPerWord: nu
   stopNameParts.length === 3 &&
   stop.stop_name.length > maxCharactersPerWord * 2
     ? `${stopNameParts[0]
-        .substr(0, maxCharactersPerWord)
-        .trim()}... ${stopNameParts[2].substr(0, maxCharactersPerWord).trim()}`
+      .substr(0, maxCharactersPerWord)
+      .trim()}... ${stopNameParts[2].substr(0, maxCharactersPerWord).trim()}`
     : stop.stop_name
 }
 
diff --git a/lib/gtfs/util/index.js b/lib/gtfs/util/index.js
@@ -40,77 +40,89 @@ export function getGraphQLFieldsForEntity (type: string, editor: boolean = false
   const entityTableString = getEntityTableString(type)
   const table = getGtfsSpec().find(table => table.id === entityTableString)
   let fields = ''
-  if (table) {
-    fields = table.fields
-      // Only filter required fields if not fetching for editor
-      // FIXME: This fetches only the required fields for feed info because there
-      // are missing fields in the GraphQL schema and database (default color and
-      // default route type).
-      .filter(field => type === 'feedinfo' ? !field.datatools : editor ? field : field.required && !field.datatools)
-      .map(field => field.name)
-      .join('\n')
-    // stop_times are a special case because they must be requested as a
-    // nested list underneath a trip
-    // console.log(type)
-    switch (type.toLowerCase()) {
-      case 'stoptime':
-        return `
-          trip_id
-          stop_times {
-            ${fields}
-          }
-        `
-      case 'fare':
-        // console.log('getting fare fields')
-        return `
-          ${fields}
-          fare_rules (limit: -1) {
-            id
-            fare_id
-            route_id
-            origin_id
-            destination_id
-            contains_id
-          }
-        `
-      case 'route':
-        return `
+  if (!table) {
+    console.warn(`Could not find table fare entity ${type}`)
+  }
+  fields = table
+    ? table.fields
+    // Only filter required fields if not fetching for editor
+    // FIXME: This fetches only the required fields for feed info because there
+    // are missing fields in the GraphQL schema and database (default color and
+    // default route type).
+    .filter(field => type === 'feedinfo' ? !field.datatools : editor ? field : field.required && !field.datatools)
+    .map(field => field.name)
+    .join('\n')
+    : ''
+  // stop_times are a special case because they must be requested as a
+  // nested list underneath a trip
+  console.log(type)
+  const shapeFields = `shape_points: shape (limit: -1) {
+    shape_pt_lon
+    shape_pt_lat
+    shape_pt_sequence
+    point_type
+    shape_dist_traveled
+  }`
+  const patternStopFields = `pattern_stops (limit: -1) {
+    id
+    stop_id
+    default_travel_time
+    default_dwell_time
+    stop_sequence
+    shape_dist_traveled
+    pickup_type
+    drop_off_type
+    timepoint
+  }`
+  switch (type.toLowerCase()) {
+    case 'stoptime':
+      return `
+        trip_id
+        stop_times {
           ${fields}
-          tripPatterns: patterns (limit: -1) {
-            id
-            shape_id
-            pattern_id
-            trip_count
-            route_id
-            direction_id
-            use_frequency
-            name
-            pattern_stops (limit: -1) {
-              id
-              stop_id
-              default_travel_time
-              default_dwell_time
-              stop_sequence
-              shape_dist_traveled
-              pickup_type
-              drop_off_type
-              timepoint
-            }
-            shape_points: shape (limit: -1) {
-              shape_pt_lon
-              shape_pt_lat
-              shape_pt_sequence
-              point_type
-              shape_dist_traveled
-            }
-          }
-        `
-      default:
-        return fields
-    }
-  } else {
-    console.error(`Could not find table fare entity ${type}`)
-    return ''
+        }
+      `
+    case 'fare':
+      // console.log('getting fare fields')
+      return `
+        ${fields}
+        fare_rules (limit: -1) {
+          id
+          fare_id
+          route_id
+          origin_id
+          destination_id
+          contains_id
+        }
+      `
+    case 'pattern':
+      return `
+      shape_id
+      pattern_id
+      route_id
+      direction_id
+      use_frequency
+      name
+      ${shapeFields}
+      `
+    case 'route':
+      return `
+        ${fields}
+        tripPatterns: patterns (limit: -1) {
+          id
+          shape_id
+          pattern_id
+          trip_count
+          route_id
+          direction_id
+          use_frequency
+          name
+          ${patternStopFields}
+          ${shapeFields}
+        }
+      `
+    default:
+      return fields
   }
 }
 
diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
@@ -190,8 +190,7 @@ export function fetchGTFSEntities ({namespace, id, type, editor = false, replace
     const idFieldType = editor ? 'Int' : '[String]'
     const graphQLRoot = getEntityGraphQLRoot(type)
     if (!graphQLRoot || !entityIdField) {
-      console.error(`No graphql table or filter field for ${type}`)
-      return
+      console.warn(`No graphql table or filter field for ${type}`)
     }
     const fields = getGraphQLFieldsForEntity(type, editor)
     // If fetching for the editor, query on id which is an Int

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export default class EditorMapLayersControl extends Component {`
`30`	`30`	`weight={2}`
`31`	`31`	`color='#888'>`
`32`	`32`	`<Tooltip sticky>`
`33`		`- <span>{tp.name}</span>`
	`33`	`+ <span>{tp.name} ({tp.route_id})</span>`
`34`	`34`	`</Tooltip>`
`35`	`35`	`</Polyline>`
`36`	`36`	`)`