feat(stac): add PMTiles assets to the map

apps/geolibre-desktop/src/components/layout/BasemapExtractPanel.tsx

@@ -1,16 +1,11 @@
-import {
-  DEFAULT_BASEMAP,
-  DEFAULT_LAYER_STYLE,
-  type GeoLibreLayer,
-  useAppStore,
-} from "@geolibre/core";
+import { DEFAULT_BASEMAP, useAppStore } from "@geolibre/core";
 import {
   buildProtomapsBasemapStyle,
+  createPMTilesStoreLayer,
   evictOfflineBasemapStyle,
   hasPMTilesArchive,
   type MapController,
   OFFLINE_BASEMAP_SENTINEL_PREFIX,
-  pmtilesNativeLayerIds,
   PROTOMAPS_FLAVORS,
   type ProtomapsFlavor,
   readPMTilesArchiveInfo,
@@ -708,39 +703,18 @@ export function BasemapExtractPanel({ open, onClose, mapControllerRef }: Basemap
         setBasemapStyleUrl(registerOfflineBasemapStyle(layerId, style));
         trackStyledBasemap(layerId, `${layerId}.pmtiles`);
       } else {
-        const fillColor = DEFAULT_LAYER_STYLE.fillColor;
-        const layer: GeoLibreLayer = {
-          id: layerId,
-          name: fileName,
-          type: "pmtiles",
-          source: {
-            sourceId: layerId,
-            sourceLayers: info.sourceLayers,
-            tileType: info.tileType,
-            type: info.tileType === "raster" ? "raster" : "vector",
+        addLayer(
+          createPMTilesStoreLayer({
+            id: layerId,
+            name: fileName,
             url: layerUrl,
-          },
-          visible: true,
-          // Raster basemaps render dimmed (raster-opacity reads the layer-level
-          // `opacity`, not style.fillOpacity); vector renders fully opaque.
-          opacity: info.tileType === "raster" ? 0.6 : 1,
-          style: {
-            ...DEFAULT_LAYER_STYLE,
-            fillColor,
-            strokeColor: fillColor,
-          },
-          metadata: {
-            externalNativeLayer: true,
-            nativeLayerIds: pmtilesNativeLayerIds(layerId, info.tileType, info.sourceLayers),
-            pickable: true,
-            sourceId: layerId,
-            sourceKind: "pmtiles-url",
-            sourceLayers: info.sourceLayers,
             tileType: info.tileType,
-          },
-          sourcePath: layerUrl,
-        };
-        addLayer(layer);
+            sourceLayers: info.sourceLayers,
+            // Raster basemaps render dimmed (raster-opacity reads the layer-level
+            // `opacity`, not style.fillOpacity); vector renders fully opaque.
+            opacity: info.tileType === "raster" ? 0.6 : 1,
+          }),
+        );
       }
       setPhase("done");
 

apps/geolibre-desktop/src/i18n/locales/ar.json

@@ -3634,7 +3634,7 @@
     "download": "تنزيل",
     "adding": "جارٍ إضافة {{asset}}…",
     "added": "تمت إضافة {{asset}} إلى الخريطة.",
-    "addUnsupported": "يمكن إضافة أصول GeoTIFF/COG وGeoJSON فقط إلى الخريطة",
+    "addUnsupported": "يمكن إضافة أصول GeoTIFF/COG وGeoJSON وPMTiles فقط إلى الخريطة",
     "addFailed": "تعذّرت إضافة الأصل",
     "cogUnsupported": "لا يستطيع مضيف GeoLibre هذا عرض أصول GeoTIFF البعيدة"
   },

apps/geolibre-desktop/src/i18n/locales/de.json

@@ -3411,7 +3411,7 @@
     "download": "Herunterladen",
     "adding": "{{asset}} wird hinzugefügt…",
     "added": "{{asset}} zur Karte hinzugefügt.",
-    "addUnsupported": "Nur GeoTIFF/COG- und GeoJSON-Assets können zur Karte hinzugefügt werden",
+    "addUnsupported": "Nur GeoTIFF/COG-, GeoJSON- und PMTiles-Assets können zur Karte hinzugefügt werden",
     "addFailed": "Asset konnte nicht hinzugefügt werden",
     "cogUnsupported": "Dieser GeoLibre-Host kann entfernte GeoTIFF-Assets nicht darstellen"
   },

apps/geolibre-desktop/src/i18n/locales/en.json

@@ -3424,7 +3424,7 @@
     "download": "Download",
     "adding": "Adding {{asset}}…",
     "added": "Added {{asset}} to the map.",
-    "addUnsupported": "Only GeoTIFF/COG and GeoJSON assets can be added to the map",
+    "addUnsupported": "Only GeoTIFF/COG, GeoJSON, and PMTiles assets can be added to the map",
     "addFailed": "Could not add asset",
     "cogUnsupported": "This GeoLibre host cannot visualize remote GeoTIFF assets"
   },

apps/geolibre-desktop/src/i18n/locales/es.json

@@ -3411,7 +3411,7 @@
     "download": "Descargar",
     "adding": "Añadiendo {{asset}}…",
     "added": "{{asset}} añadido al mapa.",
-    "addUnsupported": "Solo se pueden añadir al mapa recursos GeoTIFF/COG y GeoJSON",
+    "addUnsupported": "Solo se pueden añadir al mapa recursos GeoTIFF/COG, GeoJSON y PMTiles",
     "addFailed": "No se pudo añadir el recurso",
     "cogUnsupported": "Este host de GeoLibre no puede visualizar recursos GeoTIFF remotos"
   },

apps/geolibre-desktop/src/i18n/locales/fa.json

@@ -3411,7 +3411,7 @@
     "download": "دانلود",
     "adding": "در حال افزودن {{asset}}…",
     "added": "{{asset}} به نقشه افزوده شد.",
-    "addUnsupported": "تنها دارایی‌های GeoTIFF/COG و GeoJSON را می‌توان به نقشه افزود",
+    "addUnsupported": "تنها دارایی‌های GeoTIFF/COG، GeoJSON و PMTiles را می‌توان به نقشه افزود",
     "addFailed": "افزودن دارایی با شکست مواجه شد",
     "cogUnsupported": "این میزبان GeoLibre نمی‌تواند دارایی‌های GeoTIFF دوردست را نمایش دهد"
   },

apps/geolibre-desktop/src/i18n/locales/fr.json

@@ -3411,7 +3411,7 @@
     "download": "Télécharger",
     "adding": "Ajout de {{asset}}…",
     "added": "{{asset}} ajouté à la carte.",
-    "addUnsupported": "Seules les ressources GeoTIFF/COG et GeoJSON peuvent être ajoutées à la carte",
+    "addUnsupported": "Seules les ressources GeoTIFF/COG, GeoJSON et PMTiles peuvent être ajoutées à la carte",
     "addFailed": "Impossible d'ajouter la ressource",
     "cogUnsupported": "Cet hôte GeoLibre ne peut pas visualiser les ressources GeoTIFF distantes"
   },

apps/geolibre-desktop/src/i18n/locales/hi.json

@@ -3411,7 +3411,7 @@
     "download": "डाउनलोड करें",
     "adding": "{{asset}} जोड़ा जा रहा है…",
     "added": "{{asset}} मानचित्र में जोड़ा गया।",
-    "addUnsupported": "मानचित्र में केवल GeoTIFF/COG और GeoJSON एसेट जोड़ी जा सकती हैं",
+    "addUnsupported": "मानचित्र में केवल GeoTIFF/COG, GeoJSON और PMTiles एसेट जोड़ी जा सकती हैं",
     "addFailed": "एसेट नहीं जोड़ी जा सकी",
     "cogUnsupported": "यह GeoLibre होस्ट दूरस्थ GeoTIFF एसेट प्रदर्शित नहीं कर सकता"
   },

apps/geolibre-desktop/src/i18n/locales/id.json

@@ -3355,7 +3355,7 @@
     "download": "Unduh",
     "adding": "Menambahkan {{asset}}…",
     "added": "{{asset}} ditambahkan ke peta.",
-    "addUnsupported": "Hanya aset GeoTIFF/COG dan GeoJSON yang dapat ditambahkan ke peta",
+    "addUnsupported": "Hanya aset GeoTIFF/COG, GeoJSON, dan PMTiles yang dapat ditambahkan ke peta",
     "addFailed": "Tidak dapat menambahkan aset",
     "cogUnsupported": "Host GeoLibre ini tidak dapat memvisualisasikan aset GeoTIFF jarak jauh"
   },

apps/geolibre-desktop/src/i18n/locales/it.json

@@ -3411,7 +3411,7 @@
     "download": "Scarica",
     "adding": "Aggiunta di {{asset}}…",
     "added": "{{asset}} aggiunto alla mappa.",
-    "addUnsupported": "Solo le risorse GeoTIFF/COG e GeoJSON possono essere aggiunte alla mappa",
+    "addUnsupported": "Solo le risorse GeoTIFF/COG, GeoJSON e PMTiles possono essere aggiunte alla mappa",
     "addFailed": "Impossibile aggiungere la risorsa",
     "cogUnsupported": "Questo host GeoLibre non può visualizzare risorse GeoTIFF remote"
   },

apps/geolibre-desktop/src/i18n/locales/ja.json

@@ -3355,7 +3355,7 @@
     "download": "ダウンロード",
     "adding": "{{asset}} を追加しています…",
     "added": "{{asset}} を地図に追加しました。",
-    "addUnsupported": "地図に追加できるのは GeoTIFF/COG と GeoJSON のアセットのみです",
+    "addUnsupported": "地図に追加できるのは GeoTIFF/COG、GeoJSON、PMTiles のアセットのみです",
     "addFailed": "アセットを追加できませんでした",
     "cogUnsupported": "この GeoLibre ホストはリモートの GeoTIFF アセットを表示できません"
   },

apps/geolibre-desktop/src/i18n/locales/ka.json

@@ -3411,7 +3411,7 @@
     "download": "ჩამოტვირთვა",
     "adding": "მიმდინარეობს {{asset}}-ის დამატება…",
     "added": "{{asset}} დაემატა რუკაზე.",
-    "addUnsupported": "რუკაზე შეიძლება დაემატოს მხოლოდ GeoTIFF/COG და GeoJSON აქტივები",
+    "addUnsupported": "რუკაზე შეიძლება დაემატოს მხოლოდ GeoTIFF/COG, GeoJSON და PMTiles აქტივები",
     "addFailed": "აქტივის დამატება ვერ მოხერხდა",
     "cogUnsupported": "ამ GeoLibre ჰოსტს არ შეუძლია დისტანციური GeoTIFF აქტივების ვიზუალიზაცია"
   },

apps/geolibre-desktop/src/i18n/locales/ko.json

@@ -3355,7 +3355,7 @@
     "download": "다운로드",
     "adding": "{{asset}} 추가 중…",
     "added": "{{asset}}을(를) 지도에 추가했습니다.",
-    "addUnsupported": "GeoTIFF/COG 및 GeoJSON 자산만 지도에 추가할 수 있습니다",
+    "addUnsupported": "GeoTIFF/COG, GeoJSON 및 PMTiles 자산만 지도에 추가할 수 있습니다",
     "addFailed": "자산을 추가하지 못했습니다",
     "cogUnsupported": "이 GeoLibre 호스트는 원격 GeoTIFF 자산을 표시할 수 없습니다"
   },

apps/geolibre-desktop/src/i18n/locales/nl.json

@@ -3411,7 +3411,7 @@
     "download": "Downloaden",
     "adding": "{{asset}} wordt toegevoegd…",
     "added": "{{asset}} toegevoegd aan de kaart.",
-    "addUnsupported": "Alleen GeoTIFF/COG- en GeoJSON-assets kunnen aan de kaart worden toegevoegd",
+    "addUnsupported": "Alleen GeoTIFF/COG-, GeoJSON- en PMTiles-assets kunnen aan de kaart worden toegevoegd",
     "addFailed": "Kan asset niet toevoegen",
     "cogUnsupported": "Deze GeoLibre-host kan externe GeoTIFF-assets niet weergeven"
   },

apps/geolibre-desktop/src/i18n/locales/pt.json

@@ -3411,7 +3411,7 @@
     "download": "Baixar",
     "adding": "Adicionando {{asset}}…",
     "added": "{{asset}} adicionado ao mapa.",
-    "addUnsupported": "Apenas recursos GeoTIFF/COG e GeoJSON podem ser adicionados ao mapa",
+    "addUnsupported": "Apenas recursos GeoTIFF/COG, GeoJSON e PMTiles podem ser adicionados ao mapa",
     "addFailed": "Não foi possível adicionar o recurso",
     "cogUnsupported": "Este host do GeoLibre não consegue visualizar recursos GeoTIFF remotos"
   },

apps/geolibre-desktop/src/i18n/locales/ru.json

@@ -3523,7 +3523,7 @@
     "download": "Скачать",
     "adding": "Добавление {{asset}}…",
     "added": "{{asset}} добавлен на карту.",
-    "addUnsupported": "На карту можно добавить только ресурсы GeoTIFF/COG и GeoJSON",
+    "addUnsupported": "На карту можно добавить только ресурсы GeoTIFF/COG, GeoJSON и PMTiles",
     "addFailed": "Не удалось добавить ресурс",
     "cogUnsupported": "Этот хост GeoLibre не может отображать удалённые ресурсы GeoTIFF"
   },

apps/geolibre-desktop/src/i18n/locales/th.json

@@ -3355,7 +3355,7 @@
     "download": "ดาวน์โหลด",
     "adding": "กำลังเพิ่ม {{asset}}…",
     "added": "เพิ่ม {{asset}} ลงในแผนที่แล้ว",
-    "addUnsupported": "เพิ่มลงแผนที่ได้เฉพาะแอสเซตแบบ GeoTIFF/COG และ GeoJSON เท่านั้น",
+    "addUnsupported": "เพิ่มลงแผนที่ได้เฉพาะแอสเซตแบบ GeoTIFF/COG, GeoJSON และ PMTiles เท่านั้น",
     "addFailed": "ไม่สามารถเพิ่มแอสเซตได้",
     "cogUnsupported": "โฮสต์ GeoLibre นี้ไม่สามารถแสดงผลแอสเซต GeoTIFF จากระยะไกลได้"
   },

apps/geolibre-desktop/src/i18n/locales/tr.json

@@ -3411,7 +3411,7 @@
     "download": "İndir",
     "adding": "{{asset}} ekleniyor…",
     "added": "{{asset}} haritaya eklendi.",
-    "addUnsupported": "Haritaya yalnızca GeoTIFF/COG ve GeoJSON varlıkları eklenebilir",
+    "addUnsupported": "Haritaya yalnızca GeoTIFF/COG, GeoJSON ve PMTiles varlıkları eklenebilir",
     "addFailed": "Varlık eklenemedi",
     "cogUnsupported": "Bu GeoLibre ana bilgisayarı uzak GeoTIFF varlıklarını görselleştiremiyor"
   },

apps/geolibre-desktop/src/i18n/locales/vi.json

@@ -3345,7 +3345,7 @@
     "collectionsHint": "Giữ Ctrl/Cmd để chọn nhiều bộ sưu tập; kéo cạnh dưới để thay đổi kích thước",
     "limitToExtent": "Giới hạn tìm kiếm trong phạm vi bản đồ hiện tại",
     "bboxLabel": "Hộp giới hạn (tây, nam, đông, bắc)",
-    "addUnsupported": "Chỉ có thể thêm nội dung GeoTIFF/COG và GeoJSON vào bản đồ",
+    "addUnsupported": "Chỉ có thể thêm nội dung GeoTIFF/COG, GeoJSON và PMTiles vào bản đồ",
     "addFailed": "Không thể thêm nội dung",
     "cogUnsupported": "Máy chủ GeoLibre này không thể hiển thị nội dung GeoTIFF từ xa",
     "footprintLayerName": "Dấu chân tìm kiếm STAC",

apps/geolibre-desktop/src/i18n/locales/zh.json

@@ -3355,7 +3355,7 @@
     "download": "下载",
     "adding": "正在添加 {{asset}}…",
     "added": "已将 {{asset}} 添加到地图。",
-    "addUnsupported": "只有 GeoTIFF/COG 和 GeoJSON 资源可以添加到地图",
+    "addUnsupported": "只有 GeoTIFF/COG、GeoJSON 和 PMTiles 资源可以添加到地图",
     "addFailed": "无法添加资源",
     "cogUnsupported": "此 GeoLibre 主机无法可视化远程 GeoTIFF 资源"
   },

packages/map/package.json

@@ -7,7 +7,8 @@
   "types": "./src/index.ts",
   "exports": {
     ".": "./src/index.ts",
-    "./derived-geometry": "./src/derived-geometry.ts"
+    "./derived-geometry": "./src/derived-geometry.ts",
+    "./pmtiles-layer": "./src/pmtiles-layer.ts"
   },
   "dependencies": {
     "@geolibre/core": "*",

packages/map/src/index.ts

@@ -70,13 +70,17 @@ export {
 export {
   ensureRemotePMTilesArchive,
   hasPMTilesArchive,
-  pmtilesNativeLayerIds,
   readPMTilesArchiveInfo,
   registerPMTilesArchive,
   unregisterPMTilesArchive,
   setExternalDeckLayerOrderHandler,
   type PMTilesArchiveInfo,
 } from "./layer-sync";
+export {
+  createPMTilesStoreLayer,
+  pmtilesNativeLayerIds,
+  type PMTilesStoreLayerOptions,
+} from "./pmtiles-layer";
 export {
   buildMapboxStyle,
   mapboxStyleToJson,

packages/map/src/layer-sync.ts

@@ -14,6 +14,8 @@ import {
   styleValue,
   validateMapExpression,
 } from "@geolibre/core";
+import { normalizePMTilesUrl, PMTILES_PROTOCOL, pmtilesVectorLayerId } from "./pmtiles-layer";
+import { encodeVectorTileLayerPart } from "./vector-tile-layer-ids";
 import { addProtocol, config } from "maplibre-gl";
 import type { GeoJSON } from "geojson";
 import type * as maplibregl from "maplibre-gl";
@@ -101,7 +103,6 @@ export function setExternalDeckLayerOrderHandler(
 }
 
 const WMS_PROXY_PATH = "/__geolibre_wms_proxy";
-const PMTILES_PROTOCOL = "pmtiles";
 const PMTILES_PROTOCOL_GLOBAL_KEY = "__geolibrePMTilesProtocol";
 const PMTILES_ARCHIVE_KEYS_GLOBAL_KEY = "__geolibrePMTilesArchiveKeys";
 const MIN_LAYER_ZOOM = DEFAULT_LAYER_STYLE.minZoom;
@@ -967,26 +968,6 @@ function ensurePMTilesProtocol(url: string): void {
   }
 }
 
-/**
- * The MapLibre layer ids `syncLayers` creates for a `pmtiles` store layer, in
- * the exact naming scheme `ensurePMTilesExternalLayer` uses. A layer built
- * outside the PMTiles control (e.g. the offline basemap extract dialog) must
- * put these in `metadata.nativeLayerIds` — a non-empty list is what marks the
- * layer renderable rather than a placeholder.
- */
-export function pmtilesNativeLayerIds(
-  sourceId: string,
-  tileType: "vector" | "raster",
-  sourceLayers: readonly string[],
-): string[] {
-  if (tileType === "raster") {
-    return [`${sourceId}-raster`];
-  }
-  return sourceLayers.flatMap((sourceLayer) =>
-    ["fill", "line", "circle"].map((kind) => pmtilesVectorLayerId(sourceId, sourceLayer, kind)),
-  );
-}
-
 /** Facts about a PMTiles archive needed to build a GeoLibre layer for it. */
 export interface PMTilesArchiveInfo {
   tileType: "vector" | "raster";
@@ -1129,10 +1110,6 @@ function isMapLibreProtocolRegistered(): boolean {
   );
 }
 
-function normalizePMTilesUrl(url: string): string {
-  return url.startsWith(`${PMTILES_PROTOCOL}://`) ? url : `${PMTILES_PROTOCOL}://${url}`;
-}
-
 function stripPMTilesProtocol(url: string): string {
   return url.startsWith(`${PMTILES_PROTOCOL}://`)
     ? url.slice(`${PMTILES_PROTOCOL}://`.length)
@@ -1172,10 +1149,6 @@ function hasPMTilesNativeSourceLayer(
   );
 }
 
-function pmtilesVectorLayerId(sourceId: string, sourceLayer: string, kind: string): string {
-  return `${sourceId}-${encodeVectorTileLayerPart(sourceLayer)}-${kind}`;
-}
-
 function getPMTilesSourceLayers(layer: GeoLibreLayer): string[] {
   const sourceLayers = layer.source.sourceLayers ?? layer.metadata.sourceLayers;
   return Array.isArray(sourceLayers)
@@ -3330,10 +3303,6 @@ function encodeMbtilesLayerPart(value: string): string {
   return encodeURIComponent(value).replaceAll("%", "_");
 }
 
-function encodeVectorTileLayerPart(value: string): string {
-  return encodeURIComponent(value).replaceAll("%", "_");
-}
-
 export function mbtilesFillLayerId(layerId: string, sourceLayer: string): string {
   return `layer-${layerId}-mbtiles-${encodeMbtilesLayerPart(sourceLayer)}-fill`;
 }