@honua/react 0.1.0-beta.0 → 0.1.1-beta.0

package/webmap/convert-renderer.js

@@ -1,12 +1,16 @@
 /**
  * Converts Esri renderer JSON to MapLibre paint/layout properties.
  *
- * Handles simple, uniqueValue, and classBreaks renderers. Produces
- * data-driven expressions (match, step) for categorized/graduated renderers.
+ * Since issue #497 this module emits first-class renderer objects
+ * (`src/style/renderers.ts`) for uniqueValue/classBreaks renderers and
+ * compiles them through the shared `/expr`-based compiler, so WebMap
+ * conversion, esri-compat, and standalone renderer objects share a single
+ * implementation. The compiled style output is unchanged.
  *
  * @module
  */
-import { convertSymbol, esriColorToCss } from "./convert-symbol.js";
+import { classBreaksRenderer, uniqueValueRenderer } from "../style/renderers.js";
+import { convertSymbol } from "./convert-symbol.js";
 export function convertRenderer(renderer, warn) {
     if (!renderer)
         return undefined;
@@ -30,132 +34,109 @@ function convertUniqueValueRenderer(renderer, warn) {
     if (infos.length === 0) {
         return convertSymbol(renderer.defaultSymbol, warn);
     }
-    // Determine the layer type from the first valid symbol
-    const firstResult = convertSymbol(infos[0].symbol, warn);
-    if (!firstResult)
+    const rendererObject = uniqueValueRendererFromWebMap(renderer, warn);
+    if (!rendererObject)
         return undefined;
-    const { layerType } = firstResult;
-    // Build the field expression
-    const fieldExpr = buildFieldExpression(renderer);
-    // Build paint properties with match expressions
-    const paintKeys = collectPaintKeys(infos, warn, layerType);
-    const paint = {};
-    const layout = {};
-    for (const key of paintKeys) {
-        const matchArgs = [fieldExpr];
-        for (const info of infos) {
-            const symbolResult = convertSymbol(info.symbol, warn);
-            if (!symbolResult)
-                continue;
-            matchArgs.push(info.value);
-            matchArgs.push(symbolResult.paint[key] ?? symbolResult.layout[key]);
-        }
-        // Default value from defaultSymbol or first symbol
-        const defaultResult = renderer.defaultSymbol ? convertSymbol(renderer.defaultSymbol, warn) : firstResult;
-        const defaultVal = defaultResult?.paint[key] ?? defaultResult?.layout[key] ?? "transparent";
-        matchArgs.push(defaultVal);
-        if (isLayoutProperty(key)) {
-            layout[key] = ["match", ...matchArgs];
-        }
-        else {
-            paint[key] = ["match", ...matchArgs];
-        }
-    }
-    return { layerType, paint, layout };
+    return compileRendererObject(rendererObject);
 }
 function convertClassBreaksRenderer(renderer, warn) {
     const breaks = renderer.classBreakInfos ?? [];
     if (breaks.length === 0) {
         return convertSymbol(renderer.defaultSymbol, warn);
     }
+    const rendererObject = classBreaksRendererFromWebMap(renderer, warn);
+    if (!rendererObject)
+        return undefined;
+    return compileRendererObject(rendererObject);
+}
+/**
+ * Build a first-class unique-value renderer object from WebMap renderer
+ * JSON. Returns `undefined` when the renderer has no value infos or the
+ * first symbol cannot be converted (matching `convertRenderer` behavior).
+ *
+ * @experimental
+ */
+export function uniqueValueRendererFromWebMap(renderer, warn) {
+    const infos = renderer.uniqueValueInfos ?? [];
+    if (infos.length === 0)
+        return undefined;
+    // The first valid symbol determines the layer type.
+    const firstResult = convertSymbol(infos[0].symbol, warn);
+    if (!firstResult)
+        return undefined;
+    const values = [];
+    for (const info of infos) {
+        const symbolResult = convertSymbol(info.symbol, warn);
+        if (!symbolResult)
+            continue;
+        values.push({
+            value: info.value,
+            ...(info.label !== undefined ? { label: info.label } : {}),
+            style: { paint: symbolResult.paint, layout: symbolResult.layout },
+        });
+    }
+    return uniqueValueRenderer({
+        field: renderer.field1 ?? "",
+        ...(renderer.field2 !== undefined ? { field2: renderer.field2 } : {}),
+        ...(renderer.field3 !== undefined ? { field3: renderer.field3 } : {}),
+        ...(renderer.fieldDelimiter !== undefined ? { fieldDelimiter: renderer.fieldDelimiter } : {}),
+        values,
+        ...(renderer.defaultLabel !== undefined ? { defaultLabel: renderer.defaultLabel } : {}),
+        ...defaultStyleFromSymbol(renderer.defaultSymbol, warn),
+        layerType: firstResult.layerType,
+    });
+}
+/**
+ * Build a first-class class-breaks renderer object from WebMap renderer
+ * JSON. Returns `undefined` when the renderer has no break infos, no field,
+ * or the first symbol cannot be converted (matching `convertRenderer`
+ * behavior).
+ *
+ * @experimental
+ */
+export function classBreaksRendererFromWebMap(renderer, warn) {
+    const breaks = renderer.classBreakInfos ?? [];
+    if (breaks.length === 0)
+        return undefined;
     const firstResult = convertSymbol(breaks[0].symbol, warn);
     if (!firstResult)
         return undefined;
-    const { layerType } = firstResult;
     const field = renderer.field;
     if (!field) {
         warn.warn("missing-field", "classBreaks renderer missing field property");
         return undefined;
     }
-    const paintKeys = collectPaintKeysFromBreaks(breaks, warn, layerType);
-    const paint = {};
-    const layout = {};
-    for (const key of paintKeys) {
-        // Default value
-        const defaultResult = renderer.defaultSymbol ? convertSymbol(renderer.defaultSymbol, warn) : firstResult;
-        const defaultVal = defaultResult?.paint[key] ?? defaultResult?.layout[key] ?? "transparent";
-        const stepArgs = [["get", field], defaultVal];
-        for (const brk of breaks) {
-            const symbolResult = convertSymbol(brk.symbol, warn);
-            if (!symbolResult)
-                continue;
-            const threshold = brk.classMinValue ?? brk.classMaxValue;
-            stepArgs.push(threshold);
-            stepArgs.push(symbolResult.paint[key] ?? symbolResult.layout[key]);
-        }
-        if (isLayoutProperty(key)) {
-            layout[key] = ["step", ...stepArgs];
-        }
-        else {
-            paint[key] = ["step", ...stepArgs];
-        }
-    }
-    return { layerType, paint, layout };
-}
-function buildFieldExpression(renderer) {
-    if (!renderer.field2 && !renderer.field3) {
-        return ["get", renderer.field1 ?? ""];
-    }
-    // Multi-field: concatenate with delimiter
-    const delim = renderer.fieldDelimiter ?? ",";
-    const fields = [];
-    if (renderer.field1)
-        fields.push(["get", renderer.field1]);
-    if (renderer.field2) {
-        fields.push(delim);
-        fields.push(["get", renderer.field2]);
-    }
-    if (renderer.field3) {
-        fields.push(delim);
-        fields.push(["get", renderer.field3]);
-    }
-    return ["concat", ...fields];
-}
-function collectPaintKeys(infos, warn, layerType) {
-    const keys = new Set();
-    for (const info of infos) {
-        const result = convertSymbol(info.symbol, warn);
-        if (!result)
+    const entries = [];
+    for (const brk of breaks) {
+        const symbolResult = convertSymbol(brk.symbol, warn);
+        if (!symbolResult)
             continue;
-        for (const k of Object.keys(result.paint))
-            keys.add(k);
-        for (const k of Object.keys(result.layout))
-            keys.add(k);
+        entries.push({
+            ...(brk.classMinValue !== undefined ? { min: brk.classMinValue } : {}),
+            ...(brk.classMaxValue !== undefined ? { max: brk.classMaxValue } : {}),
+            ...(brk.label !== undefined ? { label: brk.label } : {}),
+            style: { paint: symbolResult.paint, layout: symbolResult.layout },
+        });
     }
-    return keys;
+    return classBreaksRenderer({
+        field,
+        breaks: entries,
+        ...(renderer.defaultLabel !== undefined ? { defaultLabel: renderer.defaultLabel } : {}),
+        ...defaultStyleFromSymbol(renderer.defaultSymbol, warn),
+        layerType: firstResult.layerType,
+    });
 }
-function collectPaintKeysFromBreaks(breaks, warn, layerType) {
-    return collectPaintKeys(breaks, warn, layerType);
+function defaultStyleFromSymbol(defaultSymbol, warn) {
+    if (!defaultSymbol)
+        return {};
+    const converted = convertSymbol(defaultSymbol, warn);
+    // A default symbol that fails conversion still overrides the first-entry
+    // fallback: every property defaults to "transparent" (legacy behavior).
+    return { defaultStyle: converted ? { paint: converted.paint, layout: converted.layout } : {} };
 }
-const LAYOUT_PROPERTIES = new Set([
-    "icon-image",
-    "icon-size",
-    "icon-offset",
-    "icon-anchor",
-    "icon-rotate",
-    "text-field",
-    "text-font",
-    "text-size",
-    "text-offset",
-    "text-anchor",
-    "text-max-width",
-    "text-letter-spacing",
-    "text-justify",
-    "text-rotate",
-    "symbol-placement",
-    "symbol-spacing",
-    "visibility",
-]);
-function isLayoutProperty(key) {
-    return LAYOUT_PROPERTIES.has(key);
+function compileRendererObject(renderer) {
+    // The descriptor carries the symbol-derived layer type, so the geometry
+    // argument is inert here; "polygon" is an arbitrary stand-in.
+    const [fragment] = renderer.toMapLibre("polygon");
+    return { layerType: fragment.type, paint: fragment.paint, layout: fragment.layout };
 }

package/webmap/index.d.ts

@@ -29,7 +29,7 @@ export { CONTRACT, getContractSummary } from "./contract.js";
 export type { ContractEntry, ContractSupport, ContractSummary } from "./contract.js";
 export { convertSymbol, esriColorToCss, esriLineStyleToDashArray } from "./convert-symbol.js";
 export type { SymbolConversionResult } from "./convert-symbol.js";
-export { convertRenderer } from "./convert-renderer.js";
+export { classBreaksRendererFromWebMap, convertRenderer, uniqueValueRendererFromWebMap, } from "./convert-renderer.js";
 export type { RendererConversionResult } from "./convert-renderer.js";
 export { convertPopupInfo } from "./convert-popup.js";
 export type { HonuaPopupConfig, HonuaPopupFieldInfo, HonuaPopupMediaInfo } from "./convert-popup.js";

package/webmap/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/webmap/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC9F,YAAY,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,YAAY,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,YAAY,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,YAAY,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,YAAY,EACV,UAAU,EACV,sBAAsB,EACtB,cAAc,EACd,oBAAoB,EACpB,yBAAyB,EACzB,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,yBAAyB,EACzB,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,YAAY,EACZ,WAAW,EACX,eAAe,EACf,6BAA6B,EAC7B,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,SAAS,GACV,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/webmap/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC9F,YAAY,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EACL,6BAA6B,EAC7B,eAAe,EACf,6BAA6B,GAC9B,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,YAAY,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,YAAY,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,YAAY,EACV,UAAU,EACV,sBAAsB,EACtB,cAAc,EACd,oBAAoB,EACpB,yBAAyB,EACzB,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,yBAAyB,EACzB,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,YAAY,EACZ,WAAW,EACX,eAAe,EACf,6BAA6B,EAC7B,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,SAAS,GACV,MAAM,YAAY,CAAC"}

package/webmap/index.js

@@ -25,7 +25,7 @@ export { parseWebMap } from "./parse.js";
 export { createWarningCollector } from "./warnings.js";
 export { CONTRACT, getContractSummary } from "./contract.js";
 export { convertSymbol, esriColorToCss, esriLineStyleToDashArray } from "./convert-symbol.js";
-export { convertRenderer } from "./convert-renderer.js";
+export { classBreaksRendererFromWebMap, convertRenderer, uniqueValueRendererFromWebMap, } from "./convert-renderer.js";
 export { convertPopupInfo } from "./convert-popup.js";
 export { convertLabelingInfo } from "./convert-label.js";
 export { convertBasemap } from "./convert-basemap.js";