@defra/interactive-map 0.0.59-alpha → 0.0.61-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/templates/add-polygons.njk +2 -2
- package/assets/templates/add-symbols.njk +2 -2
- package/dist/css/index.css +1 -1
- package/dist/esm/im-core.js +1 -1
- package/dist/esm/im-shell.js +1 -1
- package/dist/umd/im-core.js +1 -1
- package/dist/umd/index.js +1 -1
- package/docs/api/button-definition.md +11 -0
- package/docs/api/context.md +2 -0
- package/docs/api/panel-definition.md +30 -0
- package/docs/api/symbol-config.md +12 -0
- package/docs/api.md +21 -2
- package/docs/assets/images/slot-map.svg +3 -3
- package/docs/plugins/datasets.md +11 -1
- package/docs/plugins/draw.md +26 -0
- package/package.json +1 -1
- package/plugins/datasets/dist/esm/index.js +1 -1
- package/plugins/datasets/dist/esm/layerAdapter.js +1 -1
- package/plugins/datasets/dist/umd/im-datasets-ml-adapter.js +1 -1
- package/plugins/datasets/dist/umd/im-datasets-ol-adapter.js +1 -1
- package/plugins/datasets/dist/umd/im-datasets-plugin.js +1 -1
- package/plugins/datasets/dist/umd/index.js +1 -1
- package/plugins/datasets/src/index.js +0 -1
- package/plugins/datasets/src/index.test.js +2 -8
- package/plugins/datasets/src/registry/dataset.test.js +9 -0
- package/plugins/draw/dist/esm/im-draw-ml-adapter.js +1 -1
- package/plugins/draw/dist/esm/im-draw-ol-adapter.js +1 -1
- package/plugins/draw/dist/esm/im-draw-plugin.js +1 -1
- package/plugins/draw/dist/umd/im-draw-ml-adapter.js +1 -1
- package/plugins/draw/dist/umd/im-draw-ol-adapter.js +1 -1
- package/plugins/draw/dist/umd/im-draw-plugin.js +1 -1
- package/plugins/draw/dist/umd/index.js +1 -1
- package/plugins/draw/src/DrawInit.jsx +3 -0
- package/plugins/draw/src/DrawInit.test.jsx +16 -0
- package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.js +19 -3
- package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.test.js +27 -0
- package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.js +10 -2
- package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.test.js +14 -0
- package/plugins/draw/src/defaults.js +4 -0
- package/plugins/draw/src/hooks/useSnapMinZoom.js +29 -0
- package/plugins/draw/src/hooks/useSnapMinZoom.test.js +82 -0
- package/plugins/draw/src/manifest.js +4 -1
- package/plugins/draw/src/manifest.test.js +15 -2
- package/plugins/draw/src/utils/snapMinZoom.js +8 -0
- package/plugins/draw/src/utils/snapMinZoom.test.js +22 -0
- package/plugins/interact/dist/esm/im-interact-plugin.js +1 -1
- package/plugins/interact/dist/umd/im-interact-plugin.js +1 -1
- package/plugins/map-key/dist/esm/im-map-key-plugin.js +1 -1
- package/plugins/map-key/dist/umd/im-map-key-plugin.js +1 -1
- package/plugins/map-key/src/manifest.js +1 -1
- package/plugins/search/dist/css/index.css +1 -1
- package/plugins/search/src/components/Form/Form.module.scss +1 -0
- package/providers/esri/dist/esm/im-esri-provider.js +1 -1
- package/providers/esri/src/esriProvider.js +10 -21
- package/providers/esri/src/utils/coords.js +37 -7
- package/providers/esri/src/utils/coords.test.js +22 -1
- package/providers/esri/src/utils/spatial.js +1 -47
- package/providers/maplibre/dist/esm/im-maplibre-provider.js +1 -1
- package/providers/maplibre/dist/umd/im-maplibre-provider.js +1 -1
- package/providers/maplibre/src/maplibreProvider.js +5 -14
- package/providers/maplibre/src/maplibreProvider.test.js +143 -146
- package/providers/maplibre/src/utils/spatial.js +0 -40
- package/providers/maplibre/src/utils/spatial.test.js +0 -35
- package/providers/openlayers/dist/esm/im-openlayers-provider.js +1 -1
- package/providers/openlayers/dist/umd/im-openlayers-provider.js +1 -1
- package/providers/openlayers/src/openlayersProvider.js +5 -14
- package/providers/openlayers/src/openlayersProvider.test.js +12 -10
- package/providers/openlayers/src/utils/spatial.js +0 -39
- package/providers/openlayers/src/utils/spatial.test.js +1 -26
- package/src/App/components/Hints/Hints.jsx +9 -21
- package/src/App/components/Hints/Hints.test.jsx +20 -33
- package/src/App/components/MapButton/MapButton.jsx +20 -2
- package/src/App/components/MapButton/MapButton.module.scss +15 -1
- package/src/App/components/MapButton/MapButton.test.jsx +21 -3
- package/src/App/components/Panel/Panel.jsx +16 -1
- package/src/App/components/Panel/Panel.test.jsx +44 -0
- package/src/App/components/Tooltip/Tooltip.jsx +29 -11
- package/src/App/components/Tooltip/Tooltip.test.jsx +45 -3
- package/src/App/components/Viewport/MapController.jsx +2 -0
- package/src/App/components/Viewport/MapController.test.jsx +3 -0
- package/src/App/hooks/useCrossHairAPI.js +27 -28
- package/src/App/hooks/useCrossHairAPI.test.js +64 -7
- package/src/App/hooks/useLayoutMeasurements.js +175 -131
- package/src/App/hooks/useLayoutMeasurements.test.js +227 -122
- package/src/App/hooks/useMapProviderOverrides.js +114 -35
- package/src/App/hooks/useMapProviderOverrides.test.js +188 -5
- package/src/App/hooks/useModalPanelBehaviour.js +18 -32
- package/src/App/hooks/useModalPanelBehaviour.test.js +45 -33
- package/src/App/hooks/useUserMoveTracking.js +65 -0
- package/src/App/hooks/useUserMoveTracking.test.js +99 -0
- package/src/App/hooks/useVisibleGeometry.js +35 -45
- package/src/App/hooks/useVisibleGeometry.test.js +149 -121
- package/src/App/layout/Layout.jsx +4 -4
- package/src/App/layout/layout.module.scss +124 -61
- package/src/App/renderer/mapButtons.js +1 -0
- package/src/App/renderer/mapButtons.test.js +8 -0
- package/src/App/store/AppProvider.jsx +3 -0
- package/src/App/store/appDispatchMiddleware.js +18 -10
- package/src/App/store/appDispatchMiddleware.test.js +42 -4
- package/src/App/store/mapActionsMap.js +2 -1
- package/src/App/store/mapActionsMap.test.js +6 -0
- package/src/App/store/mapReducer.js +2 -0
- package/src/App/store/mapReducer.test.js +1 -0
- package/src/InteractiveMap/InteractiveMap.js +3 -2
- package/src/InteractiveMap/InteractiveMap.test.js +2 -2
- package/src/config/events.js +1 -1
- package/src/config/mapPanelSlots.js +8 -0
- package/src/config/symbolConfig.js +1 -1
- package/src/scss/settings/_colors.scss +4 -0
- package/src/services/symbolRegistry.js +1 -1
- package/src/services/symbolRegistry.test.js +19 -0
- package/src/types.js +33 -8
- package/src/utils/getFitMove.js +73 -0
- package/src/utils/getFitMove.test.js +114 -0
- package/src/utils/getSafeZoneInset.js +122 -77
- package/src/utils/getSafeZoneInset.test.js +241 -54
- package/src/utils/getValueForStyle.js +10 -5
- package/src/utils/getValueForStyle.test.js +13 -2
- package/src/utils/renderedBoxes.js +25 -0
- package/src/utils/renderedBoxes.test.js +61 -0
- package/src/utils/screenBox.js +70 -0
- package/src/utils/screenBox.test.js +69 -0
- package/src/utils/symbolUtils.js +9 -9
- package/src/utils/symbolUtils.test.js +21 -0
- package/providers/esri/src/utils/spatial.test.js +0 -58
|
@@ -6,7 +6,7 @@ import { updateHighlightedFeatures } from './utils/highlightFeatures.js'
|
|
|
6
6
|
import { queryFeatures } from './utils/queryFeatures.js'
|
|
7
7
|
import { SymbolImageVariants, getSymbolIconLayout } from './utils/symbolImages.js'
|
|
8
8
|
import { PatternImages } from './utils/patternImages.js'
|
|
9
|
-
import { getAreaDimensions, getCardinalMove, getResolution, getPaddedBounds
|
|
9
|
+
import { getAreaDimensions, getCardinalMove, getResolution, getPaddedBounds } from './utils/spatial.js'
|
|
10
10
|
import { createSymbolRegistry } from '../../../src/services/symbolRegistry.js'
|
|
11
11
|
|
|
12
12
|
const symbolRegistry = createSymbolRegistry()
|
|
@@ -25,7 +25,6 @@ jest.mock('./utils/spatial.js', () => ({
|
|
|
25
25
|
getAreaDimensions: jest.fn(() => '400m by 750m'),
|
|
26
26
|
getCardinalMove: jest.fn(() => 'north'),
|
|
27
27
|
getBboxFromGeoJSON: jest.fn(() => [-1, 50, 1, 52]),
|
|
28
|
-
isGeometryObscured: jest.fn(() => true),
|
|
29
28
|
getResolution: jest.fn(() => 10),
|
|
30
29
|
getPaddedBounds: jest.fn(() => [[0, 0], [1, 1]])
|
|
31
30
|
}))
|
|
@@ -82,7 +81,7 @@ describe('MapLibreProvider', () => {
|
|
|
82
81
|
...config
|
|
83
82
|
})
|
|
84
83
|
|
|
85
|
-
const doInitMap = (
|
|
84
|
+
const doInitMap = (provider, extra = {}) => provider.initMap({
|
|
86
85
|
container: 'div',
|
|
87
86
|
padding: {},
|
|
88
87
|
mapStyle: { url: 'style.json', mapColorScheme: 'dark' },
|
|
@@ -92,20 +91,20 @@ describe('MapLibreProvider', () => {
|
|
|
92
91
|
})
|
|
93
92
|
|
|
94
93
|
test('it should have a name getter', () => {
|
|
95
|
-
const
|
|
96
|
-
expect(
|
|
94
|
+
const provider = makeProvider()
|
|
95
|
+
expect(provider.name).toBe('MapLibreProvider')
|
|
97
96
|
})
|
|
98
97
|
|
|
99
98
|
test('constructor spreads mapProviderConfig and sets capabilities', () => {
|
|
100
|
-
const
|
|
101
|
-
expect(
|
|
102
|
-
expect(
|
|
103
|
-
expect(
|
|
99
|
+
const provider = makeProvider({ mapProviderConfig: { crs: 'EPSG:4326', tileSize: 512 } })
|
|
100
|
+
expect(provider.crs).toBe('EPSG:4326')
|
|
101
|
+
expect(provider.tileSize).toBe(512)
|
|
102
|
+
expect(provider.capabilities.supportsMapSizes).toBe(true)
|
|
104
103
|
})
|
|
105
104
|
|
|
106
105
|
test('initMap: creates map, disables rotation, attaches events, emits MAP_READY', async () => {
|
|
107
|
-
const
|
|
108
|
-
await doInitMap(
|
|
106
|
+
const provider = makeProvider()
|
|
107
|
+
await doInitMap(provider)
|
|
109
108
|
expect(maplibreModule.Map).toHaveBeenCalledWith(expect.objectContaining({ style: 'style.json' }))
|
|
110
109
|
expect(map.touchZoomRotate.disableRotation).toHaveBeenCalled()
|
|
111
110
|
expect(map.setPadding).toHaveBeenCalled()
|
|
@@ -115,8 +114,8 @@ describe('MapLibreProvider', () => {
|
|
|
115
114
|
})
|
|
116
115
|
|
|
117
116
|
test('initMap: fitBounds called when bounds provided; skipped when absent; null mapStyle → style undefined', async () => {
|
|
118
|
-
const
|
|
119
|
-
await doInitMap(
|
|
117
|
+
const provider = makeProvider()
|
|
118
|
+
await doInitMap(provider, { bounds: [[0, 0], [1, 1]] })
|
|
120
119
|
expect(map.fitBounds).toHaveBeenCalledWith([[0, 0], [1, 1]], { duration: 0 })
|
|
121
120
|
|
|
122
121
|
map.fitBounds.mockClear()
|
|
@@ -127,11 +126,11 @@ describe('MapLibreProvider', () => {
|
|
|
127
126
|
})
|
|
128
127
|
|
|
129
128
|
test('load callback: creates labelNavigator with mapColorScheme; undefined when mapStyle null', async () => {
|
|
130
|
-
const
|
|
131
|
-
await doInitMap(
|
|
129
|
+
const provider = makeProvider()
|
|
130
|
+
await doInitMap(provider)
|
|
132
131
|
loadCallback()
|
|
133
132
|
expect(createMapLabelNavigator).toHaveBeenCalledWith(map, 'dark', expect.anything(), eventBus)
|
|
134
|
-
expect(
|
|
133
|
+
expect(provider.labelNavigator).toBeDefined()
|
|
135
134
|
|
|
136
135
|
createMapLabelNavigator.mockClear()
|
|
137
136
|
const p2 = makeProvider()
|
|
@@ -142,33 +141,33 @@ describe('MapLibreProvider', () => {
|
|
|
142
141
|
|
|
143
142
|
describe('isBaseMapReady', () => {
|
|
144
143
|
test('returns the result of map.getStyle() after map is initialised', async () => {
|
|
145
|
-
const
|
|
146
|
-
await doInitMap(
|
|
144
|
+
const provider = makeProvider()
|
|
145
|
+
await doInitMap(provider)
|
|
147
146
|
const style = { layers: [{ id: 'background' }] }
|
|
148
147
|
map.getStyle.mockReturnValue(style)
|
|
149
|
-
expect(
|
|
148
|
+
expect(provider.isBaseMapReady()).toEqual(true)
|
|
150
149
|
})
|
|
151
150
|
|
|
152
151
|
test('returns undefined when map has not been initialised', () => {
|
|
153
|
-
const
|
|
154
|
-
expect(
|
|
152
|
+
const provider = makeProvider()
|
|
153
|
+
expect(provider.isBaseMapReady()).toEqual(false)
|
|
155
154
|
})
|
|
156
155
|
|
|
157
156
|
test('returns undefined when map.getStyle() returns undefined', async () => {
|
|
158
|
-
const
|
|
159
|
-
await doInitMap(
|
|
157
|
+
const provider = makeProvider()
|
|
158
|
+
await doInitMap(provider)
|
|
160
159
|
map.getStyle.mockReturnValue(undefined)
|
|
161
|
-
expect(
|
|
160
|
+
expect(provider.isBaseMapReady()).toEqual(false)
|
|
162
161
|
})
|
|
163
162
|
})
|
|
164
163
|
|
|
165
164
|
test('destroyMap: calls remove on mapEvents/appEvents if set; skips if absent', async () => {
|
|
166
|
-
const
|
|
167
|
-
await doInitMap(
|
|
165
|
+
const provider = makeProvider()
|
|
166
|
+
await doInitMap(provider)
|
|
168
167
|
const mockRemove = jest.fn()
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
168
|
+
provider.mapEvents = { remove: mockRemove }
|
|
169
|
+
provider.appEvents = { remove: mockRemove }
|
|
170
|
+
provider.destroyMap()
|
|
172
171
|
expect(mockRemove).toHaveBeenCalledTimes(2)
|
|
173
172
|
expect(map.remove).toHaveBeenCalled()
|
|
174
173
|
|
|
@@ -178,13 +177,13 @@ describe('MapLibreProvider', () => {
|
|
|
178
177
|
})
|
|
179
178
|
|
|
180
179
|
test('setView: uses provided center/zoom; falls back to getCenter/getZoom when omitted', async () => {
|
|
181
|
-
const
|
|
182
|
-
await doInitMap(
|
|
183
|
-
|
|
180
|
+
const provider = makeProvider()
|
|
181
|
+
await doInitMap(provider)
|
|
182
|
+
provider.setView({ center: [1, 2], zoom: 8 })
|
|
184
183
|
expect(map.flyTo).toHaveBeenCalledWith({ center: [1, 2], zoom: 8, duration: 400 })
|
|
185
184
|
|
|
186
185
|
map.flyTo.mockClear()
|
|
187
|
-
|
|
186
|
+
provider.setView({})
|
|
188
187
|
const call = map.flyTo.mock.calls[0][0]
|
|
189
188
|
expect(call.center).toBeDefined()
|
|
190
189
|
expect(call.zoom).toBe(10)
|
|
@@ -192,150 +191,148 @@ describe('MapLibreProvider', () => {
|
|
|
192
191
|
})
|
|
193
192
|
|
|
194
193
|
test('setView uses duration 0 when style is not yet loaded', async () => {
|
|
195
|
-
const
|
|
196
|
-
await doInitMap(
|
|
194
|
+
const provider = makeProvider()
|
|
195
|
+
await doInitMap(provider)
|
|
197
196
|
map.isStyleLoaded.mockReturnValue(false)
|
|
198
197
|
|
|
199
|
-
|
|
198
|
+
provider.setView({ center: [1, 2], zoom: 8 })
|
|
200
199
|
|
|
201
200
|
expect(map.flyTo).toHaveBeenCalledWith({ center: [1, 2], zoom: 8, duration: 0 })
|
|
202
201
|
})
|
|
203
202
|
|
|
204
203
|
test('zoomIn, zoomOut, panBy, fitToBounds, setPadding delegate to map', async () => {
|
|
205
|
-
const
|
|
206
|
-
await doInitMap(
|
|
207
|
-
|
|
204
|
+
const provider = makeProvider()
|
|
205
|
+
await doInitMap(provider)
|
|
206
|
+
provider.zoomIn(1)
|
|
208
207
|
expect(map.easeTo).toHaveBeenCalledWith({ zoom: 11, duration: 400 })
|
|
209
|
-
|
|
208
|
+
provider.zoomOut(2)
|
|
210
209
|
expect(map.easeTo).toHaveBeenCalledWith({ zoom: 8, duration: 400 })
|
|
211
|
-
|
|
210
|
+
provider.panBy([10, 20])
|
|
212
211
|
expect(map.panBy).toHaveBeenCalledWith([10, 20], { duration: 400 })
|
|
213
|
-
|
|
212
|
+
provider.fitToBounds([[0, 0], [1, 1]])
|
|
214
213
|
expect(map.fitBounds).toHaveBeenCalledWith([[0, 0], [1, 1]], { duration: 400 })
|
|
215
|
-
|
|
214
|
+
provider.setPadding({ top: 5 })
|
|
216
215
|
expect(map.setPadding).toHaveBeenCalledWith({ top: 5 })
|
|
217
216
|
})
|
|
218
217
|
|
|
218
|
+
test('fitToBounds passes extra padding to fitBounds', async () => {
|
|
219
|
+
const provider = makeProvider()
|
|
220
|
+
await doInitMap(provider)
|
|
221
|
+
const padding = { top: 10, right: 20, bottom: 30, left: 40 }
|
|
222
|
+
|
|
223
|
+
provider.fitToBounds([[0, 0], [1, 1]], { padding })
|
|
224
|
+
|
|
225
|
+
expect(map.fitBounds).toHaveBeenCalledWith([[0, 0], [1, 1]], { duration: 400, padding })
|
|
226
|
+
})
|
|
227
|
+
|
|
219
228
|
test('fitToBounds uses duration 0 when style is not yet loaded', async () => {
|
|
220
|
-
const
|
|
221
|
-
await doInitMap(
|
|
229
|
+
const provider = makeProvider()
|
|
230
|
+
await doInitMap(provider)
|
|
222
231
|
map.isStyleLoaded.mockReturnValue(false)
|
|
223
232
|
|
|
224
|
-
|
|
233
|
+
provider.fitToBounds([[0, 0], [1, 1]])
|
|
225
234
|
|
|
226
235
|
expect(map.fitBounds).toHaveBeenCalledWith([[0, 0], [1, 1]], { duration: 0 })
|
|
227
236
|
})
|
|
228
237
|
|
|
229
238
|
test('fitToBounds accepts GeoJSON: computes bbox via getBboxFromGeoJSON', async () => {
|
|
230
239
|
const { getBboxFromGeoJSON } = require('./utils/spatial.js')
|
|
231
|
-
const
|
|
232
|
-
await doInitMap(
|
|
240
|
+
const provider = makeProvider()
|
|
241
|
+
await doInitMap(provider)
|
|
233
242
|
const feature = { type: 'Feature', geometry: { type: 'Point', coordinates: [1, 52] }, properties: {} }
|
|
234
243
|
|
|
235
|
-
|
|
244
|
+
provider.fitToBounds(feature)
|
|
236
245
|
|
|
237
246
|
expect(getBboxFromGeoJSON).toHaveBeenCalledWith(feature)
|
|
238
247
|
expect(map.fitBounds).toHaveBeenCalledWith([-1, 50, 1, 52], { duration: 400 })
|
|
239
248
|
})
|
|
240
249
|
|
|
241
|
-
test('isGeometryObscured delegates to spatial utility with map instance', async () => {
|
|
242
|
-
const p = makeProvider()
|
|
243
|
-
await doInitMap(p)
|
|
244
|
-
const geojson = { type: 'Feature', geometry: { type: 'Point', coordinates: [1, 52] }, properties: {} }
|
|
245
|
-
const panelRect = { left: 600, top: 0, right: 1000, bottom: 800, width: 400, height: 800 }
|
|
246
|
-
|
|
247
|
-
const result = p.isGeometryObscured(geojson, panelRect)
|
|
248
|
-
|
|
249
|
-
expect(isGeometryObscured).toHaveBeenCalledWith(geojson, panelRect, map)
|
|
250
|
-
expect(result).toBe(true)
|
|
251
|
-
})
|
|
252
|
-
|
|
253
250
|
test('getCenter, getZoom, getBounds return formatted values', async () => {
|
|
254
|
-
const
|
|
255
|
-
await doInitMap(
|
|
256
|
-
expect(
|
|
257
|
-
expect(
|
|
258
|
-
expect(
|
|
251
|
+
const provider = makeProvider()
|
|
252
|
+
await doInitMap(provider)
|
|
253
|
+
expect(provider.getCenter()).toEqual([1.2345678, 2.3456789])
|
|
254
|
+
expect(provider.getZoom()).toBe(10)
|
|
255
|
+
expect(provider.getBounds()).toEqual([0, 0, 1, 1])
|
|
259
256
|
})
|
|
260
257
|
|
|
261
258
|
test('spatial helpers delegate correctly', async () => {
|
|
262
|
-
const
|
|
263
|
-
await doInitMap(
|
|
264
|
-
expect(
|
|
259
|
+
const provider = makeProvider()
|
|
260
|
+
await doInitMap(provider)
|
|
261
|
+
expect(provider.getAreaDimensions()).toBe('400m by 750m')
|
|
265
262
|
expect(getPaddedBounds).toHaveBeenCalled()
|
|
266
263
|
expect(getAreaDimensions).toHaveBeenCalled()
|
|
267
|
-
expect(
|
|
264
|
+
expect(provider.getCardinalMove([0, 0], [1, 1])).toBe('north')
|
|
268
265
|
expect(getCardinalMove).toHaveBeenCalledWith([0, 0], [1, 1])
|
|
269
|
-
|
|
266
|
+
provider.getResolution()
|
|
270
267
|
expect(getResolution).toHaveBeenCalled()
|
|
271
|
-
expect(
|
|
272
|
-
expect(
|
|
268
|
+
expect(provider.mapToScreen([1, 2])).toEqual({ x: 100, y: 200 })
|
|
269
|
+
expect(provider.screenToMap({ x: 100, y: 200 })).toEqual([1, 2])
|
|
273
270
|
})
|
|
274
271
|
|
|
275
272
|
test('getFeaturesAtPoint and updateHighlightedFeatures delegate correctly', async () => {
|
|
276
|
-
const
|
|
277
|
-
await doInitMap(
|
|
278
|
-
|
|
273
|
+
const provider = makeProvider()
|
|
274
|
+
await doInitMap(provider)
|
|
275
|
+
provider.getFeaturesAtPoint({ x: 10, y: 20 }, { radius: 5 })
|
|
279
276
|
expect(queryFeatures).toHaveBeenCalledWith(map, { x: 10, y: 20 }, { radius: 5 })
|
|
280
|
-
|
|
277
|
+
provider.updateHighlightedFeatures(['feat'], null, { style: 1 })
|
|
281
278
|
expect(updateHighlightedFeatures).toHaveBeenCalledWith({
|
|
282
|
-
LngLatBounds: maplibreModule.LngLatBounds, map, selectedFeatures: ['feat'], activeFeatures: null, stylesMap: { style: 1 }, symbolImages:
|
|
279
|
+
LngLatBounds: maplibreModule.LngLatBounds, map, selectedFeatures: ['feat'], activeFeatures: null, stylesMap: { style: 1 }, symbolImages: provider.symbolImages
|
|
283
280
|
})
|
|
284
281
|
})
|
|
285
282
|
|
|
286
283
|
test('getVisibleFeatures returns empty array when no layers are present on the map', async () => {
|
|
287
|
-
const
|
|
288
|
-
await doInitMap(
|
|
284
|
+
const provider = makeProvider()
|
|
285
|
+
await doInitMap(provider)
|
|
289
286
|
map.getLayer.mockReturnValue(null)
|
|
290
|
-
expect(
|
|
287
|
+
expect(provider.getVisibleFeatures(['l1', 'l2'])).toEqual([])
|
|
291
288
|
expect(map.queryRenderedFeatures).not.toHaveBeenCalled()
|
|
292
289
|
})
|
|
293
290
|
|
|
294
291
|
test('getVisibleFeatures queries only layers present on the map', async () => {
|
|
295
|
-
const
|
|
296
|
-
await doInitMap(
|
|
292
|
+
const provider = makeProvider()
|
|
293
|
+
await doInitMap(provider)
|
|
297
294
|
map.getLayer.mockImplementation(id => id === 'l1' ? {} : null) // NOSONAR
|
|
298
295
|
const features = [{ id: 'f1' }]
|
|
299
296
|
map.queryRenderedFeatures.mockReturnValue(features)
|
|
300
|
-
expect(
|
|
297
|
+
expect(provider.getVisibleFeatures(['l1', 'l2'])).toEqual(features)
|
|
301
298
|
expect(map.queryRenderedFeatures).toHaveBeenCalledWith(undefined, { layers: ['l1'] })
|
|
302
299
|
})
|
|
303
300
|
|
|
304
301
|
// The provider's own record of registered symbol images, created with its map
|
|
305
302
|
const initWithSymbolImages = async () => {
|
|
306
|
-
const
|
|
307
|
-
await doInitMap(
|
|
308
|
-
const registerSymbols = jest.spyOn(
|
|
309
|
-
return {
|
|
303
|
+
const provider = makeProvider()
|
|
304
|
+
await doInitMap(provider)
|
|
305
|
+
const registerSymbols = jest.spyOn(provider.symbolImages, 'registerSymbols').mockResolvedValue()
|
|
306
|
+
return { provider, registerSymbols }
|
|
310
307
|
}
|
|
311
308
|
|
|
312
309
|
test('owns a SymbolImageVariants for its map', async () => {
|
|
313
|
-
const
|
|
314
|
-
await doInitMap(
|
|
315
|
-
expect(
|
|
316
|
-
expect(
|
|
310
|
+
const provider = makeProvider()
|
|
311
|
+
await doInitMap(provider)
|
|
312
|
+
expect(provider.symbolImages).toBeInstanceOf(SymbolImageVariants)
|
|
313
|
+
expect(provider.symbolImages.map).toBe(map)
|
|
317
314
|
})
|
|
318
315
|
|
|
319
316
|
test('addSymbolsToMap registers the symbols with its symbol images', async () => {
|
|
320
|
-
const {
|
|
317
|
+
const { provider, registerSymbols } = await initWithSymbolImages()
|
|
321
318
|
const configs = [{ symbol: 'pin' }]
|
|
322
319
|
const mapStyle = { id: 'test', selectedColor: '#0b0c0c' }
|
|
323
|
-
await
|
|
320
|
+
await provider.addSymbolsToMap(configs, mapStyle, symbolRegistry)
|
|
324
321
|
expect(registerSymbols).toHaveBeenCalledWith(configs, mapStyle, symbolRegistry, expect.any(Number))
|
|
325
322
|
})
|
|
326
323
|
|
|
327
324
|
test('addSymbolsToMap computes pixelRatio from getPixelRatio and mapSize scale factor', async () => {
|
|
328
|
-
const {
|
|
325
|
+
const { provider, registerSymbols } = await initWithSymbolImages()
|
|
329
326
|
map.getPixelRatio.mockReturnValue(2)
|
|
330
|
-
|
|
331
|
-
await
|
|
327
|
+
provider.mapSize = 'medium'
|
|
328
|
+
await provider.addSymbolsToMap([], { id: 'test' }, symbolRegistry)
|
|
332
329
|
expect(registerSymbols).toHaveBeenCalledWith([], { id: 'test' }, symbolRegistry, 2)
|
|
333
330
|
})
|
|
334
331
|
|
|
335
332
|
test('addSymbolsToMap registers at a given pixelRatio instead of the map\'s', async () => {
|
|
336
|
-
const {
|
|
333
|
+
const { provider, registerSymbols } = await initWithSymbolImages()
|
|
337
334
|
map.getPixelRatio.mockReturnValue(2)
|
|
338
|
-
await
|
|
335
|
+
await provider.addSymbolsToMap([], { id: 'test' }, symbolRegistry, 3)
|
|
339
336
|
expect(registerSymbols).toHaveBeenCalledWith([], { id: 'test' }, symbolRegistry, 3)
|
|
340
337
|
})
|
|
341
338
|
|
|
@@ -346,63 +343,63 @@ describe('MapLibreProvider', () => {
|
|
|
346
343
|
})
|
|
347
344
|
|
|
348
345
|
test('looks up a registered symbol\'s active and selected variants', async () => {
|
|
349
|
-
const
|
|
350
|
-
await doInitMap(
|
|
351
|
-
expect(
|
|
352
|
-
expect(
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
expect(
|
|
356
|
-
expect(
|
|
346
|
+
const provider = makeProvider()
|
|
347
|
+
await doInitMap(provider)
|
|
348
|
+
expect(provider.getActiveSymbolImageId('img')).toBeNull()
|
|
349
|
+
expect(provider.getSelectedSymbolImageId('img')).toBeNull()
|
|
350
|
+
provider.symbolImages.activeImageIds.set('img', 'img-active')
|
|
351
|
+
provider.symbolImages.selectedImageIds.set('img', 'img-selected')
|
|
352
|
+
expect(provider.getActiveSymbolImageId('img')).toBe('img-active')
|
|
353
|
+
expect(provider.getSelectedSymbolImageId('img')).toBe('img-selected')
|
|
357
354
|
})
|
|
358
355
|
|
|
359
356
|
test('addSymbolsToMap falls back to pixelRatio 1 when getPixelRatio returns 0', async () => {
|
|
360
|
-
const {
|
|
357
|
+
const { provider, registerSymbols } = await initWithSymbolImages()
|
|
361
358
|
map.getPixelRatio.mockReturnValue(0)
|
|
362
|
-
|
|
363
|
-
await
|
|
359
|
+
provider.mapSize = 'small' // scaleFactor['small'] = 1
|
|
360
|
+
await provider.addSymbolsToMap([], { id: 'test' }, symbolRegistry)
|
|
364
361
|
expect(registerSymbols).toHaveBeenCalledWith([], { id: 'test' }, symbolRegistry, 1)
|
|
365
362
|
})
|
|
366
363
|
|
|
367
364
|
// The provider's own pattern images, created with its map
|
|
368
365
|
const initWithPatternImages = async () => {
|
|
369
|
-
const
|
|
370
|
-
await doInitMap(
|
|
371
|
-
const registerPatterns = jest.spyOn(
|
|
372
|
-
return {
|
|
366
|
+
const provider = makeProvider()
|
|
367
|
+
await doInitMap(provider)
|
|
368
|
+
const registerPatterns = jest.spyOn(provider.patternImages, 'registerPatterns').mockResolvedValue()
|
|
369
|
+
return { provider, registerPatterns }
|
|
373
370
|
}
|
|
374
371
|
|
|
375
372
|
test('owns a PatternImages for its map', async () => {
|
|
376
|
-
const
|
|
377
|
-
await doInitMap(
|
|
378
|
-
expect(
|
|
379
|
-
expect(
|
|
373
|
+
const provider = makeProvider()
|
|
374
|
+
await doInitMap(provider)
|
|
375
|
+
expect(provider.patternImages).toBeInstanceOf(PatternImages)
|
|
376
|
+
expect(provider.patternImages.map).toBe(map)
|
|
380
377
|
})
|
|
381
378
|
|
|
382
379
|
test('addPatternsToMap falls back to pixelRatio 1 when getPixelRatio returns 0', async () => {
|
|
383
|
-
const {
|
|
380
|
+
const { provider, registerPatterns } = await initWithPatternImages()
|
|
384
381
|
map.getPixelRatio.mockReturnValue(0)
|
|
385
382
|
const configs = [{ fillPattern: 'dot' }]
|
|
386
383
|
const registry = {}
|
|
387
|
-
await
|
|
384
|
+
await provider.addPatternsToMap(configs, 'test', registry)
|
|
388
385
|
expect(registerPatterns).toHaveBeenCalledWith(configs, 'test', registry, 1)
|
|
389
386
|
})
|
|
390
387
|
|
|
391
388
|
test('addPatternsToMap registers at the map\'s pixel ratio, or a given one', async () => {
|
|
392
|
-
const {
|
|
389
|
+
const { provider, registerPatterns } = await initWithPatternImages()
|
|
393
390
|
map.getPixelRatio.mockReturnValue(2)
|
|
394
391
|
const registry = {}
|
|
395
|
-
await
|
|
392
|
+
await provider.addPatternsToMap([], 'test', registry)
|
|
396
393
|
expect(registerPatterns).toHaveBeenLastCalledWith([], 'test', registry, 2)
|
|
397
|
-
await
|
|
394
|
+
await provider.addPatternsToMap([], 'test', registry, 3)
|
|
398
395
|
expect(registerPatterns).toHaveBeenLastCalledWith([], 'test', registry, 3)
|
|
399
396
|
})
|
|
400
397
|
|
|
401
398
|
describe('setHoverCursor', () => {
|
|
402
399
|
test('registers mousemove handler on the map when layerIds provided', async () => {
|
|
403
|
-
const
|
|
404
|
-
await doInitMap(
|
|
405
|
-
|
|
400
|
+
const provider = makeProvider()
|
|
401
|
+
await doInitMap(provider)
|
|
402
|
+
provider.setHoverCursor(['layer-a'])
|
|
406
403
|
expect(map.on).toHaveBeenCalledWith('mousemove', expect.any(Function))
|
|
407
404
|
})
|
|
408
405
|
|
|
@@ -411,9 +408,9 @@ describe('MapLibreProvider', () => {
|
|
|
411
408
|
map.getCanvas.mockReturnValue(canvas)
|
|
412
409
|
map.queryRenderedFeatures.mockReturnValue([{ id: 'f1' }])
|
|
413
410
|
|
|
414
|
-
const
|
|
415
|
-
await doInitMap(
|
|
416
|
-
|
|
411
|
+
const provider = makeProvider()
|
|
412
|
+
await doInitMap(provider)
|
|
413
|
+
provider.setHoverCursor(['layer-a'])
|
|
417
414
|
|
|
418
415
|
const moveHandler = map.on.mock.calls.find(([e]) => e === 'mousemove')?.[1]
|
|
419
416
|
moveHandler({ point: { x: 10, y: 20 } })
|
|
@@ -426,9 +423,9 @@ describe('MapLibreProvider', () => {
|
|
|
426
423
|
map.getCanvas.mockReturnValue(canvas)
|
|
427
424
|
map.queryRenderedFeatures.mockReturnValue([])
|
|
428
425
|
|
|
429
|
-
const
|
|
430
|
-
await doInitMap(
|
|
431
|
-
|
|
426
|
+
const provider = makeProvider()
|
|
427
|
+
await doInitMap(provider)
|
|
428
|
+
provider.setHoverCursor(['layer-a'])
|
|
432
429
|
|
|
433
430
|
const moveHandler = map.on.mock.calls.find(([e]) => e === 'mousemove')?.[1]
|
|
434
431
|
moveHandler({ point: { x: 10, y: 20 } })
|
|
@@ -440,31 +437,31 @@ describe('MapLibreProvider', () => {
|
|
|
440
437
|
const canvas = { style: { cursor: 'pointer' } }
|
|
441
438
|
map.getCanvas.mockReturnValue(canvas)
|
|
442
439
|
|
|
443
|
-
const
|
|
444
|
-
await doInitMap(
|
|
445
|
-
|
|
446
|
-
|
|
440
|
+
const provider = makeProvider()
|
|
441
|
+
await doInitMap(provider)
|
|
442
|
+
provider.setHoverCursor(['layer-a'])
|
|
443
|
+
provider.setHoverCursor([])
|
|
447
444
|
|
|
448
445
|
expect(map.off).toHaveBeenCalledWith('mousemove', expect.any(Function))
|
|
449
446
|
expect(canvas.style.cursor).toBe('')
|
|
450
447
|
})
|
|
451
448
|
|
|
452
449
|
test('does nothing when map is not initialised', () => {
|
|
453
|
-
const
|
|
454
|
-
expect(() =>
|
|
450
|
+
const provider = makeProvider()
|
|
451
|
+
expect(() => provider.setHoverCursor(['layer-a'])).not.toThrow()
|
|
455
452
|
})
|
|
456
453
|
})
|
|
457
454
|
|
|
458
455
|
test('label methods return null without labelNavigator; delegate when set', async () => {
|
|
459
|
-
const
|
|
460
|
-
await doInitMap(
|
|
461
|
-
expect(
|
|
462
|
-
expect(
|
|
463
|
-
expect(
|
|
456
|
+
const provider = makeProvider()
|
|
457
|
+
await doInitMap(provider)
|
|
458
|
+
expect(provider.highlightNextLabel('ArrowRight')).toBeNull()
|
|
459
|
+
expect(provider.highlightLabelAtCenter()).toBeNull()
|
|
460
|
+
expect(provider.clearHighlightedLabel()).toBeNull()
|
|
464
461
|
|
|
465
462
|
loadCallback()
|
|
466
|
-
expect(
|
|
467
|
-
expect(
|
|
468
|
-
expect(
|
|
463
|
+
expect(provider.highlightNextLabel('ArrowRight')).toBe('next')
|
|
464
|
+
expect(provider.highlightLabelAtCenter()).toBe('center')
|
|
465
|
+
expect(provider.clearHighlightedLabel()).toBe('cleared')
|
|
469
466
|
})
|
|
470
467
|
})
|
|
@@ -151,50 +151,10 @@ const getPaddedBounds = (LngLatBounds, map) => {
|
|
|
151
151
|
*/
|
|
152
152
|
const getBboxFromGeoJSON = (geojson) => turfBbox(geojson)
|
|
153
153
|
|
|
154
|
-
/**
|
|
155
|
-
* Returns true if the geometry's screen bounding box overlaps the given panel rectangle.
|
|
156
|
-
* Used to decide whether to pan/zoom when a panel opens over a visibleGeometry target.
|
|
157
|
-
*
|
|
158
|
-
* @param {object} geojson - GeoJSON Feature, FeatureCollection, or geometry
|
|
159
|
-
* @param {DOMRect} panelRect - Bounding rect of the panel element (viewport coordinates)
|
|
160
|
-
* @param {object} map - MapLibre map instance
|
|
161
|
-
* @returns {boolean}
|
|
162
|
-
*/
|
|
163
|
-
const isGeometryObscured = (geojson, panelRect, map) => {
|
|
164
|
-
const containerRect = map.getContainer().getBoundingClientRect()
|
|
165
|
-
const [west, south, east, north] = getBboxFromGeoJSON(geojson)
|
|
166
|
-
|
|
167
|
-
const corners = [
|
|
168
|
-
map.project([west, south]),
|
|
169
|
-
map.project([west, north]),
|
|
170
|
-
map.project([east, south]),
|
|
171
|
-
map.project([east, north])
|
|
172
|
-
]
|
|
173
|
-
|
|
174
|
-
const screenMinX = Math.min(...corners.map(corner => corner.x))
|
|
175
|
-
const screenMaxX = Math.max(...corners.map(corner => corner.x))
|
|
176
|
-
const screenMinY = Math.min(...corners.map(corner => corner.y))
|
|
177
|
-
const screenMaxY = Math.max(...corners.map(corner => corner.y))
|
|
178
|
-
|
|
179
|
-
// Convert panelRect from viewport coords to map-container-relative coords
|
|
180
|
-
const panelLeft = panelRect.left - containerRect.left
|
|
181
|
-
const panelTop = panelRect.top - containerRect.top
|
|
182
|
-
const panelRight = panelRect.right - containerRect.left
|
|
183
|
-
const panelBottom = panelRect.bottom - containerRect.top
|
|
184
|
-
|
|
185
|
-
return (
|
|
186
|
-
screenMinX < panelRight &&
|
|
187
|
-
screenMaxX > panelLeft &&
|
|
188
|
-
screenMinY < panelBottom &&
|
|
189
|
-
screenMaxY > panelTop
|
|
190
|
-
)
|
|
191
|
-
}
|
|
192
|
-
|
|
193
154
|
export {
|
|
194
155
|
getAreaDimensions,
|
|
195
156
|
getCardinalMove,
|
|
196
157
|
getBboxFromGeoJSON,
|
|
197
|
-
isGeometryObscured,
|
|
198
158
|
getResolution,
|
|
199
159
|
getPaddedBounds,
|
|
200
160
|
formatDimension
|
|
@@ -80,39 +80,4 @@ describe('spatial utils', () => {
|
|
|
80
80
|
expect(turfBbox).toHaveBeenCalledWith(feature)
|
|
81
81
|
expect(result).toEqual([-1, 50, 1, 52])
|
|
82
82
|
})
|
|
83
|
-
|
|
84
|
-
describe('isGeometryObscured', () => {
|
|
85
|
-
const geojson = { type: 'Feature', geometry: { type: 'Point', coordinates: [0, 51] }, properties: {} }
|
|
86
|
-
// getBboxFromGeoJSON is mocked to always return [-1, 50, 1, 52]
|
|
87
|
-
|
|
88
|
-
// Container sits at viewport origin so container-relative coords equal viewport coords
|
|
89
|
-
const makeMap = (projectFn) => ({
|
|
90
|
-
getContainer: jest.fn(() => ({
|
|
91
|
-
getBoundingClientRect: jest.fn(() => ({ left: 0, top: 0, right: 1000, bottom: 800 }))
|
|
92
|
-
})),
|
|
93
|
-
project: jest.fn(projectFn)
|
|
94
|
-
})
|
|
95
|
-
|
|
96
|
-
// Panel occupies the right 400px of the viewport
|
|
97
|
-
const panelRect = { left: 600, top: 0, right: 1000, bottom: 800, width: 400, height: 800 }
|
|
98
|
-
|
|
99
|
-
test('returns true when geometry screen bbox overlaps the panel rect', () => {
|
|
100
|
-
// Corners project into the panel (x: 650 is between panelLeft 600 and panelRight 1000)
|
|
101
|
-
const map = makeMap(() => ({ x: 650, y: 400 }))
|
|
102
|
-
expect(spatial.isGeometryObscured(geojson, panelRect, map)).toBe(true)
|
|
103
|
-
})
|
|
104
|
-
|
|
105
|
-
test('returns false when geometry screen bbox does not overlap the panel rect', () => {
|
|
106
|
-
// Corners project to x: 300, entirely left of panelLeft (600)
|
|
107
|
-
const map = makeMap(() => ({ x: 300, y: 400 }))
|
|
108
|
-
expect(spatial.isGeometryObscured(geojson, panelRect, map)).toBe(false)
|
|
109
|
-
})
|
|
110
|
-
|
|
111
|
-
test('projects all four bbox corners', () => {
|
|
112
|
-
const map = makeMap(() => ({ x: 300, y: 400 }))
|
|
113
|
-
spatial.isGeometryObscured(geojson, panelRect, map)
|
|
114
|
-
// bbox is [-1, 50, 1, 52]: corners are [-1,50], [-1,52], [1,50], [1,52]
|
|
115
|
-
expect(map.project).toHaveBeenCalledTimes(4)
|
|
116
|
-
})
|
|
117
|
-
})
|
|
118
83
|
})
|