@opendata-ai/openchart-engine 8.6.4 → 8.8.0

package/dist/index.d.ts

@@ -437,7 +437,7 @@ interface NormalizedBarListSpec {
 
 interface NormalizedGeoMapSpec {
     type: 'map';
-    geo: Required<Omit<GeoMapGeo, 'projection'>> & {
+    geo: Required<Omit<GeoMapGeo, 'projection' | 'zoom'>> & {
         projection?: GeoMapProjection;
     };
     data: Record<string, unknown>[];

package/dist/index.js

@@ -7511,6 +7511,7 @@ function normalizeYouDrawIt(spec) {
   return {
     prompt: "Draw your guess",
     revealLabel: "Show me",
+    resetLabel: "Clear",
     ...spec.youDrawIt
   };
 }
@@ -9107,6 +9108,35 @@ function validateTileMapSpec(spec, errors) {
     });
   }
 }
+function validateGeoMapZoom(zoom, errors) {
+  if (zoom === void 0 || typeof zoom === "boolean") return;
+  if (typeof zoom !== "object" || zoom === null || Array.isArray(zoom)) {
+    errors.push({
+      message: "Spec error: geo.zoom must be a boolean or an object { maxZoom?, controls? }",
+      path: "geo.zoom",
+      code: "INVALID_TYPE",
+      suggestion: "Use zoom: true, or zoom: { maxZoom: 8, controls: true }"
+    });
+    return;
+  }
+  const cfg = zoom;
+  if (cfg.maxZoom !== void 0 && (typeof cfg.maxZoom !== "number" || !Number.isFinite(cfg.maxZoom) || cfg.maxZoom < 1)) {
+    errors.push({
+      message: "Spec error: geo.zoom.maxZoom must be a number >= 1",
+      path: "geo.zoom.maxZoom",
+      code: "INVALID_VALUE",
+      suggestion: "maxZoom is a multiple of the full map, e.g. maxZoom: 8. The default is 12."
+    });
+  }
+  if (cfg.controls !== void 0 && typeof cfg.controls !== "boolean") {
+    errors.push({
+      message: "Spec error: geo.zoom.controls must be a boolean",
+      path: "geo.zoom.controls",
+      code: "INVALID_TYPE",
+      suggestion: "Use controls: false to hide the zoom buttons"
+    });
+  }
+}
 function validateGeoMapSpec(spec, errors) {
   if (!spec.geo || typeof spec.geo !== "object") {
     errors.push({
@@ -9227,6 +9257,7 @@ function validateGeoMapSpec(spec, errors) {
       });
     }
   }
+  validateGeoMapZoom(geo.zoom, errors);
   const encoding = spec.encoding;
   const hasPoints = spec.points && typeof spec.points === "object" && !Array.isArray(spec.points);
   const specData = spec.data;
@@ -13469,6 +13500,21 @@ function resolveYInvert(scaleY, area3) {
     bottomData
   };
 }
+var AT_FROM_EPSILON = 1e-6;
+function resolveAnchor(points, fromX) {
+  const sorted = [...points].sort((a, b) => a.x - b.x);
+  for (let i = 0; i < sorted.length; i++) {
+    const p = sorted[i];
+    if (Math.abs(p.x - fromX) <= AT_FROM_EPSILON) return { x: fromX, y: p.y };
+    if (p.x > fromX) {
+      if (i === 0) return void 0;
+      const prev = sorted[i - 1];
+      const t = (fromX - prev.x) / (p.x - prev.x);
+      return { x: fromX, y: prev.y + t * (p.y - prev.y) };
+    }
+  }
+  return void 0;
+}
 function resolveYouDrawIt(config, marks, scales, chartArea, xField) {
   if (!config || !scales.x) return void 0;
   const targetLine = marks.find((m) => m.type === "line");
@@ -13479,7 +13525,7 @@ function resolveYouDrawIt(config, marks, scales, chartArea, xField) {
   const samples = [];
   if (targetLine.dataPoints?.length) {
     for (const dp of targetLine.dataPoints) {
-      if (dp.x < fromX - 0.5) continue;
+      if (dp.x <= fromX + AT_FROM_EPSILON) continue;
       if (seen.has(dp.x)) continue;
       seen.add(dp.x);
       const raw = xField ? dp.datum[xField] : void 0;
@@ -13489,7 +13535,7 @@ function resolveYouDrawIt(config, marks, scales, chartArea, xField) {
   }
   if (samples.length === 0) {
     for (const p of targetLine.points) {
-      if (p.x < fromX - 0.5) continue;
+      if (p.x <= fromX + AT_FROM_EPSILON) continue;
       if (seen.has(p.x)) continue;
       seen.add(p.x);
       samples.push({ px: p.x, xValue: p.x });
@@ -13511,15 +13557,18 @@ function resolveYouDrawIt(config, marks, scales, chartArea, xField) {
     }
   }
   const yInvert = resolveYInvert(scales.y, chartArea);
+  const anchor = resolveAnchor(targetLine.points, fromX);
   return {
     fromX,
     area: chartArea,
     samples,
     prompt: config.prompt ?? "Draw your guess",
     revealLabel: config.revealLabel ?? "Show me",
+    resetLabel: config.resetLabel ?? "Clear",
     lineColor: targetLine.stroke,
     targetSeriesKey: targetLine.seriesKey,
     ...yInvert ? { yInvert } : {},
+    ...anchor ? { anchor } : {},
     ...comparisonPoints ? { comparisonPoints } : {}
   };
 }