Skip to content

Commit 22b06ca

Browse files
committed
intelligence map - replace polygon with geojson
1 parent 1405e1e commit 22b06ca

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

src/components/intelligence-map.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import { FlyToInterpolator, MapView } from '@deck.gl/core'
1010
import DeckGL from '@deck.gl/react'
1111
import { StaticMap } from 'react-map-gl'
12-
import { PolygonLayer } from '@deck.gl/layers';
12+
import { GeoJsonLayer } from '@deck.gl/layers';
1313

1414
import { styled, setup } from 'goober'
1515

@@ -104,18 +104,24 @@ const IntelligenceMap = ({
104104
return fillColor
105105
}
106106

107-
layers = new PolygonLayer({
107+
layers = new GeoJsonLayer({
108108
id: 'polygon-layer',
109109
data: GeoJson,
110110
pickable: true,
111-
stroked: true,
111+
stroked: false,
112+
extruded: true,
112113
filled: true,
113114
wireframe: true,
115+
getLineWidth: 1,
114116
lineWidthMinPixels: 1,
115-
getPolygon: d => d.geojson.coordinates,
116-
getFillColor: d => handleFillColor(d),
117-
getLineColor: [80, 80, 80],
117+
lineWidthScale: 20,
118+
getLineColor: (data => {
119+
return [80, 80, 80]
120+
}),
118121
getLineWidth: 1,
122+
getElevation: 30,
123+
getFillColor: d => handleFillColor(d),
124+
getRadius: 100,
119125
updateTriggers: {
120126
getFillColor: [hoverProvince]
121127
},
@@ -169,7 +175,7 @@ const IntelligenceMap = ({
169175
layers={[layers]}
170176
controller={true}
171177
onHover={finalOnHover}
172-
getTooltip={getTooltip}
178+
getTooltip={data => data.object && data.object.pr_name}
173179
getCursor={getCursor}
174180
onClick={({ object }) => {
175181
if(!object) {

stories/data/pois-geojson-province.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

stories/data/pois-polygon-province.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

stories/deck.stories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { storiesOf } from '@storybook/react'
44
import POIMap from '../src/components/poi-map'
55
import Map from '../src/components/generic-map'
66
import IntelligenceMap from '../src/components/intelligence-map'
7-
import geoProvinceJson from './data/pois-polygon-province.json'
7+
import geoProvinceJson from './data/pois-geojson-province.json'
88

99
const MAPBOX_ACCESS_TOKEN = process.env.MAPBOX_ACCESS_TOKEN
1010

0 commit comments

Comments
 (0)