@bicharts/chart-host 0.6.103 → 0.6.105

package/dist/card.mjs

@@ -1,8 +1,8 @@
 /*! @bicharts/chart-host — Apache-2.0. Bundled reference data: GeoNames (https://www.geonames.org/) CC BY 4.0; Natural Earth and US Census/TIGER (public domain). Full text: NOTICE in this package. */
 import {
   computeSelectionCard
-} from "./chunk-D6A37G2G.mjs";
-import "./chunk-CNT3QA3R.mjs";
+} from "./chunk-MU4BWWO6.mjs";
+import "./chunk-SYUJ4TPX.mjs";
 import "./chunk-GHODWOAL.mjs";
 
 // src/selectionCardChrome.ts

package/dist/chunk-5WTQN5DL.mjs

@@ -0,0 +1,96 @@
+/*! @bicharts/chart-host — Apache-2.0. Bundled reference data: GeoNames (https://www.geonames.org/) CC BY 4.0; Natural Earth and US Census/TIGER (public domain). Full text: NOTICE in this package. */
+import {
+  NA_ISO3,
+  NA_LAT_MAX,
+  clipFeatureToLat
+} from "./chunk-A2GMXZP7.mjs";
+
+// src/geoLazy.ts
+var byKind = /* @__PURE__ */ new Map();
+var byAsset = /* @__PURE__ */ new Map();
+var _na;
+function geoAssetFor(geoKind) {
+  if (!geoKind) return null;
+  const k = geoKind.toLowerCase();
+  if (/^country/.test(k)) return "world";
+  if (k === "north-america") return "world";
+  if (k === "world") return "world";
+  if (k === "us-state-code" || k === "us-state-name") return "us-states";
+  if (k === "us-zip5") return "us-zip3";
+  return null;
+}
+var _worldBase;
+function worldBasemap(world) {
+  if (!_worldBase) {
+    _worldBase = {
+      type: "FeatureCollection",
+      features: world.features.filter((f) => f?.geometry && f.geometry.type !== "Point")
+    };
+  }
+  return _worldBase;
+}
+function northAmerica(world) {
+  if (!_na) {
+    _na = {
+      type: "FeatureCollection",
+      features: world.features.filter((f) => NA_ISO3.has(f?.id) && f?.geometry && f.geometry.type !== "Point").map((f) => clipFeatureToLat(f, NA_LAT_MAX)).filter((f) => f !== null)
+    };
+  }
+  return _na;
+}
+function fromAssets(key) {
+  const asset = geoAssetFor(key);
+  if (!asset) return void 0;
+  const geo = byAsset.get(asset);
+  if (!geo) return void 0;
+  if (key === "north-america") return northAmerica(geo);
+  if (key === "world") return worldBasemap(geo);
+  return geo;
+}
+async function loadGeo(geoKind) {
+  if (!geoKind) return void 0;
+  const key = geoKind.toLowerCase();
+  const already = geoFromCache(key);
+  if (already) return already;
+  const asset = geoAssetFor(key);
+  if (!asset) return void 0;
+  if (asset === "us-states") {
+    byAsset.set(asset, (await import("./geoUsStates.generated-JEFM6OHO.mjs")).US_STATES);
+  } else if (asset === "us-zip3") {
+    byAsset.set(asset, (await import("./geoUsZip3.generated-VSWL7D6F.mjs")).US_ZIP3);
+  } else {
+    byAsset.set(asset, (await import("./geoWorld110m.generated-TD2TA7S7.mjs")).WORLD_110M);
+  }
+  return fromAssets(key);
+}
+function geoFromCache(geoKind) {
+  if (!geoKind) return void 0;
+  const key = geoKind.toLowerCase();
+  return byKind.get(key) ?? fromAssets(key);
+}
+function registerGeo(geoKind, geo) {
+  if (geoKind && geo) byKind.set(geoKind.toLowerCase(), geo);
+}
+function registerGeoAsset(asset, geo) {
+  if (!asset || !geo) return;
+  byAsset.set(asset, geo);
+  if (asset === "world") {
+    _na = void 0;
+    _worldBase = void 0;
+  }
+}
+function clearGeoCache() {
+  byKind.clear();
+  byAsset.clear();
+  _na = void 0;
+  _worldBase = void 0;
+}
+
+export {
+  geoAssetFor,
+  loadGeo,
+  geoFromCache,
+  registerGeo,
+  registerGeoAsset,
+  clearGeoCache
+};

package/dist/{chunk-4BR6VJQX.mjs → chunk-K6UXTDMR.mjs}

@@ -34,18 +34,16 @@ import {
   unpinScrolledAxis
 } from "./chunk-IE7TM6DX.mjs";
 import {
+  geoFromCache
+} from "./chunk-5WTQN5DL.mjs";
+import {
+  Dt,
   Fn,
-  J3,
   Q,
+  Rr,
   Yn,
-  ir,
   tt
-} from "./chunk-CNT3QA3R.mjs";
-import {
-  NA_ISO3,
-  NA_LAT_MAX,
-  clipFeatureToLat
-} from "./chunk-A2GMXZP7.mjs";
+} from "./chunk-SYUJ4TPX.mjs";
 import {
   ACTIVE_TICK_CLASS,
   ANIM_LOOP_DELAY_DEFAULT,
@@ -1167,6 +1165,8 @@ function resolveOptions(p) {
     // generated code); HC substitution has already happened in the caller.
     geoLandColor: p.geoLandColor || themedLand(p) || void 0,
     geoNoDataColor: p.geoNoDataColor || void 0,
+    // Borders on unless the host says false: a province map of several countries needs them to read.
+    geoBorders: p.geoBorders !== false,
     aggregation: (p.aggregation == null ? "" : String(p.aggregation)) || void 0,
     // A recognised value wins, anything else falls to the default: an unknown string must
     // never reach a chart as a live mode. Both of these are read on EVERY render, so a
@@ -1269,87 +1269,6 @@ function resolveOptions(p) {
   };
 }
 
-// src/geoLazy.ts
-var byKind = /* @__PURE__ */ new Map();
-var byAsset = /* @__PURE__ */ new Map();
-var _na;
-function geoAssetFor(geoKind) {
-  if (!geoKind) return null;
-  const k = geoKind.toLowerCase();
-  if (/^country/.test(k)) return "world";
-  if (k === "north-america") return "world";
-  if (k === "world") return "world";
-  if (k === "us-state-code" || k === "us-state-name") return "us-states";
-  if (k === "us-zip5") return "us-zip3";
-  return null;
-}
-var _worldBase;
-function worldBasemap(world) {
-  if (!_worldBase) {
-    _worldBase = {
-      type: "FeatureCollection",
-      features: world.features.filter((f2) => f2?.geometry && f2.geometry.type !== "Point")
-    };
-  }
-  return _worldBase;
-}
-function northAmerica(world) {
-  if (!_na) {
-    _na = {
-      type: "FeatureCollection",
-      features: world.features.filter((f2) => NA_ISO3.has(f2?.id) && f2?.geometry && f2.geometry.type !== "Point").map((f2) => clipFeatureToLat(f2, NA_LAT_MAX)).filter((f2) => f2 !== null)
-    };
-  }
-  return _na;
-}
-function fromAssets(key) {
-  const asset = geoAssetFor(key);
-  if (!asset) return void 0;
-  const geo = byAsset.get(asset);
-  if (!geo) return void 0;
-  if (key === "north-america") return northAmerica(geo);
-  if (key === "world") return worldBasemap(geo);
-  return geo;
-}
-async function loadGeo(geoKind) {
-  if (!geoKind) return void 0;
-  const key = geoKind.toLowerCase();
-  const already = geoFromCache(key);
-  if (already) return already;
-  const asset = geoAssetFor(key);
-  if (!asset) return void 0;
-  if (asset === "us-states") {
-    byAsset.set(asset, (await import("./geoUsStates.generated-JEFM6OHO.mjs")).US_STATES);
-  } else if (asset === "us-zip3") {
-    byAsset.set(asset, (await import("./geoUsZip3.generated-VSWL7D6F.mjs")).US_ZIP3);
-  } else {
-    byAsset.set(asset, (await import("./geoWorld110m.generated-TD2TA7S7.mjs")).WORLD_110M);
-  }
-  return fromAssets(key);
-}
-function geoFromCache(geoKind) {
-  if (!geoKind) return void 0;
-  const key = geoKind.toLowerCase();
-  return byKind.get(key) ?? fromAssets(key);
-}
-function registerGeo(geoKind, geo) {
-  if (geoKind && geo) byKind.set(geoKind.toLowerCase(), geo);
-}
-function registerGeoAsset(asset, geo) {
-  if (!asset || !geo) return;
-  byAsset.set(asset, geo);
-  if (asset === "world") {
-    _na = void 0;
-    _worldBase = void 0;
-  }
-}
-function clearGeoCache() {
-  byKind.clear();
-  byAsset.clear();
-  _na = void 0;
-  _worldBase = void 0;
-}
-
 // src/payload.ts
 var ROW_IDX_COLUMN = "__rowIdx__";
 function resolvePointChannel(cols, rowObjs, point) {
@@ -1363,7 +1282,7 @@ function resolvePointChannel(cols, rowObjs, point) {
   let labelCol;
   if (bind) {
     const dims = cols.filter((c) => !c.isMeasure).map((c) => c.name);
-    const res = ir(dims, rowObjs, bind, point?.mapKind, cols.map((c) => c.name));
+    const res = Rr(dims, rowObjs, bind, point?.mapKind, cols.map((c) => c.name));
     bind = res.bind;
     rolesBackfilled = res.backfilled;
     rolesRefused = res.refused;
@@ -1373,7 +1292,7 @@ function resolvePointChannel(cols, rowObjs, point) {
   const hasPointBind = !!bind && !!(bind.city || bind.state || bind.zip || bind.country || bind.lat && bind.lon);
   if (hasPointBind) {
     const p = bind;
-    const built = J3(rowObjs.map((r) => ({
+    const built = Dt(rowObjs.map((r) => ({
       lat: p.lat ? r[p.lat] : null,
       lon: p.lon ? r[p.lon] : null,
       city: p.city ? r[p.city] : null,
@@ -1381,7 +1300,7 @@ function resolvePointChannel(cols, rowObjs, point) {
       zip: p.zip ? r[p.zip] : null,
       country: p.country ? r[p.country] : null,
       label: labelCol ? r[labelCol] : null
-    })), point?.mapKind);
+    })), point?.mapKind, point?.region ?? null);
     pLat = built.lat;
     pLon = built.lon;
     pPrec = built.precisions;
@@ -1431,7 +1350,29 @@ function buildRenderPayload(cols, rowObjs, geo, point, destination, opts) {
   let geoIso = null;
   let geoUnmatched;
   let geoUnmatchedDistinct;
-  if (geo && geo.column && geo.kind && Yn(geo.kind)) {
+  let geoProvince;
+  if (geo && geo.column && geo.grain && geo.grain.toLowerCase() === "admin1" && geo.join) {
+    const kind = (geo.kind || "").toLowerCase();
+    const fb = geo.fallback ?? {};
+    const isProvince = kind.startsWith("admin1-") || kind.startsWith("us-state-");
+    const latCol = kind === "latlon" ? geo.column : fb.lat ?? null;
+    const lonCol = fb.lon ?? (latCol ? longitudeBeside(cols.map((c) => c.name)) : null);
+    const cityCol = kind.startsWith("city") ? geo.column : fb.city ?? null;
+    const locate = geo.locate ?? void 0;
+    const built = geo.join(rowObjs.map((r) => ({
+      province: isProvince ? r[geo.column] : void 0,
+      city: cityCol ? r[cityCol] : void 0,
+      country: fb.country ? r[fb.country] : void 0,
+      lat: latCol ? r[latCol] : void 0,
+      lon: lonCol ? r[lonCol] : void 0
+    })), { provinceKind: isProvince ? kind : null, deriveProvinces: geo.deriveProvinces, locate: locate ?? void 0 });
+    geoIso = built.iso;
+    geoUnmatched = { count: built.totalRows - built.matchedRows, examples: built.unmatched.slice(0, 8) };
+    geoUnmatchedDistinct = built.unmatched.length;
+    const sources = { province: 0, coordinates: 0, city: 0 };
+    for (const s of built.source) if (s) sources[s]++;
+    geoProvince = { sources, ambiguousRows: built.ambiguousRows, ambiguousExamples: built.ambiguousExamples, unplacedPoints: built.unplacedPoints };
+  } else if (geo && geo.column && geo.kind && Yn(geo.kind)) {
     const built = Fn(rowObjs.map((r) => r[geo.column]), geo.kind);
     geoIso = built.iso;
     geoUnmatched = { count: built.totalRows - built.matchedRows, examples: built.unmatched.slice(0, 8) };
@@ -1512,9 +1453,14 @@ function buildRenderPayload(cols, rowObjs, geo, point, destination, opts) {
     // the ordinary case adds no bytes.
     ...rolesRefused.length ? { geoPointRefused: rolesRefused } : {},
     ...utcDayColumns ? { dateCellsAreUtcDays: true, utcDayColumns } : {},
-    ...utcWallClockColumns ? { dateCellsAreUtcWallClock: true, utcWallClockColumns } : {}
+    ...utcWallClockColumns ? { dateCellsAreUtcWallClock: true, utcWallClockColumns } : {},
+    ...geoProvince ? { geoProvince } : {}
   };
 }
+function longitudeBeside(names) {
+  const words = (n) => n.replace(/([a-z])([A-Z])/g, "$1 $2").toLowerCase().split(/[^a-zÀ-ɏ]+/);
+  return names.find((n) => words(n).some((w) => w === "lon" || w === "lng" || w === "long" || w === "longitude")) ?? null;
+}
 
 // src/codeComments.ts
 function stripJsComments(code) {
@@ -3844,12 +3790,6 @@ export {
   exportTableService,
   browserSaveFile,
   resolveOptions,
-  geoAssetFor,
-  loadGeo,
-  geoFromCache,
-  registerGeo,
-  registerGeoAsset,
-  clearGeoCache,
   buildRenderPayload,
   stripJsComments,
   censusMarks,

package/dist/{chunk-D6A37G2G.mjs → chunk-MU4BWWO6.mjs}

@@ -1,12 +1,12 @@
 /*! @bicharts/chart-host — Apache-2.0. Bundled reference data: GeoNames (https://www.geonames.org/) CC BY 4.0; Natural Earth and US Census/TIGER (public domain). Full text: NOTICE in this package. */
 import {
-  fi,
+  Bt,
+  Gt,
+  Ii,
+  Ti,
   j,
-  kt,
-  pi,
-  u,
-  vt
-} from "./chunk-CNT3QA3R.mjs";
+  u
+} from "./chunk-SYUJ4TPX.mjs";
 
 // src/sourceDateFormat.ts
 function formatSourceDate(raw, opts = {}) {
@@ -435,15 +435,15 @@ function displayText(col, raw, opts) {
   return String(raw);
 }
 function isSuppressed(col) {
-  return vt(col).suppressed;
+  return Bt(col).suppressed;
 }
 function resolveAgg(col, requested, auto) {
   const fallback = () => {
-    const d = fi(col);
+    const d = Ti(col);
     return d === "first" ? "count" : d;
   };
   if (auto) return fallback();
-  return kt(col).indexOf(requested) >= 0 ? requested : fallback();
+  return Gt(col).indexOf(requested) >= 0 ? requested : fallback();
 }
 function toNumber(v) {
   if (v == null || v === "") return null;
@@ -546,7 +546,7 @@ function computeSelectionCard(payload, selectedRowIdxs, opts = {}) {
     }
     const value = reduce(selVals, colAgg, selRaw);
     let sharePct = null;
-    if (pi(col, colAgg) && value != null) {
+    if (Ii(col, colAgg) && value != null) {
       const allVals = [];
       const allRaw = [];
       for (let r = 0; r < rows.length; r++) {