passerelle-geo-components 0.2.0-alpha.3 → 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,17 +243,29 @@ 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,
         outline: style.outline,
         hollow_point: style.hollow_point
       });
+      // V0.3.1 opacity.reactive (Sprint V0.2 alpha.4, 2026-07-10) : preserver
+      // la config fade progressif pour applyBinding("time") au lieu du filter
+      // binaire hide/show historique.
+      const opacityStatic = typeof style.opacity === "object"
+        ? (style.opacity.kind === "static" ? style.opacity.value : undefined)
+        : style.opacity;
+      const opacityReactive = (typeof style.opacity === "object"
+                               && style.opacity.kind === "reactive")
+        ? style.opacity
+        : null;
       overrides.push({
         layer_id_ref: l.id,
         visible: style.visible !== false,
         z_index: style.z_index,
-        opacity: typeof style.opacity === "object" ? undefined : style.opacity,
+        opacity: opacityStatic,
+        opacity_reactive: opacityReactive,
         classification: classifShim,
         outline: style.outline,
         hollow_point: style.hollow_point,
@@ -267,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).
@@ -292,6 +409,15 @@ function _v031ClassificationShim(classif) {
   return out;
 }
 
+// V0.3.1 alpha.4 : normalise une position (top-left/bottom-right/...) vers
+// les 4 positions acceptees par MapLibre. Fallback sur defaut si absente ou
+// invalide (avoid warning MapLibre "Position undefined").
+function _mlPosition(pos, fallback) {
+  const valid = ["top-left", "top-right", "bottom-left", "bottom-right"];
+  if (typeof pos === "string" && valid.includes(pos)) return pos;
+  return fallback;
+}
+
 /**
  * Résout la zone d'étude en {center, zoom, bbox} exploitables par MapLibre.
  * Supporte les 3 modes du contrat V1.13 : commune | manual | study.
@@ -1090,13 +1216,37 @@ export class GeoMap extends HTMLElement {
       center: zone.center,
       zoom: zone.zoom,
     });
-    this.map.addControl(new ml.NavigationControl({ showCompass: false }), "top-left");
+
+    // V0.3.1 alpha.4 : declaratifs params.scalebar / params.north_arrow.
+    // Sans north_arrow declare, on garde le comportement historique
+    // NavigationControl sans compass. Avec, on affiche compass a la position
+    // demandee. scalebar => ScaleControl natif MapLibre a la position/unit.
+    const northCfg = params.north_arrow;
+    const scaleCfg = params.scalebar;
+    const showCompass = !!northCfg;
+    const northPos = northCfg && northCfg.position ? northCfg.position : "top-left";
+    this.map.addControl(
+      new ml.NavigationControl({ showCompass, visualizePitch: showCompass }),
+      _mlPosition(northPos, "top-left"),
+    );
+    if (scaleCfg) {
+      const unit = scaleCfg.unit === "imperial" ? "imperial" : "metric";
+      const scalePos = _mlPosition(scaleCfg.position, "bottom-right");
+      this.map.addControl(
+        new ml.ScaleControl({ maxWidth: 120, unit }),
+        scalePos,
+      );
+    }
 
     const layersOverride = params.layers_override || [];
     const catalogLayers =
       this._hostContext.catalog_layers || params._catalog_layers || [];
 
     this._layerIds = [];
+    // V0.3.1 (Sprint V0.2 alpha.4) : cache config opacity.reactive par layerId
+    // pour permettre au binding 'time' de faire un fade progressif au lieu
+    // d'un setFilter binaire hide/show. Cle = layer id MapLibre applique.
+    this._reactiveOpacity = {};
 
     // P2 contract-drift V1.13 (review 2026-07-08) : respecter LayerOverride.z_index.
     // Le contrat V1.13 declare z_index (int) pour reordonner les layers a
@@ -1130,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).
@@ -1182,6 +1366,12 @@ export class GeoMap extends HTMLElement {
             this.map.addLayer(layerDef);
             this._layerIds.push(layerDef.id);
 
+            // V0.3.1 alpha.4 : memoriser config opacity.reactive pour fade
+            // progressif via applyBinding('time').
+            if (styleOverride.opacity_reactive) {
+              this._reactiveOpacity[layerDef.id] = styleOverride.opacity_reactive;
+            }
+
             // V0.3.1 style.outline : ajout automatique layer 'line' sur même source
             if (
               styleOverride.outline &&
@@ -1209,6 +1399,19 @@ export class GeoMap extends HTMLElement {
         }
       });
 
+      // V0.3.1 alpha.4 : legend.mode='auto' + from_layer -> derive chips
+      // depuis classification._compiled_expression du layer designe et
+      // injecte une <geo-legend> auto-generee dans le shadow DOM du <geo-map>.
+      const legendCfg = params.legend;
+      if (legendCfg && (legendCfg.mode === "auto" || legendCfg.items)) {
+        const items = Array.isArray(legendCfg.items)
+          ? legendCfg.items
+          : this._autoLegendItems(legendCfg, catalogLayers, orderedLayers);
+        if (items && items.length) {
+          this._injectLegend(legendCfg, items);
+        }
+      }
+
       // fitBounds auto sur zone.bbox ou premier layer avec features
       if (zone.bbox) {
         this.map.fitBounds(zone.bbox, { padding: 40, maxZoom: 16 });
@@ -1378,6 +1581,89 @@ export class GeoMap extends HTMLElement {
   /**
    * Point d'entrée de l'orchestrateur bindings. Applique un binding reçu.
    */
+  // V0.3.1 alpha.4 : derive items de legende auto depuis
+  // classification._compiled_expression du layer from_layer.
+  _autoLegendItems(legendCfg, catalogLayers, orderedLayers) {
+    const fromId = legendCfg.from_layer;
+    if (!fromId) return null;
+    const target = orderedLayers.find(o => o.scene && o.scene.id === fromId);
+    if (!target) return null;
+    const classif = (target.override && target.override.classification)
+                    || target.scene.classification;
+    if (!classif) return null;
+    // Support 2 formats : V1.13 paint_expression direct, ou V0.3.1 shimme
+    const expr = classif.paint_expression;
+    if (!Array.isArray(expr) || expr.length < 3) return null;
+    const items = [];
+    if (expr[0] === "step") {
+      // ["step", ["get", field], color0, threshold1, color1, threshold2, color2, ...]
+      const firstColor = expr[2];
+      items.push({ label: "avant " + expr[3], color: firstColor });
+      for (let i = 3; i + 1 < expr.length; i += 2) {
+        const thr = expr[i];
+        const col = expr[i + 1];
+        const next = expr[i + 2];
+        const label = (i + 2 < expr.length)
+          ? thr + "-" + next
+          : "≥ " + thr;
+        items.push({ label, color: col });
+      }
+    } else if (expr[0] === "match") {
+      // ["match", ["get", field], v1, c1, v2, c2, ..., fallback]
+      for (let i = 2; i + 1 < expr.length; i += 2) {
+        items.push({ label: String(expr[i]), color: expr[i + 1] });
+      }
+    }
+    return items;
+  }
+
+  // V0.3.1 alpha.4 : injecte une legende auto-generee dans le shadow DOM.
+  // Utilise le meme rendering que <geo-legend> mais integre inline.
+  _injectLegend(legendCfg, items) {
+    const shadow = this.shadowRoot;
+    if (!shadow) return;
+    const pos = legendCfg.position || "bottom-left";
+    const title = legendCfg.title || "Légende";
+    const wrap = document.createElement("div");
+    wrap.className = "gc-legend";
+    const posStyles = {
+      "top-left":     "top:8px;left:8px;",
+      "top-right":    "top:8px;right:8px;",
+      "bottom-left":  "bottom:8px;left:8px;",
+      "bottom-right": "bottom:44px;right:8px;",
+    };
+    const styleAttr = posStyles[pos] || posStyles["bottom-left"];
+    wrap.setAttribute("style",
+      "position:absolute;" + styleAttr +
+      "background:rgba(255,255,255,0.94);padding:8px 12px;border-radius:4px;" +
+      "box-shadow:0 1px 4px rgba(0,0,0,0.15);font-family:Marianne,system-ui,sans-serif;" +
+      "font-size:11px;color:#333;z-index:5;max-width:260px;"
+    );
+    const t = document.createElement("div");
+    t.setAttribute("style",
+      "color:#000091;text-transform:uppercase;font-size:10px;letter-spacing:0.5px;" +
+      "font-weight:700;margin-bottom:6px;");
+    t.textContent = title;
+    wrap.appendChild(t);
+    for (const it of items) {
+      const chip = document.createElement("div");
+      chip.setAttribute("style",
+        "display:flex;align-items:center;gap:6px;margin:2px 0;");
+      const sw = document.createElement("span");
+      sw.setAttribute("style",
+        "width:14px;height:10px;background:" + it.color + ";" +
+        "border:1px solid rgba(0,0,0,0.15);border-radius:2px;flex-shrink:0;");
+      chip.appendChild(sw);
+      const lbl = document.createElement("span");
+      lbl.textContent = it.label;
+      chip.appendChild(lbl);
+      wrap.appendChild(chip);
+    }
+    // Injecter dans .gc-map pour que la legende suive la carte
+    const mapDiv = shadow.querySelector(".gc-map");
+    if (mapDiv) mapDiv.appendChild(wrap);
+  }
+
   applyBinding(detail) {
     const { prop, value } = detail || {};
     if (!this.map || !prop) return;
@@ -1385,11 +1671,47 @@ export class GeoMap extends HTMLElement {
 
     switch (prop) {
       case "time": {
-        // Filtre temporel : ['<=', ['get', 'annee'], year]
+        // V0.3.1 alpha.4 : si le layer a opacity.reactive prop=time, on
+        // applique un fade progressif (matched/before/after/null_value)
+        // au lieu du filter binaire hide/show V1.13.
         const year = _asYear(value);
-        if (year != null && primaryLayer) {
-          const timeField = detail.field || "annee";
-          this.map.setFilter(primaryLayer, ["<=", ["get", timeField], year]);
+        if (year == null || !primaryLayer) break;
+        const timeField = detail.field || "annee";
+
+        for (const lid of this._layerIds) {
+          const cfg = this._reactiveOpacity[lid];
+          if (cfg && cfg.prop === "time") {
+            // Fade progressif : expression case selon (field vs value)
+            const field = cfg.field || timeField;
+            const matched = cfg.matched ?? 0.85;
+            const before = cfg.before ?? 0.85;
+            const after = cfg.after ?? 0.12;
+            const nullValue = cfg.null_value ?? 0.35;
+            const expr = [
+              "case",
+              ["==", ["typeof", ["get", field]], "null"], nullValue,
+              ["<", ["to-number", ["get", field]], year], before,
+              [">", ["to-number", ["get", field]], year], after,
+              matched,
+            ];
+            const layer = this.map.getLayer(lid);
+            if (!layer) continue;
+            const paintKey =
+              layer.type === "fill" ? "fill-opacity" :
+              layer.type === "line" ? "line-opacity" :
+              layer.type === "circle" ? "circle-opacity" :
+              layer.type === "fill-extrusion" ? "fill-extrusion-opacity" :
+              null;
+            if (paintKey) {
+              try { this.map.setPaintProperty(lid, paintKey, expr); }
+              catch (e) { /* pas critique */ }
+            }
+          } else if (lid === primaryLayer) {
+            // Fallback V1.13 : filter binaire sur le layer primaire
+            try {
+              this.map.setFilter(lid, ["<=", ["get", timeField], year]);
+            } catch (e) { /* ignore */ }
+          }
         }
         break;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passerelle-geo-components",
-  "version": "0.2.0-alpha.3",
+  "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"],