fix(editor): fix upload of route shapefile for use as visual aid

fixes #20

Author: landonreed

lib/editor/components/FeedInfoPanel.js

@@ -5,6 +5,7 @@ import { browserHistory } from 'react-router'
 
 import CreateSnapshotModal from './CreateSnapshotModal'
 import SelectFileModal from '../../common/components/SelectFileModal.js'
+import {isValidZipFile} from '../../common/util/util'
 import { GTFS_ICONS } from '../util/ui'
 
 const PANEL_WIDTH = 400
@@ -64,16 +65,17 @@ export default class FeedInfoPanel extends Component {
   _openSnapshotModal = () => this.refs.snapshotModal.open()
 
   showUploadFileModal = () => {
+    const {displayRoutesShapefile, feedSource} = this.props
     this.refs.selectFileModal.open({
       title: 'Upload route shapefile',
-      body: 'Select a zipped shapefile to display on map:',
+      body: `Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.`,
       onConfirm: (files) => {
-        const nameArray = files[0].name.split('.')
-        if (files[0].type !== 'application/zip' || nameArray[nameArray.length - 1] !== 'zip') {
-          return false
-        } else {
-          this.props.displayRoutesShapefile(this.props.feedSource, files[0])
+        const file = files[0]
+        if (isValidZipFile(file)) {
+          displayRoutesShapefile(feedSource, file)
           return true
+        } else {
+          return false
         }
       },
       errorMessage: 'Uploaded file must be a valid zip file (.zip).'

lib/editor/components/map/EditorMap.js

@@ -1,5 +1,5 @@
 import React, {Component} from 'react'
-import {Map, ZoomControl, FeatureGroup} from 'react-leaflet'
+import {Map, ZoomControl, FeatureGroup, GeoJSON} from 'react-leaflet'
 import {shallowEqual} from 'react-pure-render'
 
 import AddableStopsLayer from './AddableStopsLayer'
@@ -276,9 +276,16 @@ export default class EditorMap extends Component {
           tripPatterns={tripPatterns}
           user={user}
           stops={tableData.stop} />
+        {/* Primary editor map components (routes, stops, etc.) to be rendered based on active components */}
         {!hidden &&
           this._getMapComponents(activeComponent, activeEntity, subEntityId, activePattern, tableData.stop, editSettings, mapState)
         }
+        {/* Routes GeoJSON to display as a visual aid in constructing trip patterns */}
+        {mapState.routesGeojson &&
+          <GeoJSON
+            key={mapState.routesGeojson.key}
+            data={mapState.routesGeojson} />
+        }
       </Map>
     )
   }