@diagrammo/dgmo 0.20.1 → 0.20.2

package/dist/auto.mjs

@@ -45851,7 +45851,7 @@ function resolveMap(parsed, data) {
   const lonSpan = extent2[1][0] - extent2[0][0];
   const latSpan = extent2[1][1] - extent2[0][1];
   const span = Math.max(lonSpan, latSpan);
-  const usDominant = (inferredCountry === "US" || subdivisions.includes("us-states")) && !regions.some((r) => r.layer === "country" && r.iso !== "US") && !anyNonUsPoi;
+  const usDominant = (subdivisions.includes("us-states") || regions.some((r) => r.layer === "us-state")) && !regions.some((r) => r.layer === "country" && r.iso !== "US") && !anyNonUsPoi;
   let projection;
   const override = parsed.directives.projection;
   if (override === "equirectangular" || override === "natural-earth" || override === "albers-usa" || override === "mercator") {
@@ -46104,8 +46104,19 @@ function layoutMap(resolved, data, size, opts) {
   const { width, height } = size;
   const wantsUsStates = resolved.basemaps.subdivisions.includes("us-states");
   const usCrisp = resolved.projection === "albers-usa" && wantsUsStates && !!data.naLand;
-  const worldTopo = usCrisp ? data.naLand : resolved.basemaps.world === "detail" ? data.worldDetail : data.worldCoarse;
+  const worldTopo = usCrisp ? data.worldDetail : resolved.basemaps.world === "detail" ? data.worldDetail : data.worldCoarse;
   const worldLayer = decodeLayer(worldTopo);
+  if (usCrisp && data.naLand) {
+    const [nbW, nbS, nbE, nbN] = [-140, 10, -52, 66];
+    const crisp = decodeLayer(data.naLand);
+    for (const [iso, cf] of crisp) {
+      const base = worldLayer.get(iso);
+      if (!base) continue;
+      const [[bw, bs], [be, bn]] = geoBounds2(base);
+      if (bw >= nbW && be <= nbE && bs >= nbS && bn <= nbN)
+        worldLayer.set(iso, cf);
+    }
+  }
   const usLayer = wantsUsStates ? decodeLayer(data.usStates) : null;
   const landTint = isDark ? LAND_TINT_DARK : LAND_TINT_LIGHT;
   const neutralFill = mix(palette.colors.green, palette.bg, landTint);
@@ -46251,6 +46262,10 @@ function layoutMap(resolved, data, size, opts) {
       return p ? stretch(p[0], p[1]) : null;
     };
   } else {
+    projection.clipExtent([
+      [0, 0],
+      [width, height]
+    ]);
     path = geoPath(projection);
     project = (lon, lat) => projection([lon, lat]) ?? null;
   }
@@ -46395,18 +46410,11 @@ function layoutMap(resolved, data, size, opts) {
     placeInset("US-HI", hawaiiProjection(), akRight + 24, width * 0.1);
   }
   const conusFit = resolved.projection === "albers-usa" && !!usLayer;
-  const cullExtent = conusFit ? geoBounds2(fitTarget) : resolved.extent;
-  const [[exW, exS], [exE, exN]] = cullExtent;
-  const lonSpan = exE - exW;
-  const latSpan = exN - exS;
-  const isGlobalView = lonSpan >= 270 || latSpan >= 130;
-  const padLon = Math.max(8, lonSpan * 0.35);
-  const padLat = Math.max(8, latSpan * 0.35);
-  const vW = exW - padLon;
-  const vE = exE + padLon;
-  const vS = exS - padLat;
-  const vN = exN + padLat;
-  const vLonCenter = (exW + exE) / 2;
+  const classifyExtent = conusFit ? geoBounds2(fitTarget) : resolved.extent;
+  const dLonSpan = classifyExtent[1][0] - classifyExtent[0][0];
+  const dLatSpan = classifyExtent[1][1] - classifyExtent[0][1];
+  const isGlobalView = dLonSpan >= 270 || dLatSpan >= 130;
+  const vLonCenter = (classifyExtent[0][0] + classifyExtent[1][0]) / 2;
   const normLon = (lon) => {
     let L = lon;
     while (L < vLonCenter - 180) L += 360;
@@ -46414,23 +46422,28 @@ function layoutMap(resolved, data, size, opts) {
     return L;
   };
   const ringOverlapsView = (ring) => {
-    let anyIn = false;
-    let loMin = Infinity, loMax = -Infinity, laMin = Infinity, laMax = -Infinity, rawMin = Infinity, rawMax = -Infinity;
-    for (const [rawLon, lat] of ring) {
+    let loMin = Infinity, loMax = -Infinity, rawMin = Infinity, rawMax = -Infinity;
+    for (const [rawLon] of ring) {
       const lon = normLon(rawLon);
-      if (lon >= vW && lon <= vE && lat >= vS && lat <= vN) anyIn = true;
       if (lon < loMin) loMin = lon;
       if (lon > loMax) loMax = lon;
       if (rawLon < rawMin) rawMin = rawLon;
       if (rawLon > rawMax) rawMax = rawLon;
-      if (lat < laMin) laMin = lat;
-      if (lat > laMax) laMax = lat;
     }
     if (loMax - loMin > 270) return false;
     if (rawMax - rawMin > 180 && loMax - loMin < 90) return false;
-    if (anyIn) return true;
-    if (loMax - loMin > 180) return false;
-    return !(loMax < vW || loMin > vE || laMax < vS || laMin > vN);
+    let px0 = Infinity, py0 = Infinity, px1 = -Infinity, py1 = -Infinity, anyFinite = false;
+    for (const [lon, lat] of ring) {
+      const p = project(lon, lat);
+      if (!p || !Number.isFinite(p[0]) || !Number.isFinite(p[1])) continue;
+      anyFinite = true;
+      if (p[0] < px0) px0 = p[0];
+      if (p[0] > px1) px1 = p[0];
+      if (p[1] < py0) py0 = p[1];
+      if (p[1] > py1) py1 = p[1];
+    }
+    if (!anyFinite) return false;
+    return !(px1 < 0 || px0 > width || py1 < 0 || py0 > height);
   };
   const cullFeatureToView = (f) => {
     if (isGlobalView) return f;
@@ -46821,19 +46834,39 @@ function layoutMap(resolved, data, size, opts) {
       const text = labelText(p);
       return { text, w: measureLegendText(text, FONT) };
     };
+    const GAP = 3;
+    const inlineRect = (p, w, side) => {
+      switch (side) {
+        case "right":
+          return { x: p.cx + p.r + GAP, y: p.cy - poiLabH / 2, w, h: poiLabH };
+        case "left":
+          return {
+            x: p.cx - p.r - GAP - w,
+            y: p.cy - poiLabH / 2,
+            w,
+            h: poiLabH
+          };
+        case "above":
+          return {
+            x: p.cx - w / 2,
+            y: p.cy - p.r - GAP - poiLabH,
+            w,
+            h: poiLabH
+          };
+        case "below":
+          return { x: p.cx - w / 2, y: p.cy + p.r + GAP, w, h: poiLabH };
+      }
+    };
     const pushInline = (p, text, w, side) => {
-      const tx = side === "right" ? p.cx + p.r + 3 : p.cx - p.r - 3;
-      obstacles.push({
-        x: side === "right" ? tx : tx - w,
-        y: p.cy - poiLabH / 2,
-        w,
-        h: poiLabH
-      });
+      const rect = inlineRect(p, w, side);
+      obstacles.push(rect);
+      const anchor = side === "right" ? "start" : side === "left" ? "end" : "middle";
+      const x = side === "right" ? rect.x : side === "left" ? rect.x + w : p.cx;
       labels.push({
-        x: tx,
-        y: p.cy + FONT / 3,
+        x,
+        y: rect.y + poiLabH / 2 + FONT / 3,
         text,
-        anchor: side === "right" ? "start" : "end",
+        anchor,
         color: palette.text,
         halo: true,
         haloColor: palette.bg,
@@ -46842,14 +46875,8 @@ function layoutMap(resolved, data, size, opts) {
       });
     };
     const inlineFits = (p, w, side) => {
-      const tx = side === "right" ? p.cx + p.r + 3 : p.cx - p.r - 3;
-      const rect = {
-        x: side === "right" ? tx : tx - w,
-        y: p.cy - poiLabH / 2,
-        w,
-        h: poiLabH
-      };
-      return rect.x >= 0 && rect.x + rect.w <= width && !collides(rect);
+      const rect = inlineRect(p, w, side);
+      return rect.x >= 0 && rect.x + rect.w <= width && rect.y >= 0 && rect.y + rect.h <= height && !collides(rect);
     };
     const GROUP_R = 30;
     const groups = [];
@@ -46906,12 +46933,11 @@ function layoutMap(resolved, data, size, opts) {
       if (g.length === 1) {
         const p = g[0];
         const { text, w } = labelInfo(p);
-        if (inlineFits(p, w, "right")) {
-          pushInline(p, text, w, "right");
-          continue;
-        }
-        if (inlineFits(p, w, "left")) {
-          pushInline(p, text, w, "left");
+        const side = ["right", "left", "above", "below"].find(
+          (s) => inlineFits(p, w, s)
+        );
+        if (side) {
+          pushInline(p, text, w, side);
           continue;
         }
       }
@@ -57051,7 +57077,7 @@ pre.dgmo, code.language-dgmo, pre > code.language-dgmo,
 
 // src/auto/index.ts
 init_safe_href();
-var VERSION = "0.20.1";
+var VERSION = "0.20.2";
 var DEFAULTS = {
   theme: "auto",
   palette: "nord",