fix(editor): default new stop location to center of bounds (rather than 0,0)

Author: landonreed

lib/editor/components/map/EditorMap.js

@@ -83,7 +83,7 @@ export default class EditorMap extends Component {
         const stopLatLng = clickToLatLng(e.latlng)
         if (activeEntity && entityIsNew(activeEntity)) {
           updateActiveEntity(activeEntity, activeComponent, stopLatLng)
-          this.refs[activeEntity.id].leafletElement.setLatLng(e.latlng)
+          this.refs[activeEntity.id] && this.refs[activeEntity.id].leafletElement.setLatLng(e.latlng)
         } else if (entities && entities.findIndex(entityIsNew) === -1) {
           // if a new stop should be constructed
           const stop = await constructStop(e.latlng, feedSource.id)

lib/editor/util/gtfs.js

@@ -147,12 +147,14 @@ export const generateProps = (component: string, editorState: any): any => {
           : 3
       }
     case 'stop':
+      const {bounds} = editorState.mapState
       const stopId = generateUID()
+      const center = bounds && bounds.getCenter()
       return {
         stop_id: stopId,
         stop_name: null,
-        stop_lat: 0,
-        stop_lon: 0
+        stop_lat: center ? center.lat : 0,
+        stop_lon: center ? center.lng : 0
       }
     case 'scheduleexception':
       return {
@@ -258,7 +260,9 @@ export function findEntityByGtfsId (
 }
 
 export function getEntityName (entity: ?Entity): string {
+  const NO_NAME = '[no name]'
   if (!entity) {
+    // FIXME: When will this occur...
     return '[Unnamed]'
   }
 
@@ -289,7 +293,7 @@ export function getEntityName (entity: ?Entity): string {
         ? `${stop.stop_name} (${stop.stop_code})`
         : stop.stop_name && stop.stop_id
           ? `${stop.stop_name} (${stop.stop_id})`
-          : stop.stop_name || '[no name]'
+          : stop.stop_name || NO_NAME
     case 'route_short_name':
       const route: GtfsRoute = ((entity: any): GtfsRoute)
       if (route.route_short_name &&
@@ -302,7 +306,7 @@ export function getEntityName (entity: ?Entity): string {
       } else if (route.route_long_name && route.route_long_name !== '""') {
         return route.route_long_name
       } else {
-        return '[no name]'
+        return NO_NAME
       }
     case 'description': // service calendar
       const serviceCalendar: ServiceCalendar = ((entity: any): ServiceCalendar)
@@ -311,13 +315,13 @@ export function getEntityName (entity: ?Entity): string {
         : ''}`
     default:
       const otherEntityType: any = entity
-      return otherEntityType[nameKey] || '[no name]'
+      return otherEntityType[nameKey] || NO_NAME
   }
 }
 
 export function getAbbreviatedStopName (stop: GtfsStop, maxCharactersPerWord: number = 10): string {
   const stopName = getEntityName(stop)
-  const stopNameParts = stopName ? stopName.split(/(\band\b|&|@|:|\+)+/i) : null
+  const stopNameParts = stopName ? stopName.split(/(\band\b|&|@|:|\/|\+)+/i) : null
   return stopNameParts &&
   stopNameParts.length === 3 &&
   stop.stop_name.length > maxCharactersPerWord * 2