From b7f605412ad64e9e7887576199f3146769ca3976 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Fri, 23 Feb 2024 14:46:55 +0000 Subject: [PATCH] Upgrade maplibre and pmtiles --- viewer/package-lock.json | 62 ++++++++++++++++++++++++++-------------- viewer/package.json | 4 +-- viewer/src/App.svelte | 4 +-- viewer/src/Loader.svelte | 2 +- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/viewer/package-lock.json b/viewer/package-lock.json index ce3faaf..d6f2d5c 100644 --- a/viewer/package-lock.json +++ b/viewer/package-lock.json @@ -11,8 +11,8 @@ "@mapbox/mapbox-gl-draw": "^1.4.3", "chart.js": "^4.4.1", "chartjs-plugin-dragdata": "^2.2.5", - "pmtiles": "^2.10.0", - "svelte-maplibre": "^0.7.7" + "pmtiles": "^3.0.3", + "svelte-maplibre": "^0.8.1" }, "devDependencies": { "@ianvs/prettier-plugin-sort-imports": "^4.1.1", @@ -893,13 +893,13 @@ } }, "node_modules/@maplibre/maplibre-gl-style-spec": { - "version": "19.3.3", - "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz", - "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-20.1.1.tgz", + "integrity": "sha512-z85ARNPCBI2Cs5cPOS3DSbraTN+ue8zrcYVoSWBuNrD/mA+2SKAJ+hIzI22uN7gac6jBMnCdpPKRxS/V0KSZVQ==", "dependencies": { "@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/unitbezier": "^0.0.1", - "json-stringify-pretty-compact": "^3.0.0", + "json-stringify-pretty-compact": "^4.0.0", "minimist": "^1.2.8", "rw": "^1.3.3", "sort-object": "^3.0.3" @@ -1000,6 +1000,22 @@ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" }, + "node_modules/@types/geojson-vt": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/@types/geojson-vt/-/geojson-vt-3.2.5.tgz", + "integrity": "sha512-qDO7wqtprzlpe8FfQ//ClPV9xiuoh2nkIgiouIptON9w5jvD/fA4szvP9GBlDVdJ5dldAl0kX/sy3URbWwLx0g==", + "dependencies": { + "@types/geojson": "*" + } + }, + "node_modules/@types/leaflet": { + "version": "1.9.8", + "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.8.tgz", + "integrity": "sha512-EXdsL4EhoUtGm2GC2ZYtXn+Fzc6pluVgagvo2VC1RHWToLGlTRwVYoDpqS/7QXa01rmDyBjJk3Catpf60VMkwg==", + "dependencies": { + "@types/geojson": "*" + } + }, "node_modules/@types/mapbox__mapbox-gl-draw": { "version": "1.4.6", "resolved": "https://registry.npmjs.org/@types/mapbox__mapbox-gl-draw/-/mapbox__mapbox-gl-draw-1.4.6.tgz", @@ -1917,9 +1933,9 @@ } }, "node_modules/json-stringify-pretty-compact": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz", - "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz", + "integrity": "sha512-3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q==" }, "node_modules/json5": { "version": "2.2.3", @@ -2008,9 +2024,9 @@ } }, "node_modules/maplibre-gl": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.6.2.tgz", - "integrity": "sha512-krg2KFIdOpLPngONDhP6ixCoWl5kbdMINP0moMSJFVX7wX1Clm2M9hlNKXS8vBGlVWwR5R3ZfI6IPrYz7c+aCQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.0.2.tgz", + "integrity": "sha512-1HlJJyfPIbAwK1OlNzKDyuNf1NKlEwsjZZhPYpazX4yoP6ud1aC7DNct62fMSkn+hd6mRekIqzYEzIfOCC31QQ==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -2019,8 +2035,9 @@ "@mapbox/unitbezier": "^0.0.1", "@mapbox/vector-tile": "^1.3.1", "@mapbox/whoots-js": "^3.1.0", - "@maplibre/maplibre-gl-style-spec": "^19.3.3", - "@types/geojson": "^7946.0.13", + "@maplibre/maplibre-gl-style-spec": "^20.1.1", + "@types/geojson": "^7946.0.14", + "@types/geojson-vt": "3.2.5", "@types/mapbox__point-geometry": "^0.1.4", "@types/mapbox__vector-tile": "^1.3.4", "@types/pbf": "^3.0.5", @@ -2244,10 +2261,11 @@ } }, "node_modules/pmtiles": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-2.10.0.tgz", - "integrity": "sha512-X+s6JyperpcAkKwv55MKx72ckOUB0ZjcfK4929iM0SS0MkLydEi2FSW1E8YTE1E2XaZ2TVk/MIUrbsZuXV7K2g==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-3.0.3.tgz", + "integrity": "sha512-tj4l3HHJd6/qf9VefzlPK2eYEQgbf+4uXPzNlrj3k7hHvLtibYSxfp51TF6ALt4YezM8MCdiOminnHvdAyqyGg==", "dependencies": { + "@types/leaflet": "^1.9.8", "fflate": "^0.8.0" } }, @@ -2685,15 +2703,15 @@ } }, "node_modules/svelte-maplibre": { - "version": "0.7.7", - "resolved": "https://registry.npmjs.org/svelte-maplibre/-/svelte-maplibre-0.7.7.tgz", - "integrity": "sha512-fnv8L3tA4EMePp9BGKAc8AvXCsg34z56NBMGjYkz6qkl90qSTY4vUhIu1KXbwjGfQmHBmPkIl9VSdnnHCMnaRA==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/svelte-maplibre/-/svelte-maplibre-0.8.1.tgz", + "integrity": "sha512-CTm/s0+mJzBHSoO5zPKBo3ORmUyiWS3Ex4xvVdNgVg+sDesHasEAJ0N1/NUrd56S33zgRdFZGzRnRguCnKFAzw==", "dependencies": { "d3-geo": "^3.1.0", "just-compare": "^2.3.0", "just-flush": "^2.3.0", - "maplibre-gl": "^3.5.0", - "pmtiles": "^2.10.0" + "maplibre-gl": "^4.0.0", + "pmtiles": "^3.0.3" }, "peerDependencies": { "@deck.gl/core": "^8.8.0", diff --git a/viewer/package.json b/viewer/package.json index 5273a58..47d4615 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -30,7 +30,7 @@ "@mapbox/mapbox-gl-draw": "^1.4.3", "chart.js": "^4.4.1", "chartjs-plugin-dragdata": "^2.2.5", - "pmtiles": "^2.10.0", - "svelte-maplibre": "^0.7.7" + "pmtiles": "^3.0.3", + "svelte-maplibre": "^0.8.1" } } diff --git a/viewer/src/App.svelte b/viewer/src/App.svelte index e1bc5ec..493cac7 100644 --- a/viewer/src/App.svelte +++ b/viewer/src/App.svelte @@ -1,7 +1,7 @@