From 4c858fbe7eeb13efd9c78c2feb05edf62d1f778a Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 25 Jul 2025 19:39:27 +0200 Subject: [PATCH] Experiment: experimenting with PMTiles --- package-lock.json | 9 ++-- package.json | 2 +- src/Models/RasterLayers.ts | 3 +- src/UI/SingleThemeGui.svelte | 1 + src/UI/Test.svelte | 62 +++++++++++++++++++++++++++- src/assets/global-raster-layers.json | 2 +- 6 files changed, 71 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0c63912f..0f534c5a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,7 +78,7 @@ "pg": "^8.11.3", "pic4carto": "^2.1.15", "pluscodes": "^2.6.0", - "pmtiles": "^4.2.1", + "pmtiles": "^4.3.0", "prompt-sync": "^4.2.0", "qrcode-generator": "^1.4.4", "showdown": "^2.1.0", @@ -23516,9 +23516,10 @@ "integrity": "sha512-+3sW+Qt+znuN2uMFFvebo2m5MsaTjBXOzEYvkfx4RMeOYnNCQv3OWeQujfRAo6nzg7D+5vD2b3tihtwW3b5pfg==" }, "node_modules/pmtiles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-4.2.1.tgz", - "integrity": "sha512-Z73aph49f7KpU7JPb+zDWr+62wPv9jF3p+tvvL26/XeECnzUHnQ0nGopXGPYnq+OQXqyaXZPrsNdKxSD+2HlLA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-4.3.0.tgz", + "integrity": "sha512-wnzQeSiYT/MyO63o7AVxwt7+uKqU0QUy2lHrivM7GvecNy0m1A4voVyGey7bujnEW5Hn+ZzLdvHPoFaqrOzbPA==", + "license": "BSD-3-Clause", "dependencies": { "fflate": "^0.8.2" } diff --git a/package.json b/package.json index 548a2b186..bf8650522 100644 --- a/package.json +++ b/package.json @@ -243,7 +243,7 @@ "pg": "^8.11.3", "pic4carto": "^2.1.15", "pluscodes": "^2.6.0", - "pmtiles": "^4.2.1", + "pmtiles": "^4.3.0", "prompt-sync": "^4.2.0", "qrcode-generator": "^1.4.4", "showdown": "^2.1.0", diff --git a/src/Models/RasterLayers.ts b/src/Models/RasterLayers.ts index 40bbb6499..4d601f511 100644 --- a/src/Models/RasterLayers.ts +++ b/src/Models/RasterLayers.ts @@ -5,11 +5,12 @@ import * as globallayersEli from "../assets/generated/editor-layer-index-global. import * as bingJson from "../assets/bing.json" import { BBox } from "../Logic/BBox" -import { Store, Stores, UIEventSource } from "../Logic/UIEventSource" +import { Store, Stores } from "../Logic/UIEventSource" import { GeoOperations } from "../Logic/GeoOperations" import { EliCategory, RasterLayerProperties } from "./RasterLayerProperties" import { Utils } from "../Utils" import { default as ELI } from "../../public/assets/data/editor-layer-index.json" + export type EditorLayerIndex = (Feature & RasterLayerPolygon)[] export class AvailableRasterLayers { diff --git a/src/UI/SingleThemeGui.svelte b/src/UI/SingleThemeGui.svelte index 17fb0f0f5..15531468f 100644 --- a/src/UI/SingleThemeGui.svelte +++ b/src/UI/SingleThemeGui.svelte @@ -50,6 +50,7 @@ let webgl_supported = webgl_support() let availableLayers = UIEventSource.FromPromise(getAvailableLayers()) + availableLayers.addCallbackAndRun(av => console.log("Available layers are", av)) const state = new WithSearchState(theme, availableLayers) diff --git a/src/UI/Test.svelte b/src/UI/Test.svelte index 6e9dbff9d..19806c21f 100644 --- a/src/UI/Test.svelte +++ b/src/UI/Test.svelte @@ -1,3 +1,63 @@ - + Nothing to test diff --git a/src/assets/global-raster-layers.json b/src/assets/global-raster-layers.json index 955405882..983e288cf 100644 --- a/src/assets/global-raster-layers.json +++ b/src/assets/global-raster-layers.json @@ -30,7 +30,7 @@ "text": "Protomaps", "url": "https://protomaps.com/" }, - "url": "https://cache.mapcomplete.org/planet-latest.pmtiles" + "url": "https://cache.mapcomplete.org/global-basemap.pmtiles" }, { "name": "OpenStreetMap Carto",