@deck.gl/maplibre 9.4.1 → 10.0.0-alpha.1
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/dist/compatibility.d.ts +6 -0
- package/dist/compatibility.d.ts.map +1 -1
- package/dist/compatibility.js +20 -0
- package/dist/compatibility.js.map +1 -1
- package/dist/deck-utils.js +5 -5
- package/dist/deck-utils.js.map +1 -1
- package/dist/index.cjs +60 -22
- package/dist/index.cjs.map +2 -2
- package/dist/overlay.d.ts +5 -0
- package/dist/overlay.d.ts.map +1 -1
- package/dist/overlay.js +30 -4
- package/dist/overlay.js.map +1 -1
- package/package.json +7 -4
- package/src/compatibility.ts +26 -0
- package/src/deck-utils.ts +5 -5
- package/src/overlay.ts +35 -5
package/dist/compatibility.d.ts
CHANGED
|
@@ -11,6 +11,12 @@ type CompatibleMapLibreMap = {
|
|
|
11
11
|
};
|
|
12
12
|
export declare function getMapLibreElevation(map: CompatibleMapLibreMap): number | undefined;
|
|
13
13
|
export declare function getMapLibreProjection(map: CompatibleMapLibreMap): 'mercator' | 'globe';
|
|
14
|
+
/**
|
|
15
|
+
* Returns the elevation of the map center that the MapLibre camera targets, if any.
|
|
16
|
+
* MapLibre's globe camera targets sea level and its Web Mercator camera the terrain. During the
|
|
17
|
+
* globe projection's transition, MapLibre blends the two, which a target in between approximates.
|
|
18
|
+
*/
|
|
19
|
+
export declare function getMapLibreCameraElevation(map: CompatibleMapLibreMap, zoom: number): number | undefined;
|
|
14
20
|
export declare function getMapLibreRenderParameters(parametersOrMatrix: unknown, legacyParameters?: unknown): MapLibreRenderParameters;
|
|
15
21
|
export {};
|
|
16
22
|
//# sourceMappingURL=compatibility.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatibility.d.ts","sourceRoot":"","sources":["../src/compatibility.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compatibility.d.ts","sourceRoot":"","sources":["../src/compatibility.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,kBAAkB,CAAC,EAAE,MAAM,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,MAAM,CAAC;IACxC,aAAa,CAAC,EAAE,MAAM;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,SAAS,CAAC;CACpD,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,qBAAqB,GAAG,MAAM,GAAG,SAAS,CAKnF;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,qBAAqB,GAAG,UAAU,GAAG,OAAO,CActF;AAKD;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,qBAAqB,EAC1B,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CAWpB;AAED,wBAAgB,2BAA2B,CACzC,kBAAkB,EAAE,OAAO,EAC3B,gBAAgB,CAAC,EAAE,OAAO,GACzB,wBAAwB,CAQ1B"}
|
package/dist/compatibility.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// deck.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
+
import { clamp } from '@math.gl/core';
|
|
4
5
|
export function getMapLibreElevation(map) {
|
|
5
6
|
if (map.getCenterElevation) {
|
|
6
7
|
return map.getCenterElevation();
|
|
@@ -23,6 +24,25 @@ export function getMapLibreProjection(map) {
|
|
|
23
24
|
}
|
|
24
25
|
return 'mercator';
|
|
25
26
|
}
|
|
27
|
+
/** Zoom range in which MapLibre's `globe` projection transitions to Web Mercator */
|
|
28
|
+
const MAPLIBRE_GLOBE_TRANSITION_ZOOMS = [11, 12];
|
|
29
|
+
/**
|
|
30
|
+
* Returns the elevation of the map center that the MapLibre camera targets, if any.
|
|
31
|
+
* MapLibre's globe camera targets sea level and its Web Mercator camera the terrain. During the
|
|
32
|
+
* globe projection's transition, MapLibre blends the two, which a target in between approximates.
|
|
33
|
+
*/
|
|
34
|
+
export function getMapLibreCameraElevation(map, zoom) {
|
|
35
|
+
const elevation = getMapLibreElevation(map);
|
|
36
|
+
if (typeof elevation !== 'number' || !Number.isFinite(elevation)) {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
if (getMapLibreProjection(map) === 'globe') {
|
|
40
|
+
const [startZoom, endZoom] = MAPLIBRE_GLOBE_TRANSITION_ZOOMS;
|
|
41
|
+
const mercatorWeight = clamp((zoom - startZoom) / (endZoom - startZoom), 0, 1);
|
|
42
|
+
return elevation * mercatorWeight;
|
|
43
|
+
}
|
|
44
|
+
return elevation;
|
|
45
|
+
}
|
|
26
46
|
export function getMapLibreRenderParameters(parametersOrMatrix, legacyParameters) {
|
|
27
47
|
if (isMapLibreRenderParameters(parametersOrMatrix)) {
|
|
28
48
|
return parametersOrMatrix;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../src/compatibility.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAapC,MAAM,UAAU,oBAAoB,CAAC,GAA0B;IAC7D,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC;QAC3B,OAAO,GAAG,CAAC,kBAAkB,EAAE,CAAC;IAClC,CAAC;IACD,OAAO,GAAG,CAAC,wBAAwB,EAAE,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAA0B;IAC9D,IAAI,IAAI,GAAY,UAAU,CAAC;IAC/B,IAAI,CAAC;QACH,IAAI,GAAG,GAAG,CAAC,aAAa,EAAE,EAAE,EAAE,IAAI,IAAI,UAAU,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,kDAAkD;IACpD,CAAC;IACD,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,kBAA2B,EAC3B,gBAA0B;IAE1B,IAAI,0BAA0B,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACnD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IACD,IAAI,0BAA0B,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;AAClG,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAc;IAChD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,KAA0C,CAAC;IAC9D,OAAO,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAC/E,CAAC"}
|
|
1
|
+
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../src/compatibility.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAapC,MAAM,UAAU,oBAAoB,CAAC,GAA0B;IAC7D,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC;QAC3B,OAAO,GAAG,CAAC,kBAAkB,EAAE,CAAC;IAClC,CAAC;IACD,OAAO,GAAG,CAAC,wBAAwB,EAAE,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAA0B;IAC9D,IAAI,IAAI,GAAY,UAAU,CAAC;IAC/B,IAAI,CAAC;QACH,IAAI,GAAG,GAAG,CAAC,aAAa,EAAE,EAAE,EAAE,IAAI,IAAI,UAAU,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,kDAAkD;IACpD,CAAC;IACD,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,oFAAoF;AACpF,MAAM,+BAA+B,GAAG,CAAC,EAAE,EAAE,EAAE,CAAU,CAAC;AAE1D;;;;GAIG;AACH,MAAM,UAAU,0BAA0B,CACxC,GAA0B,EAC1B,IAAY;IAEZ,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACjE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,qBAAqB,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC;QAC3C,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,+BAA+B,CAAC;QAC7D,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/E,OAAO,SAAS,GAAG,cAAc,CAAC;IACpC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,kBAA2B,EAC3B,gBAA0B;IAE1B,IAAI,0BAA0B,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACnD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IACD,IAAI,0BAA0B,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;AAClG,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAc;IAChD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,KAA0C,CAAC;IAC9D,OAAO,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAC/E,CAAC"}
|
package/dist/deck-utils.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { Deck, MapView, _GlobeView as GlobeView, _flatten as flatten } from '@deck.gl/core';
|
|
5
|
-
import {
|
|
5
|
+
import { getMapLibreCameraElevation, getMapLibreProjection } from "./compatibility.js";
|
|
6
6
|
import { getMapLibreLayerGroupId } from "./layer-utils.js";
|
|
7
7
|
export const MAPLIBRE_VIEW_ID = 'maplibre';
|
|
8
8
|
const MAPLIBRE_DECK_STATES = new WeakMap();
|
|
@@ -67,8 +67,8 @@ export function getMapLibreViewState(map) {
|
|
|
67
67
|
},
|
|
68
68
|
repeat: map.getRenderWorldCopies()
|
|
69
69
|
};
|
|
70
|
-
const elevation =
|
|
71
|
-
if (
|
|
70
|
+
const elevation = getMapLibreCameraElevation(map, viewState.zoom);
|
|
71
|
+
if (elevation !== undefined) {
|
|
72
72
|
viewState.position = [0, 0, elevation];
|
|
73
73
|
}
|
|
74
74
|
return viewState;
|
|
@@ -238,9 +238,9 @@ function afterMapLibreRender(deck, map) {
|
|
|
238
238
|
* changes without a move event while terrain loads.
|
|
239
239
|
*/
|
|
240
240
|
function syncMapLibreElevation(deck, map) {
|
|
241
|
-
const elevation =
|
|
241
|
+
const elevation = getMapLibreCameraElevation(map, map.getZoom());
|
|
242
242
|
const viewState = deck.props.viewState;
|
|
243
|
-
if (
|
|
243
|
+
if (viewState?.position?.[2] !== elevation) {
|
|
244
244
|
onMapLibreMove(deck, map);
|
|
245
245
|
}
|
|
246
246
|
}
|
package/dist/deck-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deck-utils.js","sourceRoot":"","sources":["../src/deck-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,IAAI,EAAE,OAAO,EAAE,UAAU,IAAI,SAAS,EAAE,QAAQ,IAAI,OAAO,EAAC,MAAM,eAAe,CAAC;AAE1F,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"deck-utils.js","sourceRoot":"","sources":["../src/deck-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/index.cjs
CHANGED
|
@@ -24,12 +24,13 @@ __export(index_exports, {
|
|
|
24
24
|
module.exports = __toCommonJS(index_exports);
|
|
25
25
|
|
|
26
26
|
// dist/overlay.js
|
|
27
|
-
var
|
|
27
|
+
var import_core5 = require("@deck.gl/core");
|
|
28
28
|
|
|
29
29
|
// dist/deck-utils.js
|
|
30
|
-
var
|
|
30
|
+
var import_core2 = require("@deck.gl/core");
|
|
31
31
|
|
|
32
32
|
// dist/compatibility.js
|
|
33
|
+
var import_core = require("@math.gl/core");
|
|
33
34
|
function getMapLibreElevation(map) {
|
|
34
35
|
var _a;
|
|
35
36
|
if (map.getCenterElevation) {
|
|
@@ -52,6 +53,19 @@ function getMapLibreProjection(map) {
|
|
|
52
53
|
}
|
|
53
54
|
return "mercator";
|
|
54
55
|
}
|
|
56
|
+
var MAPLIBRE_GLOBE_TRANSITION_ZOOMS = [11, 12];
|
|
57
|
+
function getMapLibreCameraElevation(map, zoom) {
|
|
58
|
+
const elevation = getMapLibreElevation(map);
|
|
59
|
+
if (typeof elevation !== "number" || !Number.isFinite(elevation)) {
|
|
60
|
+
return void 0;
|
|
61
|
+
}
|
|
62
|
+
if (getMapLibreProjection(map) === "globe") {
|
|
63
|
+
const [startZoom, endZoom] = MAPLIBRE_GLOBE_TRANSITION_ZOOMS;
|
|
64
|
+
const mercatorWeight = (0, import_core.clamp)((zoom - startZoom) / (endZoom - startZoom), 0, 1);
|
|
65
|
+
return elevation * mercatorWeight;
|
|
66
|
+
}
|
|
67
|
+
return elevation;
|
|
68
|
+
}
|
|
55
69
|
function getMapLibreRenderParameters(parametersOrMatrix, legacyParameters) {
|
|
56
70
|
if (isMapLibreRenderParameters(parametersOrMatrix)) {
|
|
57
71
|
return parametersOrMatrix;
|
|
@@ -87,7 +101,7 @@ function createMapLibreInterleavedDeck(map, props) {
|
|
|
87
101
|
throw new Error("MapLibreOverlay interleaved rendering requires WebGL2.");
|
|
88
102
|
}
|
|
89
103
|
const { device: _, ...deckProps } = props;
|
|
90
|
-
const deck = new
|
|
104
|
+
const deck = new import_core2.Deck({ ...deckProps, gl });
|
|
91
105
|
try {
|
|
92
106
|
return createMapLibreDeckInstance(map, deck);
|
|
93
107
|
} catch (error) {
|
|
@@ -114,7 +128,7 @@ function getMapLibreDefaultParameters(_map, interleaved) {
|
|
|
114
128
|
} : {};
|
|
115
129
|
}
|
|
116
130
|
function getMapLibreDefaultView(map) {
|
|
117
|
-
return getMapLibreProjection(map) === "globe" ? new
|
|
131
|
+
return getMapLibreProjection(map) === "globe" ? new import_core2._GlobeView({ id: MAPLIBRE_VIEW_ID }) : new import_core2.MapView({ id: MAPLIBRE_VIEW_ID });
|
|
118
132
|
}
|
|
119
133
|
function getMapLibreViewState(map) {
|
|
120
134
|
const { lng, lat } = map.getCenter();
|
|
@@ -133,8 +147,8 @@ function getMapLibreViewState(map) {
|
|
|
133
147
|
},
|
|
134
148
|
repeat: map.getRenderWorldCopies()
|
|
135
149
|
};
|
|
136
|
-
const elevation =
|
|
137
|
-
if (
|
|
150
|
+
const elevation = getMapLibreCameraElevation(map, viewState.zoom);
|
|
151
|
+
if (elevation !== void 0) {
|
|
138
152
|
viewState.position = [0, 0, elevation];
|
|
139
153
|
}
|
|
140
154
|
return viewState;
|
|
@@ -265,7 +279,7 @@ function getMapLibreViewport(deck, map, renderParameters) {
|
|
|
265
279
|
}
|
|
266
280
|
function afterMapLibreRender(deck, map) {
|
|
267
281
|
var _a, _b, _c, _d;
|
|
268
|
-
const deckLayers = (0,
|
|
282
|
+
const deckLayers = (0, import_core2._flatten)(deck.props.layers, Boolean);
|
|
269
283
|
const hasNonMapLibreLayers = deckLayers.some((layer) => layer && !map.getLayer(getMapLibreLayerGroupId(layer)));
|
|
270
284
|
let viewports = deck.getViewports();
|
|
271
285
|
const mapLibreViewportIndex = viewports.findIndex((viewport) => viewport.id === MAPLIBRE_VIEW_ID);
|
|
@@ -295,9 +309,9 @@ function afterMapLibreRender(deck, map) {
|
|
|
295
309
|
}
|
|
296
310
|
function syncMapLibreElevation(deck, map) {
|
|
297
311
|
var _a;
|
|
298
|
-
const elevation =
|
|
312
|
+
const elevation = getMapLibreCameraElevation(map, map.getZoom());
|
|
299
313
|
const viewState = deck.props.viewState;
|
|
300
|
-
if (
|
|
314
|
+
if (((_a = viewState == null ? void 0 : viewState.position) == null ? void 0 : _a[2]) !== elevation) {
|
|
301
315
|
onMapLibreMove(deck, map);
|
|
302
316
|
}
|
|
303
317
|
}
|
|
@@ -307,15 +321,15 @@ function onMapLibreMove(deck, map) {
|
|
|
307
321
|
}
|
|
308
322
|
|
|
309
323
|
// dist/resolve-layer-groups.js
|
|
310
|
-
var
|
|
324
|
+
var import_core4 = require("@deck.gl/core");
|
|
311
325
|
|
|
312
326
|
// dist/layer-group.js
|
|
313
|
-
var
|
|
327
|
+
var import_core3 = require("@deck.gl/core");
|
|
314
328
|
var MapLibreLayerGroup = class {
|
|
315
329
|
constructor(props) {
|
|
316
330
|
this.type = "custom";
|
|
317
331
|
this.map = null;
|
|
318
|
-
(0,
|
|
332
|
+
(0, import_core3.assert)(props.id, "id is required");
|
|
319
333
|
this.id = props.id;
|
|
320
334
|
this.renderingMode = props.renderingMode || "3d";
|
|
321
335
|
this.beforeId = props.beforeId;
|
|
@@ -349,10 +363,10 @@ function resolveMapLibreLayerGroups(map, oldLayers, newLayers) {
|
|
|
349
363
|
layerGroups = /* @__PURE__ */ new Map();
|
|
350
364
|
LAYER_GROUPS.set(map, layerGroups);
|
|
351
365
|
}
|
|
352
|
-
const layers = (0,
|
|
366
|
+
const layers = (0, import_core4._flatten)(newLayers, Boolean);
|
|
353
367
|
const newLayerGroupIds = new Set(layers.map(getMapLibreLayerGroupId));
|
|
354
368
|
if (oldLayers !== newLayers) {
|
|
355
|
-
const previousLayers = (0,
|
|
369
|
+
const previousLayers = (0, import_core4._flatten)(oldLayers, Boolean);
|
|
356
370
|
const previousLayerGroupIds = new Set(previousLayers.map(getMapLibreLayerGroupId));
|
|
357
371
|
for (const groupId of previousLayerGroupIds) {
|
|
358
372
|
if (!newLayerGroupIds.has(groupId) && layerGroups.has(groupId)) {
|
|
@@ -399,9 +413,15 @@ function resolveMapLibreLayerGroups(map, oldLayers, newLayers) {
|
|
|
399
413
|
var MapLibreOverlay = class {
|
|
400
414
|
/** Creates a MapLibre overlay. */
|
|
401
415
|
constructor(props) {
|
|
416
|
+
this._handleSourceData = () => {
|
|
417
|
+
var _a;
|
|
418
|
+
if ((_a = this._map) == null ? void 0 : _a.isStyleLoaded()) {
|
|
419
|
+
this._resolveLayerGroups(this._props.layers, this._props.layers);
|
|
420
|
+
}
|
|
421
|
+
};
|
|
402
422
|
this._handleStyleChange = () => {
|
|
403
423
|
var _a;
|
|
404
|
-
|
|
424
|
+
this._resolveLayerGroups(this._props.layers, this._props.layers);
|
|
405
425
|
if (!this._map) {
|
|
406
426
|
return;
|
|
407
427
|
}
|
|
@@ -514,7 +534,7 @@ var MapLibreOverlay = class {
|
|
|
514
534
|
/** Updates partial properties of the underlying Deck instance. */
|
|
515
535
|
setProps(props) {
|
|
516
536
|
if (this._interleaved && props.layers) {
|
|
517
|
-
|
|
537
|
+
this._resolveLayerGroups(this._props.layers, props.layers);
|
|
518
538
|
}
|
|
519
539
|
Object.assign(this._props, this._filterProps(props));
|
|
520
540
|
if (this._deck && this._map) {
|
|
@@ -567,17 +587,17 @@ var MapLibreOverlay = class {
|
|
|
567
587
|
}
|
|
568
588
|
/** Forwards to Deck.pickObject. */
|
|
569
589
|
pickObject(params) {
|
|
570
|
-
(0,
|
|
590
|
+
(0, import_core5.assert)(this._deck);
|
|
571
591
|
return this._deck.pickObject(params);
|
|
572
592
|
}
|
|
573
593
|
/** Forwards to Deck.pickMultipleObjects. */
|
|
574
594
|
pickMultipleObjects(params) {
|
|
575
|
-
(0,
|
|
595
|
+
(0, import_core5.assert)(this._deck);
|
|
576
596
|
return this._deck.pickMultipleObjects(params);
|
|
577
597
|
}
|
|
578
598
|
/** Forwards to Deck.pickObjects. */
|
|
579
599
|
pickObjects(params) {
|
|
580
|
-
(0,
|
|
600
|
+
(0, import_core5.assert)(this._deck);
|
|
581
601
|
return this._deck.pickObjects(params);
|
|
582
602
|
}
|
|
583
603
|
/** Removes the control from its map and releases resources. */
|
|
@@ -603,7 +623,7 @@ var MapLibreOverlay = class {
|
|
|
603
623
|
pointerEvents: "none"
|
|
604
624
|
});
|
|
605
625
|
this._container = container;
|
|
606
|
-
this._deck = new
|
|
626
|
+
this._deck = new import_core5.Deck({
|
|
607
627
|
...this._props,
|
|
608
628
|
parent: container,
|
|
609
629
|
deviceProps: {
|
|
@@ -643,7 +663,7 @@ var MapLibreOverlay = class {
|
|
|
643
663
|
}
|
|
644
664
|
});
|
|
645
665
|
map.on("styledata", this._handleStyleChange);
|
|
646
|
-
|
|
666
|
+
this._resolveLayerGroups([], this._props.layers);
|
|
647
667
|
return document.createElement("div");
|
|
648
668
|
}
|
|
649
669
|
_onRemoveOverlaid(map) {
|
|
@@ -663,12 +683,30 @@ var MapLibreOverlay = class {
|
|
|
663
683
|
}
|
|
664
684
|
_onRemoveInterleaved(map) {
|
|
665
685
|
map.off("styledata", this._handleStyleChange);
|
|
686
|
+
map.off("sourcedata", this._handleSourceData);
|
|
687
|
+
const appliedLayers = this._appliedLayers ?? this._props.layers;
|
|
688
|
+
this._appliedLayers = void 0;
|
|
666
689
|
try {
|
|
667
|
-
resolveMapLibreLayerGroups(map,
|
|
690
|
+
resolveMapLibreLayerGroups(map, appliedLayers, []);
|
|
668
691
|
} finally {
|
|
669
692
|
removeMapLibreDeckInstance(map);
|
|
670
693
|
}
|
|
671
694
|
}
|
|
695
|
+
/** Resolves layer groups now, or once the style and its sources finish loading. */
|
|
696
|
+
_resolveLayerGroups(oldLayers, newLayers) {
|
|
697
|
+
const map = this._map;
|
|
698
|
+
if (!map) {
|
|
699
|
+
return;
|
|
700
|
+
}
|
|
701
|
+
map.off("sourcedata", this._handleSourceData);
|
|
702
|
+
if (map.isStyleLoaded()) {
|
|
703
|
+
resolveMapLibreLayerGroups(map, this._appliedLayers ?? oldLayers, newLayers);
|
|
704
|
+
this._appliedLayers = void 0;
|
|
705
|
+
} else {
|
|
706
|
+
this._appliedLayers ?? (this._appliedLayers = oldLayers);
|
|
707
|
+
map.on("sourcedata", this._handleSourceData);
|
|
708
|
+
}
|
|
709
|
+
}
|
|
672
710
|
_getViews(map) {
|
|
673
711
|
if (!this._props.views) {
|
|
674
712
|
return getMapLibreDefaultView(map);
|
package/dist/index.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/index.ts", "../src/overlay.ts", "../src/deck-utils.ts", "../src/compatibility.ts", "../src/layer-utils.ts", "../src/resolve-layer-groups.ts", "../src/layer-group.ts"],
|
|
4
|
-
"mappings": "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",
|
|
5
|
-
"names": ["import_core", "GlobeView", "flatten", "import_core", "import_core", "flatten"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["import_core", "import_core", "GlobeView", "flatten", "import_core", "import_core", "flatten"]
|
|
6
6
|
}
|
package/dist/overlay.d.ts
CHANGED
|
@@ -15,6 +15,8 @@ export default class MapLibreOverlay implements IControl {
|
|
|
15
15
|
private _deck?;
|
|
16
16
|
private _map?;
|
|
17
17
|
private _container?;
|
|
18
|
+
/** Layers whose groups were last resolved into the map, while a newer resolve is deferred */
|
|
19
|
+
private _appliedLayers?;
|
|
18
20
|
private readonly _interleaved;
|
|
19
21
|
private _lastMouseDownPoint?;
|
|
20
22
|
/** Creates a MapLibre overlay. */
|
|
@@ -42,6 +44,9 @@ export default class MapLibreOverlay implements IControl {
|
|
|
42
44
|
private _onAddInterleaved;
|
|
43
45
|
private _onRemoveOverlaid;
|
|
44
46
|
private _onRemoveInterleaved;
|
|
47
|
+
/** Resolves layer groups now, or once the style and its sources finish loading. */
|
|
48
|
+
private _resolveLayerGroups;
|
|
49
|
+
private _handleSourceData;
|
|
45
50
|
private _handleStyleChange;
|
|
46
51
|
private _updateContainerSize;
|
|
47
52
|
private _getViews;
|
package/dist/overlay.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,IAAI,EAAS,MAAM,eAAe,CAAC;AAY3C,OAAO,KAAK,EAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,IAAI,EAAS,MAAM,eAAe,CAAC;AAY3C,OAAO,KAAK,EAAC,SAAS,EAAa,MAAM,eAAe,CAAC;AAEzD,OAAO,KAAK,EAAC,eAAe,EAAE,QAAQ,EAAE,GAAG,IAAI,WAAW,EAAC,MAAM,aAAa,CAAC;AAQ/E,sCAAsC;AACtC,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,SAAS,EACP,OAAO,GACP,QAAQ,GACR,IAAI,GACJ,QAAQ,GACR,QAAQ,GACR,eAAe,GACf,WAAW,GACX,kBAAkB,GAClB,YAAY,CACf,GAAG;IACF;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,mFAAmF;AACnF,MAAM,CAAC,OAAO,OAAO,eAAgB,YAAW,QAAQ;IACtD,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,KAAK,CAAC,CAAY;IAC1B,OAAO,CAAC,IAAI,CAAC,CAAc;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,6FAA6F;IAC7F,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAU;IAEvC,OAAO,CAAC,mBAAmB,CAAC,CAA2D;IAEvF,kCAAkC;gBACtB,KAAK,EAAE,oBAAoB;IAMvC,OAAO,CAAC,YAAY;IAapB,kEAAkE;IAClE,QAAQ,CAAC,KAAK,EAAE,oBAAoB,GAAG,IAAI;IAmB3C,iDAAiD;IACjD,KAAK,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc;IAmBvC,qDAAqD;IACrD,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgBjC,gCAAgC;IAChC,kBAAkB,IAAI,eAAe;IAIrC,mCAAmC;IACnC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAKrF,4CAA4C;IAC5C,mBAAmB,CACjB,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,GACjD,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAK1C,oCAAoC;IACpC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAKxF,+DAA+D;IAC/D,QAAQ,IAAI,IAAI;IAIhB,kFAAkF;IAClF,SAAS,IAAI,iBAAiB,GAAG,IAAI;IAOrC,OAAO,CAAC,cAAc;IA8CtB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,oBAAoB;IAY5B,mFAAmF;IACnF,OAAO,CAAC,mBAAmB;IAkB3B,OAAO,CAAC,iBAAiB,CAIvB;IAEF,OAAO,CAAC,kBAAkB,CASxB;IAEF,OAAO,CAAC,oBAAoB,CAQ1B;IAEF,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,gBAAgB,CAYtB;IAGF,OAAO,CAAC,iBAAiB,CAiFvB;CACH"}
|
package/dist/overlay.js
CHANGED
|
@@ -9,8 +9,13 @@ import { resolveMapLibreLayerGroups } from "./resolve-layer-groups.js";
|
|
|
9
9
|
export default class MapLibreOverlay {
|
|
10
10
|
/** Creates a MapLibre overlay. */
|
|
11
11
|
constructor(props) {
|
|
12
|
+
this._handleSourceData = () => {
|
|
13
|
+
if (this._map?.isStyleLoaded()) {
|
|
14
|
+
this._resolveLayerGroups(this._props.layers, this._props.layers);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
12
17
|
this._handleStyleChange = () => {
|
|
13
|
-
|
|
18
|
+
this._resolveLayerGroups(this._props.layers, this._props.layers);
|
|
14
19
|
if (!this._map) {
|
|
15
20
|
return;
|
|
16
21
|
}
|
|
@@ -124,7 +129,7 @@ export default class MapLibreOverlay {
|
|
|
124
129
|
/** Updates partial properties of the underlying Deck instance. */
|
|
125
130
|
setProps(props) {
|
|
126
131
|
if (this._interleaved && props.layers) {
|
|
127
|
-
|
|
132
|
+
this._resolveLayerGroups(this._props.layers, props.layers);
|
|
128
133
|
}
|
|
129
134
|
Object.assign(this._props, this._filterProps(props));
|
|
130
135
|
if (this._deck && this._map) {
|
|
@@ -256,7 +261,7 @@ export default class MapLibreOverlay {
|
|
|
256
261
|
}
|
|
257
262
|
});
|
|
258
263
|
map.on('styledata', this._handleStyleChange);
|
|
259
|
-
|
|
264
|
+
this._resolveLayerGroups([], this._props.layers);
|
|
260
265
|
return document.createElement('div');
|
|
261
266
|
}
|
|
262
267
|
_onRemoveOverlaid(map) {
|
|
@@ -277,13 +282,34 @@ export default class MapLibreOverlay {
|
|
|
277
282
|
}
|
|
278
283
|
_onRemoveInterleaved(map) {
|
|
279
284
|
map.off('styledata', this._handleStyleChange);
|
|
285
|
+
map.off('sourcedata', this._handleSourceData);
|
|
286
|
+
const appliedLayers = this._appliedLayers ?? this._props.layers;
|
|
287
|
+
this._appliedLayers = undefined;
|
|
280
288
|
try {
|
|
281
|
-
resolveMapLibreLayerGroups(map,
|
|
289
|
+
resolveMapLibreLayerGroups(map, appliedLayers, []);
|
|
282
290
|
}
|
|
283
291
|
finally {
|
|
284
292
|
removeMapLibreDeckInstance(map);
|
|
285
293
|
}
|
|
286
294
|
}
|
|
295
|
+
/** Resolves layer groups now, or once the style and its sources finish loading. */
|
|
296
|
+
_resolveLayerGroups(oldLayers, newLayers) {
|
|
297
|
+
const map = this._map;
|
|
298
|
+
if (!map) {
|
|
299
|
+
return;
|
|
300
|
+
}
|
|
301
|
+
map.off('sourcedata', this._handleSourceData);
|
|
302
|
+
if (map.isStyleLoaded()) {
|
|
303
|
+
resolveMapLibreLayerGroups(map, this._appliedLayers ?? oldLayers, newLayers);
|
|
304
|
+
this._appliedLayers = undefined;
|
|
305
|
+
}
|
|
306
|
+
else {
|
|
307
|
+
// `map.isStyleLoaded()` also waits for sources and tiles, so the last `styledata` event can
|
|
308
|
+
// fire before layer groups can be added. Retry once a `sourcedata` event finds it loaded.
|
|
309
|
+
this._appliedLayers ?? (this._appliedLayers = oldLayers);
|
|
310
|
+
map.on('sourcedata', this._handleSourceData);
|
|
311
|
+
}
|
|
312
|
+
}
|
|
287
313
|
_getViews(map) {
|
|
288
314
|
if (!this._props.views) {
|
|
289
315
|
return getMapLibreDefaultView(map);
|
package/dist/overlay.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overlay.js","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,IAAI,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,6BAA6B,EAC7B,4BAA4B,EAC5B,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,EAChB,0BAA0B,EAC3B,wBAAqB;AACtB,OAAO,EAAC,qBAAqB,EAAC,2BAAwB;AACtD,OAAO,EAAC,0BAA0B,EAAC,kCAA+B;AAgClE,mFAAmF;AACnF,MAAM,CAAC,OAAO,OAAO,eAAe;IASlC,kCAAkC;IAClC,YAAY,KAA2B;QA0M/B,uBAAkB,GAAG,GAAG,EAAE;YAChC,0BAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC9E,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YAED,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC,CAAC;QAEM,yBAAoB,GAAG,GAAG,EAAE;YAClC,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjC,MAAM,EAAC,WAAW,EAAE,YAAY,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC7D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;oBACnC,KAAK,EAAE,GAAG,WAAW,IAAI;oBACzB,MAAM,EAAE,GAAG,YAAY,IAAI;iBAC5B,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;QAeM,qBAAgB,GAAG,GAAG,EAAE;YAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;YACxB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;YACtB,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;gBAChB,IAAI,CAAC,QAAQ,CAAC;oBACZ,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;oBAC1B,SAAS,EAAE,oBAAoB,CAAC,GAAG,CAAC;iBACrC,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;oBACvB,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,sCAAsC;QAC9B,sBAAiB,GAAG,CAAC,KAAyB,EAAE,EAAE;YACxD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;YACxB,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;gBACjC,OAAO;YACT,CAAC;YAED,MAAM,SAAS,GAOX;gBACF,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,YAAY,EAAE,KAAK,CAAC,KAAK,IAAI,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAC;gBACzC,QAAQ,EAAE,KAAK;aAChB,CAAC;YAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC;YAC1C,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,IAAI,KAAK,CAAC,aAAa,YAAY,UAAU,EAAE,CAAC;gBAC1E,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;gBAClE,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;gBAClE,SAAS,CAAC,YAAY,GAAG;oBACvB,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM;oBAChC,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM;iBACjC,CAAC;YACJ,CAAC;YAED,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;gBACvB,KAAK,WAAW;oBACd,IAAI,CAAC,cAAc,CAAC,SAA2C,CAAC,CAAC;oBACjE,IAAI,CAAC,CAAC,KAAK,CAAC,aAAa,YAAY,UAAU,CAAC,EAAE,CAAC;wBACjD,OAAO;oBACT,CAAC;oBACD,IAAI,CAAC,mBAAmB,GAAG;wBACzB,GAAG,SAAS,CAAC,YAAY;wBACzB,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO;wBACpC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO;qBACrC,CAAC;oBACF,MAAM;gBAER,KAAK,WAAW;oBACd,SAAS,CAAC,IAAI,GAAG,UAAU,CAAC;oBAC5B,IAAI,CAAC,QAAQ,CAAC,SAA2C,CAAC,CAAC;oBAC3D,MAAM;gBAER,KAAK,MAAM;oBACT,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC;oBAC3B,IAAI,CAAC,QAAQ,CAAC,SAA2C,CAAC,CAAC;oBAC3D,MAAM;gBAER,KAAK,SAAS;oBACZ,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC;oBAC1B,IAAI,CAAC,QAAQ,CAAC,SAA2C,CAAC,CAAC;oBAC3D,MAAM;gBAER,KAAK,OAAO;oBACV,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC;oBACvB,IAAI,CAAC,QAAQ,CAAC,SAA2C,CAAC,CAAC;oBAC3D,MAAM;gBAER,KAAK,UAAU;oBACb,SAAS,CAAC,IAAI,GAAG,OAAO,CAAC;oBACzB,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC;oBACvB,IAAI,CAAC,QAAQ,CAAC,SAA2C,CAAC,CAAC;oBAC3D,MAAM;gBAER,KAAK,WAAW;oBACd,SAAS,CAAC,IAAI,GAAG,aAAa,CAAC;oBAC/B,IAAI,CAAC,cAAc,CAAC,SAA2C,CAAC,CAAC;oBACjE,MAAM;gBAER,KAAK,UAAU;oBACb,SAAS,CAAC,IAAI,GAAG,cAAc,CAAC;oBAChC,IAAI,CAAC,cAAc,CAAC,SAA2C,CAAC,CAAC;oBACjE,MAAM;gBAER;oBACE,OAAO;YACX,CAAC;QACH,CAAC,CAAC;QA3UA,MAAM,EAAC,WAAW,GAAG,KAAK,EAAC,GAAG,KAAK,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAEO,YAAY,CAAC,KAA2B;QAC9C,MAAM,EAAC,WAAW,EAAE,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,EAAC,GAAG,KAAK,CAAC;QACtE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;gBAClC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,EAAC,eAAe,EAAC,CAAC,CAAC;YAC9C,CAAC;YACD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;QACD,OAAO,SAAiC,CAAC;IAC3C,CAAC;IAED,kEAAkE;IAClE,QAAQ,CAAC,KAA2B;QAClC,IAAI,IAAI,CAAC,YAAY,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACtC,0BAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAErD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;gBAClB,GAAG,IAAI,CAAC,MAAM;gBACd,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;gBAChC,UAAU,EAAE;oBACV,GAAG,4BAA4B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC;oBAC7D,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU;iBAC1B;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,iDAAiD;IACjD,KAAK,CAAC,GAAgB;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QACpF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YAC5B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,qDAAqD;IACrD,QAAQ,CAAC,IAAiB;QACxB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;QAEtB,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,gCAAgC;IAChC,kBAAkB;QAChB,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,mCAAmC;IACnC,UAAU,CAAC,MAAyC;QAClD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,4CAA4C;IAC5C,mBAAmB,CACjB,MAAkD;QAElD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,oCAAoC;IACpC,WAAW,CAAC,MAA0C;QACpD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,+DAA+D;IAC/D,QAAQ;QACN,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,kFAAkF;IAClF,SAAS;QACP,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAM,CAAC,SAAS,EAAE,CAAC;IAC7E,CAAC;IAEO,cAAc,CAAC,GAAgB;QACrC,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE;YAC7B,QAAQ,EAAE,UAAU;YACpB,IAAI,EAAE,CAAC;YACP,GAAG,EAAE,CAAC;YACN,SAAS,EAAE,SAAS;YACpB,aAAa,EAAE,MAAM;SACtB,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAE5B,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAM;YACzB,GAAG,IAAI,CAAC,MAAM;YACd,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE;gBACX,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW;gBAC1B,mBAAmB,EAAE;oBACnB,GAAG,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,mBAAmB,KAAK,QAAQ;wBAClE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAmB;wBAC7C,CAAC,CAAC,SAAS,CAAC;oBACd,eAAe,EAAE,SAAS;iBAC3B;aACF;YACD,UAAU,EAAE;gBACV,GAAG,4BAA4B,CAAC,GAAG,EAAE,KAAK,CAAC;gBAC3C,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU;aAC1B;YACD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;YAC1B,SAAS,EAAE,oBAAoB,CAAC,GAAG,CAAC;SACrC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC5C,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACxC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC5C,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC5C,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACvC,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC1C,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC5C,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC3C,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACxC,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE3C,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,iBAAiB,CAAC,GAAgB;QACxC,IAAI,CAAC,KAAK,GAAG,6BAA6B,CAAC,GAAG,EAAE;YAC9C,GAAG,IAAI,CAAC,MAAM;YACd,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;YAC1B,UAAU,EAAE;gBACV,GAAG,4BAA4B,CAAC,GAAG,EAAE,IAAI,CAAC;gBAC1C,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU;aAC1B;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC7C,0BAA0B,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAExD,OAAO,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAEO,iBAAiB,CAAC,GAAgB;QACxC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC7C,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACzC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7C,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7C,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACxC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC3C,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7C,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC5C,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACzC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC;QACvB,6FAA6F;QAC7F,iGAAiG;QACjG,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC;IAEO,oBAAoB,CAAC,GAAgB;QAC3C,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC9C,IAAI,CAAC;YACH,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC1D,CAAC;gBAAS,CAAC;YACT,0BAA0B,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAuBO,SAAS,CAAC,GAAgB;QAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACvB,OAAO,sBAAsB,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACzF,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,gBAAgB,CAAC,CAAC;QAChF,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAC3B,CAAC;QACD,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC;IACjD,CAAC;CAmGF"}
|
|
1
|
+
{"version":3,"file":"overlay.js","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"description": "Use deck.gl layers with MapLibre GL JS",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
|
-
"version": "
|
|
6
|
+
"version": "10.0.0-alpha.1",
|
|
7
7
|
"publishConfig": {
|
|
8
8
|
"access": "public"
|
|
9
9
|
},
|
|
@@ -36,9 +36,12 @@
|
|
|
36
36
|
"src"
|
|
37
37
|
],
|
|
38
38
|
"sideEffects": false,
|
|
39
|
+
"dependencies": {
|
|
40
|
+
"@math.gl/core": "5.0.0-beta.8"
|
|
41
|
+
},
|
|
39
42
|
"peerDependencies": {
|
|
40
|
-
"@deck.gl/core": "~
|
|
41
|
-
"@luma.gl/core": "
|
|
43
|
+
"@deck.gl/core": "~10.0.0-alpha",
|
|
44
|
+
"@luma.gl/core": "10.0.0-alpha.14",
|
|
42
45
|
"maplibre-gl": "^4.5.1 || ^5.0.0 || ^6.0.0"
|
|
43
46
|
},
|
|
44
47
|
"devDependencies": {
|
|
@@ -47,5 +50,5 @@
|
|
|
47
50
|
"maplibre-gl-v5": "npm:maplibre-gl@5.0.0",
|
|
48
51
|
"maplibre-gl-v6": "npm:maplibre-gl@6.0.0"
|
|
49
52
|
},
|
|
50
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "78067bff4f951169e02cbbe486ca9399078d1675"
|
|
51
54
|
}
|
package/src/compatibility.ts
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
+
import {clamp} from '@math.gl/core';
|
|
6
|
+
|
|
5
7
|
export type MapLibreRenderParameters = {
|
|
6
8
|
farZ: number;
|
|
7
9
|
nearZ: number;
|
|
@@ -36,6 +38,30 @@ export function getMapLibreProjection(map: CompatibleMapLibreMap): 'mercator' |
|
|
|
36
38
|
return 'mercator';
|
|
37
39
|
}
|
|
38
40
|
|
|
41
|
+
/** Zoom range in which MapLibre's `globe` projection transitions to Web Mercator */
|
|
42
|
+
const MAPLIBRE_GLOBE_TRANSITION_ZOOMS = [11, 12] as const;
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Returns the elevation of the map center that the MapLibre camera targets, if any.
|
|
46
|
+
* MapLibre's globe camera targets sea level and its Web Mercator camera the terrain. During the
|
|
47
|
+
* globe projection's transition, MapLibre blends the two, which a target in between approximates.
|
|
48
|
+
*/
|
|
49
|
+
export function getMapLibreCameraElevation(
|
|
50
|
+
map: CompatibleMapLibreMap,
|
|
51
|
+
zoom: number
|
|
52
|
+
): number | undefined {
|
|
53
|
+
const elevation = getMapLibreElevation(map);
|
|
54
|
+
if (typeof elevation !== 'number' || !Number.isFinite(elevation)) {
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
57
|
+
if (getMapLibreProjection(map) === 'globe') {
|
|
58
|
+
const [startZoom, endZoom] = MAPLIBRE_GLOBE_TRANSITION_ZOOMS;
|
|
59
|
+
const mercatorWeight = clamp((zoom - startZoom) / (endZoom - startZoom), 0, 1);
|
|
60
|
+
return elevation * mercatorWeight;
|
|
61
|
+
}
|
|
62
|
+
return elevation;
|
|
63
|
+
}
|
|
64
|
+
|
|
39
65
|
export function getMapLibreRenderParameters(
|
|
40
66
|
parametersOrMatrix: unknown,
|
|
41
67
|
legacyParameters?: unknown
|
package/src/deck-utils.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import {Deck, MapView, _GlobeView as GlobeView, _flatten as flatten} from '@deck.gl/core';
|
|
6
6
|
|
|
7
7
|
import {
|
|
8
|
-
|
|
8
|
+
getMapLibreCameraElevation,
|
|
9
9
|
getMapLibreProjection,
|
|
10
10
|
type MapLibreRenderParameters
|
|
11
11
|
} from './compatibility';
|
|
@@ -103,8 +103,8 @@ export function getMapLibreViewState(map: MapLibreMap): MapViewState & {
|
|
|
103
103
|
repeat: map.getRenderWorldCopies()
|
|
104
104
|
};
|
|
105
105
|
|
|
106
|
-
const elevation =
|
|
107
|
-
if (
|
|
106
|
+
const elevation = getMapLibreCameraElevation(map, viewState.zoom);
|
|
107
|
+
if (elevation !== undefined) {
|
|
108
108
|
viewState.position = [0, 0, elevation];
|
|
109
109
|
}
|
|
110
110
|
|
|
@@ -310,9 +310,9 @@ function afterMapLibreRender(deck: Deck, map: MapLibreMap): void {
|
|
|
310
310
|
* changes without a move event while terrain loads.
|
|
311
311
|
*/
|
|
312
312
|
function syncMapLibreElevation(deck: Deck, map: MapLibreMap): void {
|
|
313
|
-
const elevation =
|
|
313
|
+
const elevation = getMapLibreCameraElevation(map, map.getZoom());
|
|
314
314
|
const viewState = deck.props.viewState as MapViewState | null;
|
|
315
|
-
if (
|
|
315
|
+
if (viewState?.position?.[2] !== elevation) {
|
|
316
316
|
onMapLibreMove(deck, map);
|
|
317
317
|
}
|
|
318
318
|
}
|
package/src/overlay.ts
CHANGED
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
import {getMapLibreProjection} from './compatibility';
|
|
15
15
|
import {resolveMapLibreLayerGroups} from './resolve-layer-groups';
|
|
16
16
|
|
|
17
|
-
import type {DeckProps} from '@deck.gl/core';
|
|
17
|
+
import type {DeckProps, LayersList} from '@deck.gl/core';
|
|
18
18
|
import type {MjolnirGestureEvent, MjolnirPointerEvent} from 'mjolnir.js';
|
|
19
19
|
import type {ControlPosition, IControl, Map as MapLibreMap} from 'maplibre-gl';
|
|
20
20
|
|
|
@@ -50,6 +50,8 @@ export default class MapLibreOverlay implements IControl {
|
|
|
50
50
|
private _deck?: Deck<any>;
|
|
51
51
|
private _map?: MapLibreMap;
|
|
52
52
|
private _container?: HTMLDivElement;
|
|
53
|
+
/** Layers whose groups were last resolved into the map, while a newer resolve is deferred */
|
|
54
|
+
private _appliedLayers?: LayersList;
|
|
53
55
|
private readonly _interleaved: boolean;
|
|
54
56
|
|
|
55
57
|
private _lastMouseDownPoint?: {x: number; y: number; clientX: number; clientY: number};
|
|
@@ -77,7 +79,7 @@ export default class MapLibreOverlay implements IControl {
|
|
|
77
79
|
/** Updates partial properties of the underlying Deck instance. */
|
|
78
80
|
setProps(props: MapLibreOverlayProps): void {
|
|
79
81
|
if (this._interleaved && props.layers) {
|
|
80
|
-
|
|
82
|
+
this._resolveLayerGroups(this._props.layers, props.layers);
|
|
81
83
|
}
|
|
82
84
|
|
|
83
85
|
Object.assign(this._props, this._filterProps(props));
|
|
@@ -226,7 +228,7 @@ export default class MapLibreOverlay implements IControl {
|
|
|
226
228
|
});
|
|
227
229
|
|
|
228
230
|
map.on('styledata', this._handleStyleChange);
|
|
229
|
-
|
|
231
|
+
this._resolveLayerGroups([], this._props.layers);
|
|
230
232
|
|
|
231
233
|
return document.createElement('div');
|
|
232
234
|
}
|
|
@@ -250,15 +252,43 @@ export default class MapLibreOverlay implements IControl {
|
|
|
250
252
|
|
|
251
253
|
private _onRemoveInterleaved(map: MapLibreMap): void {
|
|
252
254
|
map.off('styledata', this._handleStyleChange);
|
|
255
|
+
map.off('sourcedata', this._handleSourceData);
|
|
256
|
+
const appliedLayers = this._appliedLayers ?? this._props.layers;
|
|
257
|
+
this._appliedLayers = undefined;
|
|
253
258
|
try {
|
|
254
|
-
resolveMapLibreLayerGroups(map,
|
|
259
|
+
resolveMapLibreLayerGroups(map, appliedLayers, []);
|
|
255
260
|
} finally {
|
|
256
261
|
removeMapLibreDeckInstance(map);
|
|
257
262
|
}
|
|
258
263
|
}
|
|
259
264
|
|
|
265
|
+
/** Resolves layer groups now, or once the style and its sources finish loading. */
|
|
266
|
+
private _resolveLayerGroups(oldLayers?: LayersList, newLayers?: LayersList): void {
|
|
267
|
+
const map = this._map;
|
|
268
|
+
if (!map) {
|
|
269
|
+
return;
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
map.off('sourcedata', this._handleSourceData);
|
|
273
|
+
if (map.isStyleLoaded()) {
|
|
274
|
+
resolveMapLibreLayerGroups(map, this._appliedLayers ?? oldLayers, newLayers);
|
|
275
|
+
this._appliedLayers = undefined;
|
|
276
|
+
} else {
|
|
277
|
+
// `map.isStyleLoaded()` also waits for sources and tiles, so the last `styledata` event can
|
|
278
|
+
// fire before layer groups can be added. Retry once a `sourcedata` event finds it loaded.
|
|
279
|
+
this._appliedLayers ??= oldLayers;
|
|
280
|
+
map.on('sourcedata', this._handleSourceData);
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
private _handleSourceData = () => {
|
|
285
|
+
if (this._map?.isStyleLoaded()) {
|
|
286
|
+
this._resolveLayerGroups(this._props.layers, this._props.layers);
|
|
287
|
+
}
|
|
288
|
+
};
|
|
289
|
+
|
|
260
290
|
private _handleStyleChange = () => {
|
|
261
|
-
|
|
291
|
+
this._resolveLayerGroups(this._props.layers, this._props.layers);
|
|
262
292
|
if (!this._map) {
|
|
263
293
|
return;
|
|
264
294
|
}
|