@bicharts/chart-host 0.1.7 → 0.1.9

package/dist/{chunk-DF5QUB2N.mjs → chunk-3NDJV3DA.mjs}

@@ -1,4 +1,9 @@
 /*! @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-X7PWWEGM.mjs";
 
 // src/contract.ts
 var HOST_CONTRACT_VERSION = "1.0.0";
@@ -75,8 +80,11 @@ function resolveOptions(p) {
 }
 
 // src/geoLazy.ts
-var cache = /* @__PURE__ */ new Map();
-function assetFor(geoKind) {
+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";
@@ -84,37 +92,55 @@ function assetFor(geoKind) {
   if (k === "us-zip5") return "us-zip3";
   return null;
 }
+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;
+  return key === "north-america" ? northAmerica(geo) : geo;
+}
 async function loadGeo(geoKind) {
   if (!geoKind) return void 0;
   const key = geoKind.toLowerCase();
-  if (cache.has(key)) return cache.get(key);
-  const asset = assetFor(key);
+  const already = geoFromCache(key);
+  if (already) return already;
+  const asset = geoAssetFor(key);
   if (!asset) return void 0;
-  let geo;
   if (asset === "us-states") {
-    geo = (await import("./geoUsStates.generated-2ZZRXWWJ.mjs")).US_STATES;
+    byAsset.set(asset, (await import("./geoUsStates.generated-2ZZRXWWJ.mjs")).US_STATES);
   } else if (asset === "us-zip3") {
-    geo = (await import("./geoUsZip3.generated-56OL4TTZ.mjs")).US_ZIP3;
+    byAsset.set(asset, (await import("./geoUsZip3.generated-56OL4TTZ.mjs")).US_ZIP3);
   } else {
-    const { WORLD_110M } = await import("./geoWorld110m.generated-O2WOIRYY.mjs");
-    if (key === "north-america") {
-      const { NA_ISO3, NA_LAT_MAX, clipFeatureToLat } = await import("./geoNaRegions-SAINMZXG.mjs");
-      geo = {
-        type: "FeatureCollection",
-        features: WORLD_110M.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)
-      };
-    } else {
-      geo = WORLD_110M;
-    }
+    byAsset.set(asset, (await import("./geoWorld110m.generated-O2WOIRYY.mjs")).WORLD_110M);
   }
-  cache.set(key, geo);
-  return geo;
+  return fromAssets(key);
 }
 function geoFromCache(geoKind) {
-  return geoKind ? cache.get(geoKind.toLowerCase()) : void 0;
+  if (!geoKind) return void 0;
+  const key = geoKind.toLowerCase();
+  return byKind.get(key) ?? fromAssets(key);
 }
 function registerGeo(geoKind, geo) {
-  if (geoKind && geo) cache.set(geoKind.toLowerCase(), 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;
+}
+function clearGeoCache() {
+  byKind.clear();
+  byAsset.clear();
+  _na = void 0;
 }
 
 // ../shape-core/dist/chunk-U5UKZYHK.mjs
@@ -749,7 +775,11 @@ function distinctNormalized(values) {
 function looksLikeCountryColumn(values) {
   const d = distinctNormalized(values);
   if (d.length === 0) return false;
-  return d.every((v) => COUNTRY_IDS.has(v));
+  if (!d.every((v) => COUNTRY_IDS.has(v))) return false;
+  return d.some((v) => !resolveAdmin1(v));
+}
+function isAmbiguousCountryState(normalized) {
+  return COUNTRY_IDS.has(normalized) && !!resolveAdmin1(normalized);
 }
 function admin1MatchPct(values) {
   const d = distinctNormalized(values);
@@ -808,7 +838,10 @@ function resolvePointRoles(columns, rows, hint) {
   const hintedState = hint?.state;
   if (hintedState && colSet.has(hintedState)) {
     const vals = valuesOf(hintedState);
-    if (looksLikeCountryColumn(vals)) {
+    const dvals = distinctNormalized(vals);
+    if (dvals.length > 0 && dvals.every(isAmbiguousCountryState)) {
+      refused.push(`state=${hintedState} (every value is "CA", which is both Canada and California)`);
+    } else if (looksLikeCountryColumn(vals)) {
       refused.push(`state=${hintedState} (every value is a country, not a state)`);
       if (!out.country) out.country = hintedState;
     } else if (admin1MatchPct(vals) < THRESHOLD_PCT) {
@@ -826,7 +859,9 @@ function resolvePointRoles(columns, rows, hint) {
       if (looksLikeCountryColumn(vals)) continue;
       const pct = admin1MatchPct(vals);
       if (pct < THRESHOLD_PCT) continue;
-      if (distinctMatches(vals, (v) => !!resolveAdmin1(v)) < MIN_DISTINCT_BACKFILL) continue;
+      const hits = distinctMatches(vals, (v) => !!resolveAdmin1(v));
+      const unambiguous = distinctMatches(vals, (v) => !!resolveAdmin1(v) && !isAmbiguousCountryState(v));
+      if (hits < MIN_DISTINCT_BACKFILL && unambiguous < 1) continue;
       if (!best || pct > best.pct) best = { name: c, pct };
     }
     if (best) {
@@ -1384,12 +1419,15 @@ export {
   COLOR_SCALE_SELF_CLAMP_PCT_MIN,
   COLOR_SCALE_SELF_CLAMP_PCT_MAX,
   resolveOptions,
+  geoAssetFor,
   loadGeo,
   geoFromCache,
   registerGeo,
+  registerGeoAsset,
+  clearGeoCache,
   buildRenderPayload,
   createMarkResolver,
   compileRenderFn,
   createChartHost
 };
-//# sourceMappingURL=chunk-DF5QUB2N.mjs.map
+//# sourceMappingURL=chunk-3NDJV3DA.mjs.map