feat(opportunity-datasets): Display all opportunity datasets with dot…

…s that have `showOnMap` set to
conveyal · Sep 25, 2018 · b5b944b · b5b944b
1 parent 5213247
commit b5b944b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/components/application.js b/src/components/application.js
@@ -48,7 +48,7 @@ type Props = {
     grids: string[],
     networks: Network[]
   },
-  drawActiveOpportunityDataset: Function,
+  drawOpportunityDatasets: any[],
   drawIsochrones: Function[],
   geocode: (string, Function) => void,
   geocoder: GeocoderStore,
@@ -253,8 +253,8 @@ export default class Application extends Component<Props, State> {
             updateMap={p.updateMap}
             zoom={p.map.zoom}
           >
-            {p.drawActiveOpportunityDataset &&
-              <Gridualizer drawTile={p.drawActiveOpportunityDataset} zoom={p.map.zoom} />}
+            {p.drawOpportunityDatasets.map((drawTile, i) => drawTile &&
+              <Gridualizer drawTile={drawTile} key={`draw-od-${i}`} zoom={p.map.zoom} />)}
 
             {!p.isLoading && p.isochrones.map((iso, i) => !iso
               ? null

diff --git a/src/index.js b/src/index.js
@@ -19,7 +19,7 @@ function mapStateToProps (state, ownProps) {
     activeNetworkIndex: select.activeNetworkIndex(state, ownProps),
     activeTransitive: select.activeTransitive(state, ownProps),
     allTransitiveData: select.allTransitiveData(state, ownProps),
-    drawActiveOpportunityDataset: select.drawActiveOpportunityDataset(state, ownProps),
+    drawOpportunityDatasets: select.drawOpportunityDatasets(state, ownProps),
     drawIsochrones: select.drawIsochrones(state, ownProps),
     isochrones: select.isochrones(state, ownProps),
     isLoading: select.loading(state, ownProps),

diff --git a/...ectors/draw-active-opportunity-dataset.js → src/selectors/draw-opportunity-datasets.js b/...ectors/draw-active-opportunity-dataset.js → src/selectors/draw-opportunity-datasets.js
@@ -2,14 +2,13 @@
 import gridualizer from '@conveyal/gridualizer'
 import {createSelector} from 'reselect'
 
-import selectActiveOpportunityDataset from './active-opportunity-dataset'
-
 export default createSelector(
-  selectActiveOpportunityDataset,
-  (grid) => grid && grid.showOnMap &&
+  (state) => state.data.grids,
+  (grids = []) => grids.map(grid => grid.showOnMap &&
     gridualizer.createDrawTile({
       colorizer: gridualizer.colorizers.dot(),
       grid,
       interpolator: gridualizer.interpolators.bicubic
     })
+  )
 )
diff --git a/src/selectors/index.js b/src/selectors/index.js
@@ -3,7 +3,7 @@ export {default as accessibility} from './accessibility'
 export {default as activeNetworkIndex} from './active-network-index'
 export {default as activeTransitive} from './active-transitive'
 export {default as allTransitiveData} from './all-transitive-data'
-export {default as drawActiveOpportunityDataset} from './draw-active-opportunity-dataset'
+export {default as drawOpportunityDatasets} from './draw-opportunity-datasets'
 export {default as drawIsochrones} from './draw-isochrones'
 export {default as isochrones} from './isochrones'
 export {default as loading} from './loading'