From 15d04d366ebc07e9afaa3ebb412b4292314df5a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Dec 2023 02:54:52 +0000 Subject: [PATCH 1/2] Build(deps): Bump mapbox-gl from 2.15.0 to 3.0.1 Bumps [mapbox-gl](https://github.com/mapbox/mapbox-gl-js) from 2.15.0 to 3.0.1. - [Release notes](https://github.com/mapbox/mapbox-gl-js/releases) - [Changelog](https://github.com/mapbox/mapbox-gl-js/blob/v3.0.1/CHANGELOG.md) - [Commits](https://github.com/mapbox/mapbox-gl-js/compare/v2.15.0...v3.0.1) --- updated-dependencies: - dependency-name: mapbox-gl dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 26 +++++++++++++++++++------- package.json | 2 +- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0f286a22..2f55b42c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "leaflet.locatecontrol": "^0.79.0", "leaflet.markercluster": "^1.5.3", "lrm-graphhopper": "^1.3.0", - "mapbox-gl": "^2.15.0", + "mapbox-gl": "^3.0.1", "mapbox-gl-leaflet": "^0.0.16", "maplibre-gl": "^3.6.2", "nouislider": "^15.7.1", @@ -6184,6 +6184,11 @@ "node": "*" } }, + "node_modules/cheap-ruler": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/cheap-ruler/-/cheap-ruler-3.0.2.tgz", + "integrity": "sha512-02T332h1/HTN6cDSufLP8x4JzDs2+VC+8qZ/N0kWIVPyc2xUkWwWh3B2fJxR7raXkL4Mq7k554mfuM9ofv/vGg==" + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -12947,9 +12952,9 @@ } }, "node_modules/mapbox-gl": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz", - "integrity": "sha512-fjv+aYrd5TIHiL7wRa+W7KjtUqKWziJMZUkK5hm8TvJ3OLeNPx4NmW/DgfYhd/jHej8wWL+QJBDbdMMAKvNC0A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.0.1.tgz", + "integrity": "sha512-o7C6sAlj6Hkdd4xQVEgQflgJYNYyZOAtYahhIOb9m8chI8umtWcCp8Ie0iGLYJvce1WHRMa3WGzs69ggwuWlDA==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -12959,6 +12964,7 @@ "@mapbox/unitbezier": "^0.0.1", "@mapbox/vector-tile": "^1.3.1", "@mapbox/whoots-js": "^3.1.0", + "cheap-ruler": "^3.0.1", "csscolorparser": "~1.0.3", "earcut": "^2.2.4", "geojson-vt": "^3.2.1", @@ -23554,6 +23560,11 @@ "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=" }, + "cheap-ruler": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/cheap-ruler/-/cheap-ruler-3.0.2.tgz", + "integrity": "sha512-02T332h1/HTN6cDSufLP8x4JzDs2+VC+8qZ/N0kWIVPyc2xUkWwWh3B2fJxR7raXkL4Mq7k554mfuM9ofv/vGg==" + }, "chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -28711,9 +28722,9 @@ "peer": true }, "mapbox-gl": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz", - "integrity": "sha512-fjv+aYrd5TIHiL7wRa+W7KjtUqKWziJMZUkK5hm8TvJ3OLeNPx4NmW/DgfYhd/jHej8wWL+QJBDbdMMAKvNC0A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.0.1.tgz", + "integrity": "sha512-o7C6sAlj6Hkdd4xQVEgQflgJYNYyZOAtYahhIOb9m8chI8umtWcCp8Ie0iGLYJvce1WHRMa3WGzs69ggwuWlDA==", "requires": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -28723,6 +28734,7 @@ "@mapbox/unitbezier": "^0.0.1", "@mapbox/vector-tile": "^1.3.1", "@mapbox/whoots-js": "^3.1.0", + "cheap-ruler": "^3.0.1", "csscolorparser": "~1.0.3", "earcut": "^2.2.4", "geojson-vt": "^3.2.1", diff --git a/package.json b/package.json index e7a620115..424a10c39 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "leaflet.locatecontrol": "^0.79.0", "leaflet.markercluster": "^1.5.3", "lrm-graphhopper": "^1.3.0", - "mapbox-gl": "^2.15.0", + "mapbox-gl": "^3.0.1", "mapbox-gl-leaflet": "^0.0.16", "maplibre-gl": "^3.6.2", "nouislider": "^15.7.1", From dae019d2ac82bcc8961bc6d1d4ebff4d90f9448e Mon Sep 17 00:00:00 2001 From: Arne Hamann Date: Mon, 11 Dec 2023 18:53:15 +0100 Subject: [PATCH 2/2] Preview 3d Map Signed-off-by: Arne Hamann --- src/components/Map.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/components/Map.vue b/src/components/Map.vue index 12a29d5f3..18a992da7 100644 --- a/src/components/Map.vue +++ b/src/components/Map.vue @@ -779,6 +779,20 @@ export default { attribution: attrib, }, }, + 'Mapbox 3d Preview (Beta)': { + name: 'Mapbox 3d Preview (Beta)', + type: 'base', + attribution: attrib, + tileLayerClass: L.myMapboxGL, + options: { + id: '3d', + accessToken: this.optionValues.mapboxAPIKEY, + minZoom: 1, + maxZoom: 22, + pitch: 60, + attribution: attrib, + }, + }, Watercolor: baseLayersByName.Watercolor, } }