Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Update MapLibre to 6.8.0 (#3311)

Koen011150dec0ab
diff --git a/container/src/main/java/org/openremote/container/web/WebService.java b/container/src/main/java/org/openremote/container/web/WebService.java
index 6983029f5..2a8b54202 100644
--- a/container/src/main/java/org/openremote/container/web/WebService.java
+++ b/container/src/main/java/org/openremote/container/web/WebService.java
@@ -110,6 +110,7 @@ public abstract class WebService implements ContainerService {
public static final Map<String, String> MIME_TYPES =
Map.of(
+ "mjs", "text/javascript",
"pbf", "application/x-protobuf",
"wsdl", "application/xml",
"xsl", "text/xsl");
diff --git a/ui/app/manager/package.json b/ui/app/manager/package.json
index 03febc136..38cbd3216 100644
--- a/ui/app/manager/package.json
+++ b/ui/app/manager/package.json
@@ -58,7 +58,7 @@
"@openremote/theme": "workspace:*",
"@reduxjs/toolkit": "^2.12.0",
"lit": "^3.3.1",
- "maplibre-gl": "~5.19.0",
+ "maplibre-gl": "~6.8.0",
"moment": "^2.29.4",
"reselect": "^4.1.8"
},
diff --git a/ui/app/manager/rsbuild.config.ts b/ui/app/manager/rsbuild.config.ts
index 5e8a364d7..c595c6749 100644
--- a/ui/app/manager/rsbuild.config.ts
+++ b/ui/app/manager/rsbuild.config.ts
@@ -16,9 +16,21 @@
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
+import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
import { defineConfig } from "@rsbuild/core";
+// The maplibre worker imports the shared module, so both must sit side by side
+const maplibreDist = dirname(createRequire(import.meta.url).resolve("maplibre-gl/dist/maplibre-gl-worker.mjs"));
+
export default defineConfig({
+ output: {
+ copy: ["maplibre-gl-worker.mjs", "maplibre-gl-shared.mjs"].map((file) => ({
+ from: join(maplibreDist, file),
+ to: "maplibre",
+ info: { minimized: true },
+ })),
+ },
dev: {
hmr: false, // HMR does not work for our Web Components atm
liveReload: true,
@@ -73,6 +85,7 @@ export default defineConfig({
},
rspack: (config, { addRules }) => {
addRules([{ test: /(@material|@mdi).*\.css$/, type: "asset/source" }]); // Add rule to treat external CSS imports as raw strings.
+ addRules([{ test: /maplibre-gl[\\/]dist[\\/].+\.mjs$/, parser: { url: false } }]); // maplibre builds its worker URL at runtime, so its own `new URL()` calls are not build time assets.
return config;
},
},
diff --git a/ui/app/storybook/rsbuild.config.ts b/ui/app/storybook/rsbuild.config.ts
index 315009826..a5b90c82c 100644
--- a/ui/app/storybook/rsbuild.config.ts
+++ b/ui/app/storybook/rsbuild.config.ts
@@ -16,9 +16,21 @@
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
+import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
import { defineConfig } from "@rsbuild/core";
+// The maplibre worker imports the shared module, so both must sit side by side
+const maplibreDist = dirname(createRequire(import.meta.url).resolve("maplibre-gl/dist/maplibre-gl-worker.mjs"));
+
export default defineConfig({
+ output: {
+ copy: ["maplibre-gl-worker.mjs", "maplibre-gl-shared.mjs"].map((file) => ({
+ from: join(maplibreDist, file),
+ to: "maplibre",
+ info: { minimized: true },
+ })),
+ },
source: {
decorators: {
version: "legacy",
@@ -62,6 +74,7 @@ export default defineConfig({
rspack: (config, { addRules }) => {
addRules([{ test: /(maplibre|@material|gridstack|@mdi).*\.css$/, type: "asset/source" }]); // Add rule to treat external CSS imports as raw strings.
addRules([{ test: /\.wasm$/, type: "asset/resource" }]);
+ addRules([{ test: /maplibre-gl[\\/]dist[\\/].+\.mjs$/, parser: { url: false } }]); // maplibre builds its worker URL at runtime, so its own `new URL()` calls are not build time assets.
return config;
},
},
diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.json
index 75d35c69b..29df79392 100644
--- a/ui/component/or-map/package.json
+++ b/ui/component/or-map/package.json
@@ -39,7 +39,7 @@
"lit": "^3.3.1",
"lit-html": "^3.3.1",
"lodash.debounce": "^4.0.8",
- "maplibre-gl": "~5.19.0"
+ "maplibre-gl": "~6.8.0"
},
"devDependencies": {
"@openremote/util": "workspace:*",
diff --git a/ui/component/or-map/rspack.config.js b/ui/component/or-map/rspack.config.js
index e4427386a..fb6b19052 100644
--- a/ui/component/or-map/rspack.config.js
+++ b/ui/component/or-map/rspack.config.js
@@ -20,8 +20,8 @@ const util = require("@openremote/util");
bundles = {
index: {
+ // maplibre is bundled in, it no longer ships a UMD build to load as a global
vendor: {
- "maplibre-gl": "maplibre",
moment: "moment",
},
excludeOr: true,
diff --git a/ui/component/or-map/src/asset-map.ts b/ui/component/or-map/src/asset-map.ts
index 92e3a1c4b..38a345e91 100644
--- a/ui/component/or-map/src/asset-map.ts
+++ b/ui/component/or-map/src/asset-map.ts
@@ -233,10 +233,7 @@ export class AssetMap extends BaseMap {
if (!this._source) return;
const features = this._map!.querySourceFeatures("assets");
if (!this._hasRequired(asset) || !this._isAssetVisible(asset) || !this._isMissing(asset, features)) return;
- if (!(asset.type in this._assetTypeColors)) {
- this._assetTypeColors[asset.type] = getMarkerIconAndColorFromAssetType(asset.type)?.color as string;
- this._source.workerOptions.clusterProperties = this._getClusterProperties();
- }
+ if (this._addAssetType(asset.type)) this._updateClusterProperties(this._source);
this._assets[asset.id] = asset;
this._source.updateData({ add: [AssetMap._assetToFeature(asset)] });
}
@@ -247,13 +244,12 @@ export class AssetMap extends BaseMap {
let missing = assets.filter(this._hasRequired).filter((a) => this._isAssetVisible(a));
if (features?.length) missing = missing.filter((a) => this._isMissing(a, features));
if (!missing.length) return;
+ let newTypes = false;
for (const asset of missing) {
- if (!(asset.type in this._assetTypeColors)) {
- this._assetTypeColors[asset.type] = getMarkerIconAndColorFromAssetType(asset.type)?.color as string;
- }
+ newTypes = this._addAssetType(asset.type) || newTypes;
this._assets[asset.id] = asset;
}
- this._source.workerOptions.clusterProperties = this._getClusterProperties();
+ if (newTypes) this._updateClusterProperties(this._source);
this._source.updateData({ add: missing.map(AssetMap._assetToFeature) });
}
@@ -283,6 +279,7 @@ export class AssetMap extends BaseMap {
const toRemove: string[] = [];
const toAdd: IdentifiableAsset[] = [];
+ let newTypes = false;
for (const id in this._assets) {
if (this._assets[id] && !this._isAssetVisible(this._assets[id]!)) {
@@ -296,9 +293,7 @@ export class AssetMap extends BaseMap {
if (!asset || !this._hasRequired(asset) || this._assets[id]) continue;
if (this._isAssetVisible(asset)) {
const a = asset as IdentifiableAsset;
- if (!(a.type in this._assetTypeColors)) {
- this._assetTypeColors[a.type] = getMarkerIconAndColorFromAssetType(a.type)?.color as string;
- }
+ newTypes = this._addAssetType(a.type) || newTypes;
this._assets[a.id] = a;
toAdd.push(a);
}
@@ -306,7 +301,7 @@ export class AssetMap extends BaseMap {
if (!toRemove.length && !toAdd.length) return;
- this._source.workerOptions.clusterProperties = this._getClusterProperties();
+ if (newTypes) this._updateClusterProperties(this._source);
this._source.updateData({
...(toRemove.length && { remove: toRemove }),
...(toAdd.length && { add: toAdd.map(AssetMap._assetToFeature) }),
@@ -351,7 +346,7 @@ export class AssetMap extends BaseMap {
this._source = this._map.getSource("assets") as GeoJSONSource;
- this._map.on("data", this._onData);
+ this._map.on("sourcedata", this._onData);
// Create asset-specific controls
if (this._filters?.length) {
@@ -458,6 +453,23 @@ export class AssetMap extends BaseMap {
return Object.fromEntries(Object.keys(this._assetTypeColors).map(AssetMap._getClusterPropertyExpression));
}
+ /**
+ * Registers the colour of an asset type the map has not seen before
+ * @returns Whether the type is new, meaning the cluster properties are out of date
+ */
+ private _addAssetType(type: string) {
+ if (type in this._assetTypeColors) return false;
+ this._assetTypeColors[type] = getMarkerIconAndColorFromAssetType(type)?.color as string;
+ return true;
+ }
+
+ private _updateClusterProperties(source: GeoJSONSource) {
+ source.workerOptions.clusterProperties = this._getClusterProperties();
+ // Data updates keep the existing cluster index, only a cluster options update rebuilds it with new properties
+ const { cluster } = source.getClusterOptions();
+ if (cluster) source.setClusterOptions({ cluster });
+ }
+
private static _getClusterPropertyExpression(value: string) {
return [value, ["+", ["case", ["==", ["get", AssetMap._clusterProperty], value], 1, 0]]];
}
diff --git a/ui/component/or-map/src/base-map.ts b/ui/component/or-map/src/base-map.ts
index a8c232e1a..b48e6962f 100644
--- a/ui/component/or-map/src/base-map.ts
+++ b/ui/component/or-map/src/base-map.ts
@@ -18,7 +18,7 @@
*/
import type { GeoJsonConfig } from "@openremote/model";
import manager, { DefaultColor4 } from "@openremote/core";
-import maplibregl, {
+import {
type AddLayerObject,
AttributionControl,
type IControl,
@@ -44,7 +44,7 @@ import {
} from "./index";
import { OrMapGeocoderControl } from "./controls/geocoder";
import type { OrMapMarker } from "./markers/or-map-marker";
-import { getLngLat, isWebglSupported, metersToPixelsAtMaxZoom } from "./util";
+import { getLngLat, metersToPixelsAtMaxZoom } from "./util";
import { isMapboxURL, transformMapboxUrl } from "./util/mapbox-url";
import type { Feature, FeatureCollection } from "geojson";
@@ -273,13 +273,29 @@ export class BaseMap {
options.zoom = this._zoom;
}
+ // The worker and the shared module it imports are copied next to the app by its bundler config
+ if (!map.getWorkerUrl()) map.setWorkerUrl(new URL("maplibre/maplibre-gl-worker.mjs", document.baseURI).href);
+
// Firefox headless mode does not support webgl, see https://bugzilla.mozilla.org/show_bug.cgi?id=1375585
- if (!isWebglSupported()) {
- console.warn("WebGL is not supported in this environment. The map cannot be initialized.");
+ try {
+ this._map = new map.Map(options);
+ } catch (error) {
+ // Creating the map fails where WebGL2 is unavailable, such as headless Firefox
+ if (!(error instanceof map.GPUInitializationError)) throw error;
+ console.warn(error.message);
return;
}
- this._map = new map.Map(options);
+ // Recreating the context after it was lost and restored can also fail;
+ // that failure arrives through the error event since the map already exists.
+ // Source: https://maplibre.org/maplibre-gl-js/docs/examples/check-if-webgl-is-supported/
+ this._map.on("error", (e) => {
+ if (e.error instanceof map.GPUInitializationError) {
+ console.warn(e.error.message);
+ return;
+ }
+ console.error(e.error);
+ });
await this._styleLoaded();
@@ -333,7 +349,7 @@ export class BaseMap {
protected _styleLoaded(): Promise<void> {
return new Promise((resolve) => {
if (this._map) {
- this._map.once("style.load", resolve);
+ this._map.once("style.load", () => resolve());
}
});
}
@@ -805,9 +821,6 @@ export class BaseMap {
this._map.on("touchcancel", clearTimeoutFunc);
this._map.on("touchmove", clearTimeoutFunc);
this._map.on("moveend", clearTimeoutFunc);
- this._map.on("gesturestart", clearTimeoutFunc);
- this._map.on("gesturechange", clearTimeoutFunc);
- this._map.on("gestureend", clearTimeoutFunc);
}
}
diff --git a/ui/component/or-map/src/controls/geocoder.ts b/ui/component/or-map/src/controls/geocoder.ts
index cd56f816c..6e0c51947 100644
--- a/ui/component/or-map/src/controls/geocoder.ts
+++ b/ui/component/or-map/src/controls/geocoder.ts
@@ -19,9 +19,8 @@
import { css, html } from "lit";
import { OrElement } from "@openremote/or-element";
import { customElement, property, state } from "lit/decorators.js";
-import type { Map as MapGL } from "maplibre-gl";
+import { type Map as MapGL, Marker } from "maplibre-gl";
import { OrMapBaseControl } from "./base";
-import maplibregl from "maplibre-gl";
import debounce from "lodash.debounce";
import { i18next } from "@openremote/or-translate";
import "@openremote/or-vaadin-components/or-vaadin-combo-box";
@@ -226,7 +225,7 @@ export class OrMapGeocoder extends OrElement {
this._hasValue = true;
this._marker?.remove();
this._map?.flyTo({ center: item.center, zoom: 14 });
- this._marker = new maplibregl.Marker().setLngLat(item.center).addTo(this._map!);
+ this._marker = new Marker().setLngLat(item.center).addTo(this._map!);
this.dispatchEvent(
new OrMapGeocoderChangeEvent({
type: "Feature",
diff --git a/ui/component/or-map/src/markers/or-cluster-marker.ts b/ui/component/or-map/src/markers/or-cluster-marker.ts
index 153a4e2b0..48e530b8a 100644
--- a/ui/component/or-map/src/markers/or-cluster-marker.ts
+++ b/ui/component/or-map/src/markers/or-cluster-marker.ts
@@ -48,18 +48,17 @@ export class OrClusterMarker extends OrElement {
}
/**
- * Checks that all slices match the accumulated cluster properties
- *
- * Note: This method assumes the slices contain the same types as `counts`. If not,
- * a new cluster marker should be created.
+ * Checks that all slices match the accumulated cluster properties and add up to the cluster's point count
* @param counts A record of the accumulated cluster properties to check
- * @returns Whether the slices have the same counts as the accumulated properties
+ * @returns Whether the slices still represent the cluster
*/
public slicesMatch(counts: Record<string, number>) {
+ let total = 0;
for (const [type, , count] of this._slices) {
if (counts[type] !== count) return false;
+ total += count;
}
- return true;
+ return total === counts.point_count;
}
protected render() {
diff --git a/ui/component/or-map/src/util/index.ts b/ui/component/or-map/src/util/index.ts
index 5d704f9a0..b7e940cb3 100644
--- a/ui/component/or-map/src/util/index.ts
+++ b/ui/component/or-map/src/util/index.ts
@@ -175,28 +175,6 @@ export function getMarkerIconAndColorFromAssetType(
};
}
-// Source: maplibre.org/maplibre-gl-js/docs/examples/check-for-support/
-export function isWebglSupported() {
- if (window.WebGLRenderingContext) {
- const canvas = document.createElement("canvas");
- try {
- // Note that { failIfMajorPerformanceCaveat: true } can be passed as a second argument
- // to canvas.getContext(), causing the check to fail if hardware rendering is not available. See
- // https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/getContext
- // for more details.
- const context = canvas.getContext("webgl2") || canvas.getContext("webgl");
- if (context && typeof context.getParameter === "function") {
- return true;
- }
- } catch (e) {
- // WebGL is supported, but disabled
- }
- return false;
- }
- // WebGL not supported
- return false;
-}
-
export function isAssetWithLocation(asset: Asset): asset is AssetWithLocation {
if (!asset?.attributes) return false;
const attr = asset.attributes[WellknownAttributes.LOCATION] as Attribute<GeoJSONPoint> | undefined;
diff --git a/ui/component/or-map/src/util/mapbox-url.ts b/ui/component/or-map/src/util/mapbox-url.ts
index f8e9121aa..7544e8e46 100644
--- a/ui/component/or-map/src/util/mapbox-url.ts
+++ b/ui/component/or-map/src/util/mapbox-url.ts
@@ -16,19 +16,17 @@
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
-import { ResourceType } from "maplibre-gl";
-
export function isMapboxURL(url: string) {
return url.indexOf("mapbox:") === 0;
}
-export function transformMapboxUrl(url: string, accessToken: string, resourceType?: ResourceType) {
+export function transformMapboxUrl(url: string, accessToken: string, resourceType?: string) {
if (url.indexOf("/styles/") > -1 && url.indexOf("/sprite") === -1)
return { url: normalizeStyleURL(url, accessToken) };
if (url.indexOf("/sprites/") > -1) return { url: normalizeSpriteURL(url, accessToken) };
if (url.indexOf("/fonts/") > -1) return { url: normalizeGlyphsURL(url, accessToken) };
if (url.indexOf("/v4/") > -1) return { url: normalizeSourceURL(url, accessToken) };
- if (resourceType === ResourceType.Source) return { url: normalizeSourceURL(url, accessToken) };
+ if (resourceType === "Source") return { url: normalizeSourceURL(url, accessToken) };
}
function parseUrl(url: string) {
diff --git a/ui/util/rspack.util.js b/ui/util/rspack.util.js
index 67c5a9cd0..3d194b37e 100644
--- a/ui/util/rspack.util.js
+++ b/ui/util/rspack.util.js
@@ -33,6 +33,11 @@ function getStandardModuleRules() {
test: /\.wasm$/,
type: "asset/resource",
},
+ {
+ // maplibre builds its worker URL at runtime, so its own `new URL()` calls are not build time assets
+ test: /maplibre-gl[\\/]dist[\\/].+\.mjs$/,
+ parser: { url: false },
+ },
{
test: /\.css$/, //
exclude: /(maplibre|@material|gridstack|@mdi).*\.css$/,
@@ -60,6 +65,14 @@ function getStandardModuleRules() {
};
}
+function resolveDir(request, dirname) {
+ try {
+ return path.dirname(require.resolve(request, { paths: [dirname] }));
+ } catch {
+ return undefined;
+ }
+}
+
function getAppConfig(mode, isDevServer, dirname, managerUrl, keycloakUrl, port) {
const production = mode === "production";
port = port || 9000;
@@ -192,6 +205,18 @@ function getAppConfig(mode, isDevServer, dirname, managerUrl, keycloakUrl, port)
toType: "file",
});
}
+ // Check if maplibre is installed, its worker imports the shared module so both must sit side by side
+ const maplibreDist = resolveDir("maplibre-gl/dist/maplibre-gl-worker.mjs", dirname);
+ if (maplibreDist) {
+ for (const file of ["maplibre-gl-worker.mjs", "maplibre-gl-shared.mjs"]) {
+ patterns.push({
+ from: path.join(maplibreDist, file),
+ to: "maplibre",
+ toType: "dir",
+ info: { minimized: true },
+ });
+ }
+ }
// Copy unprocessed files
config.plugins.push(
diff --git a/yarn.lock b/yarn.lock
index b68e25170..6924de876 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -981,22 +981,10 @@ __metadata:
languageName: node
linkType: hard
-"@mapbox/geojson-rewind@npm:^0.5.2":
- version: 0.5.2
- resolution: "@mapbox/geojson-rewind@npm:0.5.2"
- dependencies:
- get-stream: "npm:^6.0.1"
- minimist: "npm:^1.2.6"
- bin:
- geojson-rewind: geojson-rewind
- checksum: 10c0/631f89ba5b656cb1e02197c242b231f98da0afb96815fa26481497176d6bd5f2aac77af4950da91c954094694acbc26382bd3d38146705737e8ff06442d95a12
- languageName: node
- linkType: hard
-
-"@mapbox/jsonlint-lines-primitives@npm:^2.0.2, @mapbox/jsonlint-lines-primitives@npm:~2.0.2":
- version: 2.0.2
- resolution: "@mapbox/jsonlint-lines-primitives@npm:2.0.2"
- checksum: 10c0/5814e42fc453700132f93ea742aabcef9a3c98d9bf17d4c1106f82d1dcd91bbc93052e66e29014323b9b2a41b020c743d897e4a96cc4ed2f734482d587d8c2b2
+"@mapbox/jsonlint-lines-primitives@npm:^2.0.3":
+ version: 2.0.3
+ resolution: "@mapbox/jsonlint-lines-primitives@npm:2.0.3"
+ checksum: 10c0/e114b27757a21ccbf20e3c99761e8b48d2527cb321f47e5a4d9aa4b5781b16f15b1f6f4ab678a4329f93668956281a05b56387331dc0260981a2ef695414fc1d
languageName: node
linkType: hard
@@ -1007,20 +995,13 @@ __metadata:
languageName: node
linkType: hard
-"@mapbox/tiny-sdf@npm:^2.0.7":
+"@mapbox/tiny-sdf@npm:^2.2.0":
version: 2.2.0
resolution: "@mapbox/tiny-sdf@npm:2.2.0"
checksum: 10c0/9cfddf94bcdbedb047cd5e1bf17b8d90cdfe3e5d0286282769f697d8972955be33cc3e49c23f60d977c99439f3de80ed429b4bf73599cec441cb493ba3c6c8ed
languageName: node
linkType: hard
-"@mapbox/unitbezier@npm:^0.0.1":
- version: 0.0.1
- resolution: "@mapbox/unitbezier@npm:0.0.1"
- checksum: 10c0/97f39d4fbdf9579d0a1a8be0d536eb113a805d36459e774014f488a7ca6cc9dcfc77ab7a2ebe5af395ad50da6efb4dbf2566de0db3f62b6b8675cddbace8f86a
- languageName: node
- linkType: hard
-
"@mapbox/unitbezier@npm:^1.0.0":
version: 1.0.0
resolution: "@mapbox/unitbezier@npm:1.0.0"
@@ -1028,36 +1009,31 @@ __metadata:
languageName: node
linkType: hard
-"@mapbox/vector-tile@npm:^2.0.4":
- version: 2.0.4
- resolution: "@mapbox/vector-tile@npm:2.0.4"
+"@mapbox/vector-tile@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "@mapbox/vector-tile@npm:3.0.0"
dependencies:
"@mapbox/point-geometry": "npm:~1.1.0"
"@types/geojson": "npm:^7946.0.16"
- pbf: "npm:^4.0.1"
- checksum: 10c0/3cade1c8c3a4e0896bbe8ee1d6bcdb78cb34dc2257bc0151ba85d06f2cb96c87b5bddfd28f8b8a20131a85aa26af7091965da19ac356bf126eb66e20d48542fa
- languageName: node
- linkType: hard
-
-"@mapbox/whoots-js@npm:^3.1.0":
- version: 3.1.0
- resolution: "@mapbox/whoots-js@npm:3.1.0"
- checksum: 10c0/fe9e959a9049bcbc2c05d9d1156e050191ad697a1bd95e41cdfa069051ff1d6f2930ced234a8d68d5a0bf78091feab30d76497418ec800d90f0aac8691fe4fd4
+ pbf: "npm:^5.0.0"
+ checksum: 10c0/ccede784967394a171956376de98b9cc9d5683ae67e3516246082d7bd5a157f711777955d111cd4885cc9dc4e22ef26e8b9af70ef6c8746392dd8de84e201ba6
languageName: node
linkType: hard
-"@maplibre/geojson-vt@npm:^5.0.4":
- version: 5.0.4
- resolution: "@maplibre/geojson-vt@npm:5.0.4"
- checksum: 10c0/74cf4e1ee0fee23b6a6946b03eeb01ae6fc55e8490cea80c1184387fae3be14dab8383c203d12b05687a1b33fc9b9b9796808c873ed5c9deef82c247bd49e5b3
+"@maplibre/geojson-vt@npm:^6.1.1":
+ version: 6.1.1
+ resolution: "@maplibre/geojson-vt@npm:6.1.1"
+ dependencies:
+ kdbush: "npm:^4.1.0"
+ checksum: 10c0/75f2fcfd0c25e1c92f83609affefa762aaf52995f86c6b5258d797050b39392b2f39bc7462ef015c82884e2b2c329bef823b614a1c9fbc8d98ddb8fa8c042854
languageName: node
linkType: hard
-"@maplibre/maplibre-gl-style-spec@npm:^24.4.1":
- version: 24.10.0
- resolution: "@maplibre/maplibre-gl-style-spec@npm:24.10.0"
+"@maplibre/maplibre-gl-style-spec@npm:^26.4.1":
+ version: 26.4.2
+ resolution: "@maplibre/maplibre-gl-style-spec@npm:26.4.2"
dependencies:
- "@mapbox/jsonlint-lines-primitives": "npm:~2.0.2"
+ "@mapbox/jsonlint-lines-primitives": "npm:^2.0.3"
"@mapbox/unitbezier": "npm:^1.0.0"
json-stringify-pretty-compact: "npm:^4.0.0"
minimist: "npm:^1.2.8"
@@ -1067,20 +1043,20 @@ __metadata:
gl-style-format: dist/gl-style-format.mjs
gl-style-migrate: dist/gl-style-migrate.mjs
gl-style-validate: dist/gl-style-validate.mjs
- checksum: 10c0/43ababa29ca151b274c5faea8a3cfe6c84c4b5ae47430fb92ea3711c733ea05db159eb56b3430febd2a11a0416ae01617ffa63f1951a4d8a44d0671299fd7bce
+ checksum: 10c0/46e816876e2e59b3e82971c41af183b92188ed6d3d25216b12c183a9e4f5f1bf5f612639a080db05d198940722a002948264e45c27e051da0c965cc4ffa5af73
languageName: node
linkType: hard
-"@maplibre/mlt@npm:^1.1.6":
- version: 1.1.11
- resolution: "@maplibre/mlt@npm:1.1.11"
+"@maplibre/mlt@npm:^1.2.1":
+ version: 1.2.1
+ resolution: "@maplibre/mlt@npm:1.2.1"
dependencies:
"@mapbox/point-geometry": "npm:^1.1.0"
- checksum: 10c0/e1ba1ed8edf3b0a600ab82993245439264b92ea4855f020d2e82ceab42952670b91eb9997e2e6f74b135cdeb15e780815ae163122497e008c99680373e8dc3f9
+ checksum: 10c0/6f4f5799fd2e14719d27c5f6eb50d9aadfbaa39d7ddf65ad05773a077ca1426f40b28e6875e3f6a1924f930b9e76b98748db0041c9f6ab9760fbb175668486c6
languageName: node
linkType: hard
-"@maplibre/vt-pbf@npm:^4.2.1":
+"@maplibre/vt-pbf@npm:^4.3.2":
version: 4.3.2
resolution: "@maplibre/vt-pbf@npm:4.3.2"
dependencies:
@@ -1924,7 +1900,7 @@ __metadata:
"@rsdoctor/rspack-plugin": "npm:~1.5.13"
"@rspack/core": "npm:~2.1.10"
lit: "npm:^3.3.1"
- maplibre-gl: "npm:~5.19.0"
+ maplibre-gl: "npm:~6.8.0"
moment: "npm:^2.29.4"
reselect: "npm:^4.1.8"
languageName: unknown
@@ -2272,7 +2248,7 @@ __metadata:
lit: "npm:^3.3.1"
lit-html: "npm:^3.3.1"
lodash.debounce: "npm:^4.0.8"
- maplibre-gl: "npm:~5.19.0"
+ maplibre-gl: "npm:~6.8.0"
languageName: unknown
linkType: soft
@@ -3962,7 +3938,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/geojson@npm:*, @types/geojson@npm:^7946.0.16, @types/geojson@npm:^7946.0.7":
+"@types/geojson@npm:^7946.0.16, @types/geojson@npm:^7946.0.7":
version: 7946.0.16
resolution: "@types/geojson@npm:7946.0.16"
checksum: 10c0/1ff24a288bd5860b766b073ead337d31d73bdc715e5b50a2cee5cb0af57a1ed02cc04ef295f5fa68dc40fe3e4f104dd31282b2b818a5ba3231bc1001ba084e3c
@@ -4103,15 +4079,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/supercluster@npm:^7.1.3":
- version: 7.1.3
- resolution: "@types/supercluster@npm:7.1.3"
- dependencies:
- "@types/geojson": "npm:*"
- checksum: 10c0/0d55dad98df0990fc38a7bb64dc23dda46014187c0d7638e6f2b6717ba8931b13e5b1d394789833a2ac822014c977ef64623dffd81a0bbf39e52c53c8183741f
- languageName: node
- linkType: hard
-
"@types/tapable@npm:2.3.0":
version: 2.3.0
resolution: "@types/tapable@npm:2.3.0"
@@ -6326,10 +6293,10 @@ __metadata:
languageName: node
linkType: hard
-"earcut@npm:^3.0.2":
- version: 3.0.2
- resolution: "earcut@npm:3.0.2"
- checksum: 10c0/3d76da3d8a935244d59713edc70de71cdb5326a80b31c5c5cb96bc5b61f56b86ed35f032fffb66be7a4558e06efe1e94934f43ba6ca1b6c2af1420e87dd7ad71
+"earcut@npm:^3.2.3":
+ version: 3.2.3
+ resolution: "earcut@npm:3.2.3"
+ checksum: 10c0/38660ec1ce55eecbbbf11d5a0072934c9f33851527bf5e40923c6656c3a0c6b00bb449ae8f4b28f89a0b249fe18568e630a8ea9ee39ce2707a50a89531a2f995
languageName: node
linkType: hard
@@ -7447,13 +7414,6 @@ __metadata:
languageName: node
linkType: hard
-"get-stream@npm:^6.0.1":
- version: 6.0.1
- resolution: "get-stream@npm:6.0.1"
- checksum: 10c0/49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341
- languageName: node
- linkType: hard
-
"get-symbol-description@npm:^1.1.0":
version: 1.1.0
resolution: "get-symbol-description@npm:1.1.0"
@@ -8430,10 +8390,10 @@ __metadata:
languageName: node
linkType: hard
-"kdbush@npm:^4.0.2":
- version: 4.0.2
- resolution: "kdbush@npm:4.0.2"
- checksum: 10c0/d50183b299c57e2573114e902ab47aed7494be3ca41b66d456779ecc3b2f153f491de341f9609965414784f728894f9a9001152eb9f3a40cd3755521c06a45a3
+"kdbush@npm:^4.1.0":
+ version: 4.1.0
+ resolution: "kdbush@npm:4.1.0"
+ checksum: 10c0/b47c8a27de438df1e60080f73e3793217b4542a62bed7f07c8c29b0bf53359bbdba1e97305e396f7f4d28f98e31ce3fd21500dc3de03a44d8cda71a3d70ff7bb
languageName: node
linkType: hard
@@ -8644,33 +8604,28 @@ __metadata:
languageName: node
linkType: hard
-"maplibre-gl@npm:~5.19.0":
- version: 5.19.0
- resolution: "maplibre-gl@npm:5.19.0"
+"maplibre-gl@npm:~6.8.0":
+ version: 6.8.0
+ resolution: "maplibre-gl@npm:6.8.0"
dependencies:
- "@mapbox/geojson-rewind": "npm:^0.5.2"
- "@mapbox/jsonlint-lines-primitives": "npm:^2.0.2"
"@mapbox/point-geometry": "npm:^1.1.0"
- "@mapbox/tiny-sdf": "npm:^2.0.7"
- "@mapbox/unitbezier": "npm:^0.0.1"
- "@mapbox/vector-tile": "npm:^2.0.4"
- "@mapbox/whoots-js": "npm:^3.1.0"
- "@maplibre/geojson-vt": "npm:^5.0.4"
- "@maplibre/maplibre-gl-style-spec": "npm:^24.4.1"
- "@maplibre/mlt": "npm:^1.1.6"
- "@maplibre/vt-pbf": "npm:^4.2.1"
+ "@mapbox/tiny-sdf": "npm:^2.2.0"
+ "@mapbox/unitbezier": "npm:^1.0.0"
+ "@mapbox/vector-tile": "npm:^3.0.0"
+ "@maplibre/geojson-vt": "npm:^6.1.1"
+ "@maplibre/maplibre-gl-style-spec": "npm:^26.4.1"
+ "@maplibre/mlt": "npm:^1.2.1"
+ "@maplibre/vt-pbf": "npm:^4.3.2"
"@types/geojson": "npm:^7946.0.16"
- "@types/supercluster": "npm:^7.1.3"
- earcut: "npm:^3.0.2"
+ earcut: "npm:^3.2.3"
gl-matrix: "npm:^3.4.4"
- kdbush: "npm:^4.0.2"
+ kdbush: "npm:^4.1.0"
murmurhash-js: "npm:^1.0.0"
- pbf: "npm:^4.0.1"
+ pbf: "npm:^5.1.2"
potpack: "npm:^2.1.0"
quickselect: "npm:^3.0.0"
- supercluster: "npm:^8.0.1"
tinyqueue: "npm:^3.0.0"
- checksum: 10c0/5b380c9e8b9abefb46df38b00c2dac49a1b5354bc639df3a3368cbac0103929b79722371a5d8c083e5788ee32920d9ddf93ffd07b0a677a9ddcc928e8c0d186c
+ checksum: 10c0/e6f2b021059425bfdcc0d6233e67f6fbb3e84ac97c572c5faaab791982c6f5070aa7761f3bb8855275967e35b48efbda455b42031c8ff6b51d6b6fc0c4023577
languageName: node
linkType: hard
@@ -9498,14 +9453,14 @@ __metadata:
languageName: node
linkType: hard
-"pbf@npm:^4.0.1":
- version: 4.0.1
- resolution: "pbf@npm:4.0.1"
+"pbf@npm:^5.0.0, pbf@npm:^5.1.2":
+ version: 5.1.2
+ resolution: "pbf@npm:5.1.2"
dependencies:
resolve-protobuf-schema: "npm:^2.1.0"
bin:
pbf: bin/pbf
- checksum: 10c0/1a95cc3bdc61ee01d4728f4a57a9f1233732d183a8568818b714a747fd8b957d99b63e1c67f0f72dc5623657c42f88a1a7e44e1fbcd06e2fe2ef9a85a964832e
+ checksum: 10c0/e28e901d61a66c7afdeac881b3e2b0ad2c09df98bcd3bc3447c1a55d7bc866d71415bd7d8fcc8273f23828c0169cc60cb5f7c5beb4a5829e23506c8196460e83
languageName: node
linkType: hard
@@ -10764,15 +10719,6 @@ __metadata:
languageName: node
linkType: hard
-"supercluster@npm:^8.0.1":
- version: 8.0.1
- resolution: "supercluster@npm:8.0.1"
- dependencies:
- kdbush: "npm:^4.0.2"
- checksum: 10c0/79121e6dbff67b3036ea6651f3baddb942478830ba3ecbc27455715ab5bd269de8381dc04618c0c15963346ea2ed0f81cd5f767c2978a63e2841807c73445d57
- languageName: node
- linkType: hard
-
"supports-color@npm:^7.1.0":
version: 7.2.0
resolution: "supports-color@npm:7.2.0"