passerelle-geo-components 0.2.0-alpha.1 → 0.2.0-alpha.3

package/geo-components.js

@@ -184,9 +184,118 @@ function _detectMapLibre() {
   return window.maplibregl || null;
 }
 
+// V0.3.1 shim (Sprint V0.2 Chantier 7, 2026-07-10) : le contract publie
+// SceneManifest V0.3.1 impose params.layers[] + params.basemap.id + zone
+// discriminee (insee_arm/commune/manual/study). Le composant historique
+// (V1.13) lit params.layers_override + _hostContext.catalog_layers +
+// params.basemap_id. Ce shim normalise V0.3.1 vers la structure legacy
+// interne sans casser les consommateurs V1.13.
+const _V031_INSEE_ARM_BBOX = {
+  "13204": [5.379, 43.289, 5.427, 43.334],
+  "13201": [5.360, 43.294, 5.394, 43.309],
+  "13202": [5.363, 43.309, 5.393, 43.328],
+  "13203": [5.374, 43.311, 5.408, 43.335],
+  "75104": [2.348, 48.851, 2.365, 48.862],
+  "75105": [2.336, 48.840, 2.362, 48.856],
+  "69381": [4.827, 45.766, 4.848, 45.780]
+};
+
+function _v031ToLegacyShim(params, hostContext) {
+  if (!params || typeof params !== "object") return { params, hostContext };
+  const isV031 = params.manifest_version === "0.3.1" || Array.isArray(params.layers);
+  if (!isV031) return { params, hostContext };
+
+  const shimParams = { ...params };
+  const shimHost = { ...(hostContext || {}) };
+
+  // basemap.id -> basemap_id
+  if (params.basemap && params.basemap.id && !shimParams.basemap_id) {
+    shimParams.basemap_id = params.basemap.id;
+  }
+
+  // zone.insee_arm / zone.commune -> hostContext.commune_bbox (fallback bbox table)
+  if (params.zone && (params.zone.kind === "insee_arm" || params.zone.kind === "commune")) {
+    const bbox = _V031_INSEE_ARM_BBOX[params.zone.insee];
+    if (bbox && !shimHost.commune_bbox) {
+      shimHost.commune_bbox = bbox;
+    }
+  }
+
+  // zone.kind bbox custom : mapper en manual
+  if (params.zone && params.zone.bbox && !params.zone.kind) {
+    shimParams.zone = { ...params.zone, kind: "manual" };
+  }
+
+  // layers[] V0.3.1 -> catalog_layers[] + layers_override[]
+  if (Array.isArray(params.layers) && !shimHost.catalog_layers && !shimParams._catalog_layers) {
+    const catalog = [];
+    const overrides = [];
+    for (const l of params.layers) {
+      const geojson = l.source && l.source.type === "geojson" ? l.source.data : null;
+      const style = l.style || {};
+      const interactions = l.interactions || {};
+      const classifShim = _v031ClassificationShim(style.classification);
+      catalog.push({
+        id: l.id,
+        name: l.name,
+        geometry_type: l.geometry_type,
+        geojson,
+        n_features: l.n_features,
+        bbox: l.bbox,
+        classification: classifShim,
+        outline: style.outline,
+        hollow_point: style.hollow_point
+      });
+      overrides.push({
+        layer_id_ref: l.id,
+        visible: style.visible !== false,
+        z_index: style.z_index,
+        opacity: typeof style.opacity === "object" ? undefined : style.opacity,
+        classification: classifShim,
+        outline: style.outline,
+        hollow_point: style.hollow_point,
+        popup_template: interactions.popup_template,
+        tooltip_field: interactions.tooltip_field,
+        hover_attributes: interactions.hover_attributes,
+        name_override: l.name
+      });
+    }
+    shimHost.catalog_layers = catalog;
+    shimParams.layers_override = [...(params.layers_override || []), ...overrides];
+  }
+
+  return { params: shimParams, hostContext: shimHost };
+}
+
+// V0.3.1 classification : {color: {mode, field, method, breaks, palette,
+// _compiled_expression}, size, label} -> {paint_expression, method, field, ...}
+// attendus par _paintForClassification (V1.13).
+function _v031ClassificationShim(classif) {
+  if (!classif) return null;
+  // Deja au format V1.13 (paint_expression direct) -> passthrough
+  if (classif.paint_expression) return classif;
+  // V0.3.1 nested {color: {...}}
+  const color = classif.color || classif;
+  if (!color || !color.mode) return classif;
+  const out = {
+    method: color.method || color.mode,
+    field: color.field
+  };
+  // Priorite : expression MapLibre pre-compilee dans _compiled_expression
+  if (Array.isArray(color._compiled_expression)) {
+    out.paint_expression = color._compiled_expression;
+  } else if (color.mode === "single" && color.value) {
+    out.paint_expression = color.value;
+  } else if (color.mode === "expression" && Array.isArray(color.expression)) {
+    out.paint_expression = color.expression;
+  }
+  return out;
+}
+
 /**
  * Résout la zone d'étude en {center, zoom, bbox} exploitables par MapLibre.
  * Supporte les 3 modes du contrat V1.13 : commune | manual | study.
+ * V0.3.1 : accepte aussi kind='insee_arm' via le shim _v031ToLegacyShim.
  * Pour "commune" et "study", nécessite une résolution externe (fournie via
  * config.resolveZone) sinon fallback sur defaults.
  */
@@ -214,7 +323,7 @@ function _resolveZone(zoneConfig, hostContext) {
     };
   }
 
-  if (kind === "commune" && hostContext?.commune_bbox) {
+  if ((kind === "commune" || kind === "insee_arm") && hostContext?.commune_bbox) {
     const [w, s, e, n] = hostContext.commune_bbox;
     return {
       center: [(w + e) / 2, (s + n) / 2],
@@ -962,6 +1071,12 @@ export class GeoMap extends HTMLElement {
   }
 
   _initMap(ml, container, params) {
+    // V0.3.1 shim (Chantier 7) : normalise SceneManifest V0.3.1 vers la
+    // structure interne V1.13 attendue par le reste du _initMap.
+    const shim = _v031ToLegacyShim(params, this._hostContext);
+    params = shim.params;
+    this._hostContext = shim.hostContext;
+
     // Résolution zone
     const zone = _resolveZone(params.zone, this._hostContext);
 

package/package.json

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