Skip to content

Commit d824419

Browse files
committed
intelligence map - yarn lint error fix
intelligence map - lint fix tooltip
1 parent 52d5979 commit d824419

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

src/components/intelligence-map.js

Lines changed: 19 additions & 20 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 { GeoJsonLayer, TextLayer } from '@deck.gl/layers';
12+
import { GeoJsonLayer, TextLayer } from '@deck.gl/layers'
1313

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

@@ -89,7 +89,7 @@ const IntelligenceMap = ({
8989

9090
useEffect(() => {
9191
setGeoJson(geoProvinceJson)
92-
}, []);
92+
}, [])
9393

9494
const handleFillColor = d => {
9595
let fillColor = [153, 204, 255, 70]
@@ -113,7 +113,6 @@ const IntelligenceMap = ({
113113
extruded: true,
114114
filled: true,
115115
wireframe: true,
116-
getLineWidth: 1,
117116
lineWidthMinPixels: 1,
118117
lineWidthScale: 20,
119118
getText: d => d.pr_name,
@@ -122,23 +121,23 @@ const IntelligenceMap = ({
122121
getFillColor: d => handleFillColor(d),
123122
getRadius: 100,
124123
updateTriggers: {
125-
getFillColor: [hoverProvince]
124+
getFillColor: [hoverProvince],
126125
},
127-
onHover: d => setHoverProvince(d)
128-
}),
129-
130-
new TextLayer({
131-
id: 'text-layer',
132-
data: 'https://raw.githubusercontent.com/Clavicus/Testing-Requests/master/canadian-provinces.json',
133-
pickable: true,
134-
getPosition: d => [d.longitude, d.latitude],
135-
getText: d => d.short,
136-
getSize: 30,
137-
getAngle: 0,
138-
getTextAnchor: 'middle',
139-
getAlignmentBaseline: 'center',
140-
}),
141-
];
126+
onHover: d => setHoverProvince(d),
127+
}),
128+
129+
new TextLayer({
130+
id: 'text-layer',
131+
data: 'https://raw.githubusercontent.com/Clavicus/Testing-Requests/master/canadian-provinces.json',
132+
pickable: true,
133+
getPosition: d => [d.longitude, d.latitude],
134+
getText: d => d.short,
135+
getSize: 30,
136+
getAngle: 0,
137+
getTextAnchor: 'middle',
138+
getAlignmentBaseline: 'center',
139+
}),
140+
]
142141

143142
useLayoutEffect(() => {
144143
setViewState(o => ({
@@ -187,7 +186,7 @@ const IntelligenceMap = ({
187186
layers={layers}
188187
controller={true}
189188
onHover={finalOnHover}
190-
getTooltip={data => data.object && data.object.pr_name}
189+
getTooltip={getTooltip}
191190
getCursor={getCursor}
192191
onClick={({ object }) => {
193192
if(!object) {

0 commit comments

Comments
 (0)