diff --git a/website/package-lock.json b/website/package-lock.json index 5b6a7288..76ad738b 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -16,7 +16,7 @@ "gpx": "file:../gpx", "immer": "^10.1.1", "lucide-svelte": "^0.365.0", - "mapbox-gl": "^3.2.0", + "mapbox-gl": "^3.4.0", "mode-watcher": "^0.3.0", "sortablejs": "^1.15.2", "svelte-i18n": "^4.0.0", @@ -882,18 +882,6 @@ "xtend": "^4.0.1" } }, - "node_modules/@mapbox/geojson-rewind": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz", - "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==", - "dependencies": { - "get-stream": "^6.0.1", - "minimist": "^1.2.6" - }, - "bin": { - "geojson-rewind": "geojson-rewind" - } - }, "node_modules/@mapbox/jsonlint-lines-primitives": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz", @@ -2973,6 +2961,11 @@ "reusify": "^1.0.4" } }, + "node_modules/fflate": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", + "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==" + }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -3121,17 +3114,6 @@ "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz", "integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==" }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/gl-matrix": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz", @@ -3760,11 +3742,10 @@ } }, "node_modules/mapbox-gl": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.2.0.tgz", - "integrity": "sha512-v8S7x+wTr35kJ9nqzgn/VPiSFZxBkyQhwCk9bdyiFHVwCukNGG3LXt03FoaHHTsOuB9JWenWE96k0Uw+HGMZ8w==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.4.0.tgz", + "integrity": "sha512-QWgL28zg/zuIOHeF8DXPvHy1UHTgO5p4Oy6ifCAHwI9/hoI9/Fruya0yI4HkDtX1OgzTLO6SHO13A781BGJvyw==", "dependencies": { - "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", "@mapbox/mapbox-gl-supported": "^3.0.0", "@mapbox/point-geometry": "^0.1.0", @@ -3775,6 +3756,7 @@ "cheap-ruler": "^3.0.1", "csscolorparser": "~1.0.3", "earcut": "^2.2.4", + "fflate": "^0.8.1", "geojson-vt": "^3.2.1", "gl-matrix": "^3.4.3", "grid-index": "^1.1.0", @@ -3787,6 +3769,7 @@ "rw": "^1.3.3", "serialize-to-js": "^3.1.2", "supercluster": "^8.0.0", + "tiny-lru": "^11.2.6", "tinyqueue": "^2.0.3", "tweakpane": "^4.0.3", "vt-pbf": "^3.1.3" @@ -3921,6 +3904,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -5947,6 +5931,14 @@ "globrex": "^0.1.2" } }, + "node_modules/tiny-lru": { + "version": "11.2.6", + "resolved": "https://registry.npmjs.org/tiny-lru/-/tiny-lru-11.2.6.tgz", + "integrity": "sha512-0PU3c9PjMnltZaFo2sGYv/nnJsMjG0Cxx8X6FXHPPGjFyoo1SJDxvUXW1207rdiSxYizf31roo+GrkIByQeZoA==", + "engines": { + "node": ">=12" + } + }, "node_modules/tinyqueue": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz", diff --git a/website/package.json b/website/package.json index 996a1870..8af4f5c9 100644 --- a/website/package.json +++ b/website/package.json @@ -49,7 +49,7 @@ "gpx": "file:../gpx", "immer": "^10.1.1", "lucide-svelte": "^0.365.0", - "mapbox-gl": "^3.2.0", + "mapbox-gl": "^3.4.0", "mode-watcher": "^0.3.0", "sortablejs": "^1.15.2", "svelte-i18n": "^4.0.0", diff --git a/website/src/lib/assets/layers.ts b/website/src/lib/assets/layers.ts index 7476bdb2..65de2735 100644 --- a/website/src/lib/assets/layers.ts +++ b/website/src/lib/assets/layers.ts @@ -108,29 +108,13 @@ export const basemaps: { [key: string]: string | Style; } = { source: 'linzTopo', }], }, - ignPlanV2: { - version: 8, - sources: { - ignPlanV2: { - type: 'raster', - tiles: ['https://data.geopf.fr/wmts?SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET=PM&FORMAT=image/png&LAYER=GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}'], - tileSize: 256, - maxzoom: 18, - attribution: 'IGN-F/Géoportail' - } - }, - layers: [{ - id: 'ignPlanV2', - type: 'raster', - source: 'ignPlanV2', - }], - }, + ignFrPlan: 'https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/classique.json', ignFrScan25: { version: 8, sources: { ignFrScan25: { type: 'raster', - tiles: ['https://wxs.ign.fr/ifj1o8jmglxpfn6p1tn4b3g1/geoportail/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&TILEMATRIXSET=PM&TILEMATRIX={z}&TILECOL={x}&TILEROW={y}&LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN25TOUR&FORMAT=image/jpeg&STYLE=normal'], // new url https://data.geopf.fr/private/wmts?SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&TILEMATRIXSET=PM&TILEMATRIX={z}&TILECOL={x}&TILEROW={y}&LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN25TOUR&FORMAT=image/jpeg&STYLE=normal&apikey=ign_scan_ws + tiles: ['https://data.geopf.fr/private/wmts?SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&TILEMATRIXSET=PM&TILEMATRIX={z}&TILECOL={x}&TILEROW={y}&LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN25TOUR&FORMAT=image/jpeg&STYLE=normal&apikey=ign_scan_ws'], tileSize: 256, maxzoom: 16, attribution: 'IGN-F/Géoportail' @@ -142,10 +126,10 @@ export const basemaps: { [key: string]: string | Style; } = { source: 'ignFrScan25', }], }, - ignSatellite: { + ignFrSatellite: { version: 8, sources: { - ignSatellite: { + ignFrSatellite: { type: 'raster', tiles: ['https://data.geopf.fr/wmts?SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET=PM&FORMAT=image/jpeg&LAYER=ORTHOIMAGERY.ORTHOPHOTOS&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}'], tileSize: 256, @@ -154,9 +138,9 @@ export const basemaps: { [key: string]: string | Style; } = { } }, layers: [{ - id: 'ignSatellite', + id: 'ignFrSatellite', type: 'raster', - source: 'ignSatellite', + source: 'ignFrSatellite', }], }, ignEs: { @@ -471,9 +455,9 @@ export const basemapTree: LayerTreeType = { finlandTopo: true, }, france: { - ignPlanV2: true, + ignFrPlan: true, ignFrScan25: true, - ignSatellite: true + ignFrSatellite: true, }, new_zealand: { linz: true, @@ -607,9 +591,9 @@ export const defaultBasemapTree: LayerTreeType = { finlandTopo: false, }, france: { - ignPlanV2: false, + ignFrPlan: false, ignFrScan25: false, - ignSatellite: false + ignFrSatellite: false, }, new_zealand: { linz: false, diff --git a/website/src/locales/en.json b/website/src/locales/en.json index fd9bb568..b7bbde20 100644 --- a/website/src/locales/en.json +++ b/website/src/locales/en.json @@ -143,9 +143,9 @@ "linz": "LINZ Topo", "linzTopo": "LINZ Topo50", "swisstopo": "swisstopo", - "ignPlanV2": "IGN Plan", + "ignFrPlan": "IGN Plan", "ignFrScan25": "IGN SCAN25", - "ignSatellite": "IGN Satellite", + "ignFrSatellite": "IGN Satellite", "ignEs": "IGN", "ordnanceSurvey": "Ordnance Survey", "norwayTopo": "Topografisk Norgeskart 4",