@fundar/data-chart-telling 0.0.20 → 0.0.21

package/dist/layout/geo/GeoLayout.svelte

@@ -22,7 +22,6 @@
     numericMargins,
     zoomTransform,
     tileLayer,
-    dataLonLatBounds,
     children,
   }: {
     width: number;
@@ -30,8 +29,6 @@
     numericMargins: { top: number; right: number; bottom: number; left: number };
     zoomTransform: { x: number; y: number; k: number };
     tileLayer?: GeoTileLayerConfig;
-    /** Forwarded to `TileLayer` — see its own prop doc / `clipBoundsToData`. */
-    dataLonLatBounds?: [number, number, number, number] | null;
     children: Snippet;
   } = $props();
 </script>
@@ -44,7 +41,6 @@
       top={numericMargins.top}
       width={Math.max(0, width - numericMargins.left - numericMargins.right)}
       height={Math.max(0, height - numericMargins.top - numericMargins.bottom)}
-      {dataLonLatBounds}
     />
   {/if}
   {@render children()}

package/dist/layout/geo/GeoLayout.svelte.d.ts

@@ -15,8 +15,6 @@ type $$ComponentProps = {
         k: number;
     };
     tileLayer?: GeoTileLayerConfig;
-    /** Forwarded to `TileLayer` — see its own prop doc / `clipBoundsToData`. */
-    dataLonLatBounds?: [number, number, number, number] | null;
     children: Snippet;
 };
 declare const GeoLayout: import("svelte").Component<$$ComponentProps, {}, "">;

package/dist/plots/geo/Plot.svelte

@@ -5,8 +5,6 @@
   import { resolveFeatureStyle } from '../utils/geoSegments';
   import {
     geometryCentroid,
-    geometryLonLatBounds,
-    mercatorAspectRatio,
     geometryPartCentroids,
     filterGeometryParts,
     defaultFeatureId,
@@ -146,66 +144,6 @@
     });
   });
 
-  // ── Data footprint — the rendered geometry's own lon/lat extent. Powers
-  // two independent things below: `TileLayer`'s clip-to-data (see
-  // `clipBoundsToData`'s doc comment) and `containedSize`'s contain-and-center
-  // sizing. Only computed for a `domain: 'data'` fit (see `usesDataFit`) —
-  // that's the specific case where the projection's own scale was chosen to
-  // match *this* extent, so it's also the only case this bbox is a correct
-  // stand-in for "what the projection actually fit to". Cost is a single
-  // O(total coordinate count) pass. ────
-  const usesDataFit = $derived(
-    typeof scales.projection === 'object' && scales.projection?.domain === 'data',
-  );
-  const dataLonLatBounds = $derived.by((): [number, number, number, number] | null => {
-    if (!usesDataFit) return null;
-    let minLon = Infinity;
-    let maxLon = -Infinity;
-    let minLat = Infinity;
-    let maxLat = -Infinity;
-    for (const f of features) {
-      const b = geometryLonLatBounds(f.geometry);
-      if (!b) continue;
-      if (b[0] < minLon) minLon = b[0];
-      if (b[2] > maxLon) maxLon = b[2];
-      if (b[1] < minLat) minLat = b[1];
-      if (b[3] > maxLat) maxLat = b[3];
-    }
-    return minLon === Infinity ? null : [minLon, minLat, maxLon, maxLat];
-  });
-
-  /**
-   * The box the map itself actually renders into — `width`/`height`
-   * shrunk (never grown) to `dataLonLatBounds`' own Mercator aspect ratio,
-   * the same way `object-fit: contain` sizes an image. Without this, a
-   * `domain: 'data'` fit already internally letterboxes the *projection*
-   * to preserve the data's true shape whenever the outer box's aspect
-   * doesn't match it (e.g. a tall/narrow country handed a short/wide facet
-   * cell) — but previously the outer SVG itself stayed stretched to the
-   * full box regardless, leaving that letterboxed margin as dead space
-   * (blank, or — before `clipBoundsToData` — filled with irrelevant tiles).
-   * Shrinking the actual rendered box to match removes that margin instead
-   * of just hiding what was in it; the template below centers this smaller
-   * box within the full `{width}×{height}` area so the map still occupies
-   * the same visual position within its facet cell.
-   *
-   * Margins (`margins`/`GEO_MARGIN_ESTIMATE`) are deliberately not netted
-   * out of this fit — they're small relative to typical facet-cell sizes,
-   * and doing this exactly would mean duplicating `BasePlotLayout`'s own
-   * private margin resolution here.
-   */
-  const containedSize = $derived.by((): { width: number; height: number } => {
-    const full = { width, height };
-    if (!dataLonLatBounds) return full;
-    const aspect = mercatorAspectRatio(dataLonLatBounds);
-    if (!aspect) return full;
-    const boxAspect = width / height;
-    if (!(boxAspect > 0)) return full;
-    return aspect > boxAspect
-      ? { width, height: width / aspect }
-      : { width: height * aspect, height };
-  });
-
   // ── Tile-layer / projection compatibility ────────────────────────────────
   $effect(() => {
     if (!styles.tileLayer) return;
@@ -545,8 +483,8 @@
         {@const insetContentBox = {
           left: numericMargins.left,
           top: numericMargins.top,
-          width: Math.max(0, containedSize.width - numericMargins.left - numericMargins.right),
-          height: Math.max(0, containedSize.height - numericMargins.top - numericMargins.bottom),
+          width: Math.max(0, width - numericMargins.left - numericMargins.right),
+          height: Math.max(0, height - numericMargins.top - numericMargins.bottom),
         }}
         <InsetMarker
           marker={marker as GeoInsetMarker<TProps>}
@@ -574,10 +512,9 @@
   `equirectangular` projection, whose x/y truly are linear in lon/lat) and
   is a no-op for every other mark type.
 -->
-<div class="dct-geo-contain" style:width="{width}px" style:height="{height}px">
 <BasePlotLayout
-  width={containedSize.width}
-  height={containedSize.height}
+  {width}
+  {height}
   data={hoverCandidates}
   getX={hoverGetX}
   getY={hoverGetY}
@@ -597,14 +534,7 @@
   bind:containerEl
 >
   {#snippet children({ matchedPoints, numericMargins })}
-    <GeoLayout
-      width={containedSize.width}
-      height={containedSize.height}
-      {numericMargins}
-      zoomTransform={geoZoom.transform}
-      tileLayer={styles.tileLayer}
-      {dataLonLatBounds}
-    >
+    <GeoLayout {width} {height} {numericMargins} zoomTransform={geoZoom.transform} tileLayer={styles.tileLayer}>
       {#each markers as marker, i (marker.type + '-' + i)}
         {#if isBehindMarker(marker)}
           {@render marker_(marker, numericMargins)}
@@ -645,17 +575,3 @@
     {/if}
   {/snippet}
 </BasePlotLayout>
-</div>
-
-<style>
-  /**
-   * Centers `BasePlotLayout`'s own (possibly smaller, `containedSize`-fit)
-   * box within the full area the facet grid actually allotted this plot —
-   * see `containedSize`'s doc comment.
-   */
-  .dct-geo-contain {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-</style>

package/dist/plots/geo/TileLayer.svelte

@@ -6,7 +6,6 @@
     tileScreenBounds,
     tileUrl,
     toProjectionLike,
-    clipBoundsToData,
     type StreamingProjection,
   } from '../utils/tiles';
   import type { GeoTileLayerConfig } from '../../types/plots/styles/geo';
@@ -27,15 +26,12 @@
     top,
     width,
     height,
-    dataLonLatBounds,
   }: {
     config: GeoTileLayerConfig;
     left: number;
     top: number;
     width: number;
     height: number;
-    /** The rendered geometry's own lon/lat extent — see `clipBoundsToData`. */
-    dataLonLatBounds?: [number, number, number, number] | null;
   } = $props();
 
   const plot = usePlot();
@@ -48,18 +44,9 @@
   const rawProjection = $derived(plot.scales.projection as unknown as StreamingProjection | undefined);
   const projection = $derived(rawProjection ? toProjectionLike(rawProjection) : undefined);
 
-  // Clipped to where the map's own geometry actually is — see
-  // `clipBoundsToData`'s doc comment for why the raw `{left,top,width,height}`
-  // box alone isn't safe to hand to `visibleTiles`/`buildMercatorFit`.
-  const clippedBounds = $derived.by(() => {
-    const full = { left, top, width, height };
-    if (!projection) return full;
-    return clipBoundsToData(projection, full, dataLonLatBounds);
-  });
-
   const tiles = $derived.by(() => {
     if (!projection) return [];
-    return visibleTiles(projection, clippedBounds, tileSize, config.minZoom ?? 0, config.maxZoom ?? 19);
+    return visibleTiles(projection, { left, top, width, height }, tileSize, config.minZoom ?? 0, config.maxZoom ?? 19);
   });
 
   // One affine fit per zoom level, shared across every tile in `tiles` — see
@@ -67,7 +54,7 @@
   // each tile's own corners individually.
   const fit = $derived.by(() => {
     if (!projection || tiles.length === 0) return null;
-    return buildMercatorFit(projection, clippedBounds, tiles[0].z);
+    return buildMercatorFit(projection, { left, top, width, height }, tiles[0].z);
   });
 </script>
 

package/dist/plots/geo/TileLayer.svelte.d.ts

@@ -5,8 +5,6 @@ type $$ComponentProps = {
     top: number;
     width: number;
     height: number;
-    /** The rendered geometry's own lon/lat extent — see `clipBoundsToData`. */
-    dataLonLatBounds?: [number, number, number, number] | null;
 };
 declare const TileLayer: import("svelte").Component<$$ComponentProps, {}, "">;
 type TileLayer = ReturnType<typeof TileLayer>;

package/dist/plots/utils/geoAccessors.d.ts

@@ -8,37 +8,6 @@ import type { GeoFeature } from '../../types/plots/data/geo';
  * multi-part geometry whose pieces are geographically spread out.
  */
 export declare function geometryCentroid(geometry: GeoJSON.Geometry): [number, number];
-/**
- * A geometry's flattened lon/lat bounding box — `[minLon, minLat, maxLon,
- * maxLat]`, or `null` for a geometry with no coordinates at all. Same
- * bbox-not-geodesic caveat as `geometryCentroid` (no antimeridian handling),
- * acceptable for the same reason: real feature sets fed through this
- * package (Argentina's provinces, etc.) don't straddle it. Used to derive
- * `GeoPlot`'s rendered data's own screen-space extent (see `Plot.svelte`'s
- * `dataLonLatBounds`), so `TileLayer` can clip its raster grid to where the
- * map's own geometry actually is instead of a projection's full letterboxed
- * fit box (see `clipBoundsToData`).
- */
-export declare function geometryLonLatBounds(geometry: GeoJSON.Geometry): [number, number, number, number] | null;
-/**
- * The width:height aspect ratio a Mercator(-family) projection naturally
- * produces for a `[minLon, minLat, maxLon, maxLat]` bounding box — i.e.
- * what a `domain: 'data'`-style projection fit (see `resolveProjection.ts`)
- * implicitly commits to before any letterboxing into a differently-shaped
- * box. `null` for a degenerate box: no lon or lat span, or a latitude
- * at/past ±90° where Mercator's `y` isn't finite.
- *
- * Longitude maps linearly to Mercator's `x`; latitude maps through the
- * standard `ln(tan(π/4 + φ/2))` transform to `y` — the same one
- * `tiles.ts`'s `latToTileY` uses, left unscaled by tile count here since
- * only the *ratio* between the two axes is wanted. Both axes share the same
- * scale by construction (Mercator is conformal), so this ratio is exactly
- * what a real `d3-geo` fit would produce for the same bbox — used by
- * `GeoPlot` to size itself down to its own data's footprint instead of
- * stretching into whatever box a facet grid happens to hand it (see
- * `Plot.svelte`'s `containedSize`).
- */
-export declare function mercatorAspectRatio(bounds: [number, number, number, number]): number | null;
 /**
  * Splits a geometry into its disjoint parts: one `Polygon` per element of a
  * `MultiPolygon`'s `coordinates`, one `LineString` per element of a

package/dist/plots/utils/geoAccessors.js

@@ -61,68 +61,6 @@ export function geometryCentroid(geometry) {
     flattenCoords(geometry, coords);
     return boundsCenter(coords);
 }
-/**
- * A geometry's flattened lon/lat bounding box — `[minLon, minLat, maxLon,
- * maxLat]`, or `null` for a geometry with no coordinates at all. Same
- * bbox-not-geodesic caveat as `geometryCentroid` (no antimeridian handling),
- * acceptable for the same reason: real feature sets fed through this
- * package (Argentina's provinces, etc.) don't straddle it. Used to derive
- * `GeoPlot`'s rendered data's own screen-space extent (see `Plot.svelte`'s
- * `dataLonLatBounds`), so `TileLayer` can clip its raster grid to where the
- * map's own geometry actually is instead of a projection's full letterboxed
- * fit box (see `clipBoundsToData`).
- */
-export function geometryLonLatBounds(geometry) {
-    const coords = [];
-    flattenCoords(geometry, coords);
-    if (coords.length === 0)
-        return null;
-    let minLon = Infinity;
-    let maxLon = -Infinity;
-    let minLat = Infinity;
-    let maxLat = -Infinity;
-    for (const [lon, lat] of coords) {
-        if (lon < minLon)
-            minLon = lon;
-        if (lon > maxLon)
-            maxLon = lon;
-        if (lat < minLat)
-            minLat = lat;
-        if (lat > maxLat)
-            maxLat = lat;
-    }
-    return [minLon, minLat, maxLon, maxLat];
-}
-/**
- * The width:height aspect ratio a Mercator(-family) projection naturally
- * produces for a `[minLon, minLat, maxLon, maxLat]` bounding box — i.e.
- * what a `domain: 'data'`-style projection fit (see `resolveProjection.ts`)
- * implicitly commits to before any letterboxing into a differently-shaped
- * box. `null` for a degenerate box: no lon or lat span, or a latitude
- * at/past ±90° where Mercator's `y` isn't finite.
- *
- * Longitude maps linearly to Mercator's `x`; latitude maps through the
- * standard `ln(tan(π/4 + φ/2))` transform to `y` — the same one
- * `tiles.ts`'s `latToTileY` uses, left unscaled by tile count here since
- * only the *ratio* between the two axes is wanted. Both axes share the same
- * scale by construction (Mercator is conformal), so this ratio is exactly
- * what a real `d3-geo` fit would produce for the same bbox — used by
- * `GeoPlot` to size itself down to its own data's footprint instead of
- * stretching into whatever box a facet grid happens to hand it (see
- * `Plot.svelte`'s `containedSize`).
- */
-export function mercatorAspectRatio(bounds) {
-    const [minLon, minLat, maxLon, maxLat] = bounds;
-    if (minLat <= -90 || maxLat >= 90)
-        return null;
-    const toRad = (deg) => (deg * Math.PI) / 180;
-    const lonSpan = toRad(maxLon - minLon);
-    const mercatorY = (lat) => Math.log(Math.tan(Math.PI / 4 + toRad(lat) / 2));
-    const latSpan = Math.abs(mercatorY(maxLat) - mercatorY(minLat));
-    if (!(lonSpan > 0) || !(latSpan > 0) || !Number.isFinite(latSpan))
-        return null;
-    return lonSpan / latSpan;
-}
 /**
  * Splits a geometry into its disjoint parts: one `Polygon` per element of a
  * `MultiPolygon`'s `coordinates`, one `LineString` per element of a

package/dist/plots/utils/tiles.d.ts

@@ -36,32 +36,6 @@ export type StreamingProjection = {
  * projected output.
  */
 export declare function toProjectionLike(projection: StreamingProjection): ProjectionLike;
-/**
- * Clips `bounds` down to the screen-space box its actual geo data occupies
- * — `dataLonLatBounds`' four extremes, forward-projected — intersected with
- * `bounds` itself.
- *
- * A `domain: 'data'`-fitted Mercator projection scales to the *constraining*
- * axis of its box (see `clampBoundsToWorld`'s doc comment): a tall/narrow
- * region (Argentina) fit into a short/wide facet cell only fills a fraction
- * of the box's width, and the letterboxed margin on either side is real,
- * inverts to real (if occasionally distant) lon/lat, and so gets real tiles
- * drawn under it — `clampBoundsToWorld` only stops that margin from
- * wrapping *more* than one world-width once inverted, it doesn't stop a
- * *single* world-width's worth of legitimate-but-irrelevant coverage from
- * rendering there. For Argentina specifically that margin is wide enough to
- * reach Argentina's own antipodal region — Australia — which is what a
- * viewer actually sees. Clipping to the data's own footprint removes the
- * letterboxed margin's tiles entirely rather than trying to pick a
- * "more correct" set of tiles to show there.
- *
- * Only valid for a Mercator-family projection, same as the rest of this
- * module: `x` is assumed to depend only on longitude and `y` only on
- * latitude, so each axis's screen extent can be found by projecting just
- * two opposite corners of the lon/lat bbox rather than tracing its full
- * outline.
- */
-export declare function clipBoundsToData(projection: ProjectionLike, bounds: ScreenBounds, dataLonLatBounds: [number, number, number, number] | null | undefined): ScreenBounds;
 /**
  * Derives the visible XYZ tile grid from svelteplot's own already-fitted
  * projection (rather than this package computing/duplicating a `d3-geo` fit

package/dist/plots/utils/tiles.js

@@ -50,13 +50,14 @@ function estimateZoomLevel(projection, centerLon, centerLat, tileSize) {
     return Math.round(Math.log2(ratio));
 }
 /**
- * Clamps `bounds`' horizontal extent to at most one world-width, centered on
- * the box's own center, before any corner of it gets inverted.
+ * Clamps `bounds`' horizontal extent to at most *half* a world-width (180°
+ * of longitude), centered on the box's own center, before any corner of it
+ * gets inverted.
  *
  * A Mercator(-family) projection wraps a single world onto a *finite* pixel
  * span at any given scale. `visibleTiles`/`buildMercatorFit` invert `bounds`'
  * corners and assume the result increases monotonically left-to-right — true
- * only up to one world-width. Past that, the inverted longitude wraps around
+ * only up to one world-width; past that the inverted longitude wraps around
  * the antimeridian and comes back the other way, silently reversing the
  * corner ordering (`buildMercatorFit` was seen to compute a *negative*
  * `pxPerTileX` from this). This bites specifically when a plot's actual
@@ -64,9 +65,19 @@ function estimateZoomLevel(projection, centerLon, centerLat, tileSize) {
  * ratio does — e.g. a tall, narrow country's choropleth fit into a short,
  * wide facet-grid cell: the fit shrinks scale to match the constraining
  * (height) axis, and the *unconstrained* (width) axis's letterboxed margin
- * can then span more of the earth than actually exists. Clamping first means
- * that margin still renders tiles (real basemap, not blank) up to a full
- * world, and simply stops there instead of wrapping into a bogus repeat.
+ * can then imply more of the earth than actually exists.
+ *
+ * The cap is *half* a world rather than a full one specifically so the two
+ * edges of an extreme letterboxed margin can never reach all the way out to
+ * the region exactly opposite the map's own — a full-world cap's two edges
+ * meet exactly at that antipode (e.g. Argentina's own facet map, letterboxed
+ * enough to hit a full-world cap, would show Buenos Aires' antipode —
+ * Australia — prominently at both edges). Halving it keeps every visible
+ * tile within one quarter-turn of the data's own center, which for any real
+ * facet-grid cell is already a deliberately generous amount of basemap
+ * context (ocean, neighboring countries) — typical facet aspect ratios don't
+ * come close to needing the full 180° this still allows before clamping
+ * kicks in at all.
  */
 function clampBoundsToWorld(projection, bounds) {
     if (!projection.invert)
@@ -80,59 +91,10 @@ function clampBoundsToWorld(projection, bounds) {
     const east = projection([180, centerLonLat[1]]);
     if (!west || !east)
         return bounds;
-    const worldWidth = Math.abs(east[0] - west[0]);
-    if (!(worldWidth > 0) || bounds.width <= worldWidth)
-        return bounds;
-    return { ...bounds, left: centerX - worldWidth / 2, width: worldWidth };
-}
-/**
- * Clips `bounds` down to the screen-space box its actual geo data occupies
- * — `dataLonLatBounds`' four extremes, forward-projected — intersected with
- * `bounds` itself.
- *
- * A `domain: 'data'`-fitted Mercator projection scales to the *constraining*
- * axis of its box (see `clampBoundsToWorld`'s doc comment): a tall/narrow
- * region (Argentina) fit into a short/wide facet cell only fills a fraction
- * of the box's width, and the letterboxed margin on either side is real,
- * inverts to real (if occasionally distant) lon/lat, and so gets real tiles
- * drawn under it — `clampBoundsToWorld` only stops that margin from
- * wrapping *more* than one world-width once inverted, it doesn't stop a
- * *single* world-width's worth of legitimate-but-irrelevant coverage from
- * rendering there. For Argentina specifically that margin is wide enough to
- * reach Argentina's own antipodal region — Australia — which is what a
- * viewer actually sees. Clipping to the data's own footprint removes the
- * letterboxed margin's tiles entirely rather than trying to pick a
- * "more correct" set of tiles to show there.
- *
- * Only valid for a Mercator-family projection, same as the rest of this
- * module: `x` is assumed to depend only on longitude and `y` only on
- * latitude, so each axis's screen extent can be found by projecting just
- * two opposite corners of the lon/lat bbox rather than tracing its full
- * outline.
- */
-export function clipBoundsToData(projection, bounds, dataLonLatBounds) {
-    if (!dataLonLatBounds)
-        return bounds;
-    const [minLon, minLat, maxLon, maxLat] = dataLonLatBounds;
-    const midLon = (minLon + maxLon) / 2;
-    const midLat = (minLat + maxLat) / 2;
-    const west = projection([minLon, midLat]);
-    const east = projection([maxLon, midLat]);
-    const south = projection([midLon, minLat]);
-    const north = projection([midLon, maxLat]);
-    if (!west || !east || !south || !north)
-        return bounds;
-    const dataLeft = Math.min(west[0], east[0]);
-    const dataRight = Math.max(west[0], east[0]);
-    const dataTop = Math.min(north[1], south[1]);
-    const dataBottom = Math.max(north[1], south[1]);
-    const left = Math.max(bounds.left, dataLeft);
-    const top = Math.max(bounds.top, dataTop);
-    const right = Math.min(bounds.left + bounds.width, dataRight);
-    const bottom = Math.min(bounds.top + bounds.height, dataBottom);
-    if (!(right > left) || !(bottom > top))
+    const maxWidth = Math.abs(east[0] - west[0]) / 2;
+    if (!(maxWidth > 0) || bounds.width <= maxWidth)
         return bounds;
-    return { left, top, width: right - left, height: bottom - top };
+    return { ...bounds, left: centerX - maxWidth / 2, width: maxWidth };
 }
 /**
  * Derives the visible XYZ tile grid from svelteplot's own already-fitted

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundar/data-chart-telling",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "type": "module",
   "files": [
     "dist"