@opendata-ai/openchart-engine 8.0.0-rc.4 → 8.0.0-rc.6

package/dist/index.js

@@ -11758,12 +11758,31 @@ function validateMapSpec(spec, errors) {
       }
     } else if (typeof focus === "object") {
       const focusObj = focus;
-      if (!("features" in focusObj) || focusObj.features == null) {
+      if ("points" in focusObj) {
+        const pts = focusObj.points;
+        const isSubset = typeof pts === "object" && pts !== null && typeof pts.field === "string" && "value" in pts;
+        if (pts !== true && !isSubset) {
+          errors.push({
+            message: "Spec error: geo.focus.points must be true or { field: string, value: string | number }",
+            path: "geo.focus.points",
+            code: "INVALID_TYPE",
+            suggestion: 'Use { points: true } to fit all points, or { points: { field: "rating", value: "F" } } to fit a subset.'
+          });
+        }
+        if (focusObj.padding !== void 0 && typeof focusObj.padding !== "number") {
+          errors.push({
+            message: "Spec error: geo.focus.padding must be a number",
+            path: "geo.focus.padding",
+            code: "INVALID_TYPE",
+            suggestion: "Provide padding as a number in map-local units, e.g. padding: 16"
+          });
+        }
+      } else if (!("features" in focusObj) || focusObj.features == null) {
         errors.push({
-          message: 'Spec error: geo.focus object must have a "features" property',
+          message: 'Spec error: geo.focus object must have a "features" or "points" property',
           path: "geo.focus.features",
           code: "MISSING_FIELD",
-          suggestion: 'Provide feature id(s) to focus on, e.g. geo: { focus: { features: "36", padding: 32 } }'
+          suggestion: 'Provide feature id(s) to focus on, e.g. { features: "36", padding: 32 }, or { points: true } to fit the point cluster.'
         });
       } else {
         const feats = focusObj.features;
@@ -11797,10 +11816,10 @@ function validateMapSpec(spec, errors) {
       }
     } else {
       errors.push({
-        message: "Spec error: geo.focus must be a string, number, array of ids, or object with { features, padding? }",
+        message: "Spec error: geo.focus must be a string, number, array of ids, or object with { features, padding? } or { points: true, padding? }",
         path: "geo.focus",
         code: "INVALID_TYPE",
-        suggestion: 'Use a feature id, array of ids, or { features: "36", padding: 16 }. Pass null to clear focus.'
+        suggestion: 'Use a feature id, array of ids, { features: "36", padding: 16 }, or { points: true }. Pass null to clear focus.'
       });
     }
   }
@@ -17992,6 +18011,7 @@ function compileMap(spec, options) {
       fullArea,
       mapAreaHeight,
       legendReserveGap,
+      legendPosition,
       showLegend,
       droppedFeatures
     });
@@ -18301,7 +18321,7 @@ function compileMap(spec, options) {
     role: "img",
     keyboardNavigable: featureMarks.length > 0 || pointMarks.length > 0
   };
-  const resolvedFocus = resolveFocus(mapSpec.geo.focus, featureMarks, compileWarnings);
+  const resolvedFocus = resolveFocus(mapSpec.geo.focus, featureMarks, pointMarks, compileWarnings);
   const resolvedAnimation = resolveAnimation(mapSpec.animation);
   const mapAreaY = legendPosition === "top" && legendBlockHeight > 0 ? fullArea.y + legendBlockHeight + legendReserveGap : fullArea.y;
   const mapArea = {
@@ -18472,6 +18492,7 @@ function buildCategoricalMarks(opts) {
     fullArea,
     mapAreaHeight,
     legendReserveGap,
+    legendPosition,
     showLegend,
     droppedFeatures
   } = opts;
@@ -18565,14 +18586,14 @@ function buildCategoricalMarks(opts) {
       shape: "square"
     }));
     const legendX = fullArea.x;
-    const legendY = fullArea.y + mapAreaHeight + legendReserveGap;
+    const legendY = legendPosition === "bottom" ? fullArea.y + mapAreaHeight + legendReserveGap : fullArea.y + legendReserveGap;
     const legendWidth = fullArea.width;
     const swatchSize = 10;
     const swatchGap = 6;
     const entryGap = 16;
     legend = {
       type: "categorical",
-      position: "bottom",
+      position: legendPosition,
       bounds: { x: legendX, y: legendY, width: legendWidth, height: swatchSize + 6 },
       labelStyle,
       entries,
@@ -18584,8 +18605,38 @@ function buildCategoricalMarks(opts) {
   }
   return { marks, legend };
 }
-function resolveFocus(focus, features, warnings) {
+function resolveFocus(focus, features, pointMarks, warnings) {
   if (focus === null || focus === void 0) return null;
+  if (typeof focus === "object" && !Array.isArray(focus) && "points" in focus) {
+    const filter = focus.points;
+    const matched = filter === true ? pointMarks : pointMarks.filter((p) => p.data[filter.field] === filter.value);
+    if (matched.length === 0) {
+      const detail = filter === true ? "the map has no points to fit" : `no points match { field: "${filter.field}", value: ${JSON.stringify(filter.value)} }`;
+      warnings.push({
+        code: "FOCUS_UNMATCHED",
+        message: `geo.focus.points is set but ${detail}`,
+        context: {}
+      });
+      return null;
+    }
+    const padding2 = focus.padding ?? 16;
+    let minX2 = Infinity;
+    let minY2 = Infinity;
+    let maxX2 = -Infinity;
+    let maxY2 = -Infinity;
+    for (const p of matched) {
+      minX2 = Math.min(minX2, p.cx - p.r);
+      minY2 = Math.min(minY2, p.cy - p.r);
+      maxX2 = Math.max(maxX2, p.cx + p.r);
+      maxY2 = Math.max(maxY2, p.cy + p.r);
+    }
+    return {
+      target: { x: minX2, y: minY2, width: maxX2 - minX2, height: maxY2 - minY2, padding: padding2 },
+      // No feature ids: focus-dim is a feature concept, so a points focus
+      // dims no features (there are no "other" features to mute).
+      ids: []
+    };
+  }
   let ids;
   let padding = 16;
   if (typeof focus === "string" || typeof focus === "number") {