passerelle-geo-components 0.2.0-alpha.4 → 0.2.0-alpha.5

package/geo-components.js

@@ -231,6 +231,9 @@ function _v031ToLegacyShim(params, hostContext) {
     const catalog = [];
     const overrides = [];
     for (const l of params.layers) {
+      // V0.3.2 alpha.5 : propager source complete pour permettre fetch async
+      // universel (geojson_path, geojson_url, wfs, boundary_admin, grist_table, x_*).
+      // Legacy V1.13 catalog_layers.geojson reste pour compat (source.type='geojson' inline).
       const geojson = l.source && l.source.type === "geojson" ? l.source.data : null;
       const style = l.style || {};
       const interactions = l.interactions || {};
@@ -240,6 +243,7 @@ function _v031ToLegacyShim(params, hostContext) {
         name: l.name,
         geometry_type: l.geometry_type,
         geojson,
+        source_v031: l.source,
         n_features: l.n_features,
         bbox: l.bbox,
         classification: classifShim,
@@ -278,6 +282,108 @@ function _v031ToLegacyShim(params, hostContext) {
   return { params: shimParams, hostContext: shimHost };
 }
 
+// V0.3.2 alpha.5 (Sprint V0.2 session finale, 2026-07-11) : resolveur
+// universel des 7 types de source du contract V0.3.2. Retourne une Promise
+// qui resout vers un GeoJSON FeatureCollection utilisable par MapLibre.
+// Pattern async : le layer est ajoute immediatement avec source vide, puis
+// setData appele quand la promise resout. Consequence : la carte s'affiche
+// instantanement (fond + controls), features apparaissent async.
+//
+// Types supportes :
+//   - geojson         → source.data (immediat)
+//   - geojson_path    → fetch(path, {credentials:'include'}) same-origin
+//   - geojson_url     → fetch(url) public sans credentials
+//   - wfs             → construct WFS GetFeature URL + fetch
+//   - boundary_admin  → hostContext.boundary_resolver({catalog_id, filter})
+//   - grist_table     → hostContext.grist_resolver({table, id_field, sync})
+//   - x_<prefix>      → hostContext.custom_resolvers[prefix]
+//   - vector/pmtiles  → PAS gere ici (utiliser addSource type=vector direct)
+async function _fetchSourceData(source, hostContext) {
+  if (!source || !source.type) return { type: "FeatureCollection", features: [] };
+  const t = source.type;
+
+  if (t === "geojson") {
+    if (typeof source.data === "string") {
+      // legacy : data peut etre une URL string
+      const resp = await fetch(source.data);
+      if (!resp.ok) throw new Error(`geojson data fetch failed: ${resp.status}`);
+      return resp.json();
+    }
+    return source.data || { type: "FeatureCollection", features: [] };
+  }
+
+  if (t === "geojson_path") {
+    // Path serveur (PVC hub). Fetch same-origin avec cookies OIDC.
+    const url = source.fetch_url || source.path;
+    const resp = await fetch(url, { credentials: "include" });
+    if (!resp.ok) throw new Error(`geojson_path fetch failed: ${resp.status}`);
+    return resp.json();
+  }
+
+  if (t === "geojson_url") {
+    // URL publique. Fetch sans credentials.
+    const resp = await fetch(source.url);
+    if (!resp.ok) throw new Error(`geojson_url fetch failed: ${resp.status}`);
+    return resp.json();
+  }
+
+  if (t === "wfs") {
+    // Construct GetFeature URL avec parametres par defaut V0.3.2.
+    const p = new URLSearchParams({
+      service: "WFS",
+      version: "2.0.0",
+      request: "GetFeature",
+      typeName: source.type_name,
+      outputFormat: "application/json",
+      srsName: "EPSG:4326",
+    });
+    if (source.max_features) p.set("count", String(source.max_features));
+    if (source.filter_cql) p.set("cql_filter", source.filter_cql);
+    const sep = source.url.includes("?") ? "&" : "?";
+    const resp = await fetch(source.url + sep + p.toString());
+    if (!resp.ok) throw new Error(`wfs fetch failed: ${resp.status}`);
+    return resp.json();
+  }
+
+  if (t === "boundary_admin") {
+    // Delegue au hostContext du consommateur.
+    const resolver = hostContext && hostContext.boundary_resolver;
+    if (typeof resolver !== "function") {
+      throw new Error(
+        "boundary_admin requires hostContext.boundary_resolver(source)"
+      );
+    }
+    return await resolver(source);
+  }
+
+  if (t === "grist_table") {
+    // Delegue au widget Grist parent.
+    const resolver = hostContext && hostContext.grist_resolver;
+    if (typeof resolver !== "function") {
+      throw new Error(
+        "grist_table requires hostContext.grist_resolver(source)"
+      );
+    }
+    return await resolver(source);
+  }
+
+  if (typeof t === "string" && t.startsWith("x_")) {
+    // Extension par-projet.
+    const resolvers = (hostContext && hostContext.custom_resolvers) || {};
+    const resolver = resolvers[t];
+    if (typeof resolver !== "function") {
+      throw new Error(
+        `custom source type '${t}' requires hostContext.custom_resolvers['${t}']`
+      );
+    }
+    return await resolver(source);
+  }
+
+  // Types vector/pmtiles/... : geres directement par MapLibre addSource,
+  // pas via ce resolveur.
+  throw new Error(`_fetchSourceData: type '${t}' non supporte comme geojson`);
+}
+
 // V0.3.1 classification : {color: {mode, field, method, breaks, palette,
 // _compiled_expression}, size, label} -> {paint_expression, method, field, ...}
 // attendus par _paintForClassification (V1.13).
@@ -1174,6 +1280,40 @@ export class GeoMap extends HTMLElement {
             data: sceneLayer.geojson || { type: "FeatureCollection", features: [] },
           });
 
+          // V0.3.2 alpha.5 : fetch async des sources non-inline
+          // (geojson_path, geojson_url, wfs, boundary_admin, grist_table, x_*).
+          // La carte s'affiche instantanement, features arrivent async.
+          if (sceneLayer.source_v031
+              && sceneLayer.source_v031.type !== "geojson"
+              && !sceneLayer.geojson) {
+            const hostCtx = this._hostContext || {};
+            _fetchSourceData(sceneLayer.source_v031, hostCtx)
+              .then((geojson) => {
+                const src = this.map.getSource(sourceId);
+                if (src && typeof src.setData === "function") {
+                  src.setData(geojson);
+                }
+                this.dispatchEvent(new CustomEvent("geo:source-loaded", {
+                  detail: {
+                    layerId: sceneLayer.id,
+                    features: (geojson.features || []).length,
+                  },
+                }));
+              })
+              .catch((e) => {
+                console.warn(
+                  "[geo-components] fetch source failed for",
+                  sceneLayer.id, "->", sceneLayer.source_v031, e
+                );
+                this.dispatchEvent(new CustomEvent("geo:source-error", {
+                  detail: {
+                    layerId: sceneLayer.id,
+                    error: String(e).slice(0, 200),
+                  },
+                }));
+              });
+          }
+
           // V0.2.0 Chantier 4 : détection type + auto-split polygon+point
           // Analyse la geojson pour détecter FC hétérogène et éviter le bug
           // POINT invisibles (remontée cerema-livrables).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passerelle-geo-components",
-  "version": "0.2.0-alpha.4",
+  "version": "0.2.0-alpha.5",
   "description": "Web Components pour cartes MapLibre + composants controllers pilotes - brique commune multi-projet avec contract SceneManifest V0.3.1. Zero dependance runtime, ES module, encapsulation Shadow DOM.",
   "type": "module",
   "main": "geo-components.js",

package/schemas/scene_manifest.pydantic.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  scene_manifest.schema.json
-#   timestamp: 2026-07-10T13:35:15+00:00
+#   timestamp: 2026-07-11T12:39:43+00:00
 
 from __future__ import annotations
 
@@ -337,6 +337,18 @@ class LayerSource2(BaseModel):
 
 
 class LayerSource3(BaseModel):
+    model_config = ConfigDict(
+        extra="allow",
+    )
+    type: Literal["geojson_url"]
+    url: AnyUrl = Field(
+        ...,
+        description="URL publique du GeoJSON (S3 public, CDN, endpoint sans auth). Fetche cote client sans credentials.",
+    )
+    crs: Literal["EPSG:4326"] = "EPSG:4326"
+
+
+class LayerSource4(BaseModel):
     model_config = ConfigDict(
         extra="allow",
     )
@@ -350,7 +362,7 @@ class LayerSource3(BaseModel):
     promote_id: str | None = None
 
 
-class LayerSource4(BaseModel):
+class LayerSource5(BaseModel):
     model_config = ConfigDict(
         extra="allow",
     )
@@ -369,7 +381,7 @@ class Sync(Enum):
     save = "save"
 
 
-class LayerSource5(BaseModel):
+class LayerSource6(BaseModel):
     model_config = ConfigDict(
         extra="allow",
     )
@@ -382,7 +394,7 @@ class LayerSource5(BaseModel):
     )
 
 
-class LayerSource6(BaseModel):
+class LayerSource7(BaseModel):
     model_config = ConfigDict(
         extra="allow",
     )
@@ -391,7 +403,7 @@ class LayerSource6(BaseModel):
     type_name: str = Field(..., description="WFS TypeName (ex: BATIMENT.BATIMENT).")
 
 
-class LayerSource7(BaseModel):
+class LayerSource8(BaseModel):
     model_config = ConfigDict(
         extra="allow",
     )
@@ -405,7 +417,7 @@ class LayerSource7(BaseModel):
     )
 
 
-class LayerSource8(BaseModel):
+class LayerSource9(BaseModel):
     model_config = ConfigDict(
         extra="allow",
     )
@@ -424,9 +436,10 @@ class LayerSource(
         | LayerSource6
         | LayerSource7
         | LayerSource8
+        | LayerSource9
     ]
 ):
-    root: LayerSource1 | LayerSource2 | LayerSource3 | LayerSource4 | LayerSource5 | LayerSource6 | LayerSource7 | LayerSource8 = Field(
+    root: LayerSource1 | LayerSource2 | LayerSource3 | LayerSource4 | LayerSource5 | LayerSource6 | LayerSource7 | LayerSource8 | LayerSource9 = Field(
         ...,
         description="Source de données. Discriminated union sur 'type'. Alignée MapLibre style spec (v8+).",
     )
@@ -912,7 +925,7 @@ class Layer(BaseModel):
     extensions: dict[constr(pattern=r"^[a-z][a-z_0-9]*$"), dict[str, Any]] | None = None
 
 
-class ScenemanifestV031(BaseModel):
+class ScenemanifestV032(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )

package/schemas/scene_manifest.schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://nic01asfr.github.io/Passerelle/schemas/scene_manifest/0.3.1.json",
-  "title": "SceneManifest V0.3.1",
+  "$id": "https://nic01asfr.github.io/Passerelle/schemas/scene_manifest/0.3.2.json",
+  "title": "SceneManifest V0.3.2",
   "description": "Contract unifie passerelle-geo-components pivot cross-projet (workspace SIG + editeur livrables + widget carto). Voir CONTRACT-V0.3.1.md pour la spec humaine complete.",
   "type": "object",
   "required": [
@@ -442,6 +442,16 @@
           },
           "additionalProperties": true
         },
+        {
+          "type": "object",
+          "required": ["type", "url"],
+          "properties": {
+            "type": { "const": "geojson_url" },
+            "url": { "type": "string", "format": "uri", "description": "URL publique du GeoJSON (S3 public, CDN, endpoint sans auth). Fetche cote client sans credentials." },
+            "crs": { "type": "string", "const": "EPSG:4326", "default": "EPSG:4326" }
+          },
+          "additionalProperties": true
+        },
         {
           "type": "object",
           "required": ["type", "url", "source_layer"],