@osm-editor-kit/osm-coverage 0.1.0-alpha.2 → 0.1.0-alpha.4

package/README.md

@@ -22,8 +22,7 @@ import { createOsmCoverageApi, OsmDataSource } from '@osm-editor-kit/osm-coverag
 const api = createOsmCoverageApi<{ source: OsmDataSource }>({
   getSessionKey: ({ source }) => ['osm', source] as const,
   minZoom: 14,
-  getDownloadUrl: (bounds, { source }) =>
-  /* build Overpass or Map API URL */ '',
+  getDownloadUrl: (bounds, { source }) => /* build Overpass or Map API URL */ '',
   // optional: storage: { load, save, clear }
 })
 

package/dist/coverage-geometry.d.ts

@@ -31,6 +31,11 @@ export declare function isValidBounds(bounds: MapBounds): boolean;
 export declare function boundsArea(bounds: MapBounds): number;
 export declare function bufferBoundsInViewport(request: MapBounds, viewport: MapBounds, zoom: number, mapSizePx: MapSizePx): MapBounds;
 export declare function clampBoundsToViewport(request: MapBounds, viewport: MapBounds): MapBounds;
+/** Lon/lat length of the zoom-aware seam overlap (same magnitude as fetch buffer). */
+export declare function overlapDeltaAtZoom(viewport: MapBounds, zoom: number, mapSizePx: MapSizePx): {
+    lon: number;
+    lat: number;
+};
 export declare function createViewportFetchRequest(viewport: MapBounds, zoom: number, mapSizePx: MapSizePx, kind: CoverageFetchKind): CoverageFetchRequest | null;
 export declare function computeMissingFetchRequests(viewport: MapBounds, coverage: Feature<Polygon | MultiPolygon> | null, zoom: number, mapSizePx: MapSizePx): CoverageFetchRequest[];
 export declare function unionIntoCoverage(coverage: Feature<Polygon | MultiPolygon> | null, requestBounds: MapBounds): Feature<Polygon | MultiPolygon>;

package/dist/index.js

@@ -48,19 +48,15 @@ function bufferBoundsInViewport(request, viewport, zoom, mapSizePx) {
     north: request.north + latBuffer
   };
 }
-function clampBoundsToViewport(request, viewport) {
+function overlapDeltaAtZoom(viewport, zoom, mapSizePx) {
+  const px = bufferPxAtZoom(zoom);
   return {
-    west: Math.max(request.west, viewport.west),
-    south: Math.max(request.south, viewport.south),
-    east: Math.min(request.east, viewport.east),
-    north: Math.min(request.north, viewport.north)
+    lon: px * (viewport.east - viewport.west) / mapSizePx.width,
+    lat: px * (viewport.north - viewport.south) / mapSizePx.height
   };
 }
 function prepareFetchBounds(request, viewport, zoom, mapSizePx) {
-  const buffered = clampBoundsToViewport(
-    bufferBoundsInViewport(request, viewport, zoom, mapSizePx),
-    viewport
-  );
+  const buffered = bufferBoundsInViewport(request, viewport, zoom, mapSizePx);
   if (!isValidBounds(buffered)) return null;
   const viewportArea = boundsArea(viewport);
   if (boundsArea(buffered) < MIN_MISSING_AREA_RATIO * viewportArea) return null;
@@ -74,27 +70,28 @@ function missingParts(viewport, coverage) {
     (feature) => feature.geometry.type === "Polygon"
   );
 }
-function stripCandidates(viewport, coverage, missingPart) {
+function stripCandidates(viewport, coverage, missingPart, zoom, mapSizePx) {
   const viewportPoly = boundsToPolygon(viewport);
   const covered = intersect(featureCollection([viewportPoly, coverage]));
   if (!covered) return [];
   const coveredBbox = polygonToBounds(covered);
+  const { lon, lat } = overlapDeltaAtZoom(viewport, zoom, mapSizePx);
   const candidates = [
     {
       west: viewport.west,
       south: viewport.south,
-      east: coveredBbox.west,
+      east: Math.min(viewport.east, coveredBbox.west + lon),
       north: viewport.north
     },
     {
-      west: coveredBbox.east,
+      west: Math.max(viewport.west, coveredBbox.east - lon),
       south: viewport.south,
       east: viewport.east,
       north: viewport.north
     },
     {
       west: viewport.west,
-      south: coveredBbox.north,
+      south: Math.max(viewport.south, coveredBbox.north - lat),
       east: viewport.east,
       north: viewport.north
     },
@@ -102,7 +99,7 @@ function stripCandidates(viewport, coverage, missingPart) {
       west: viewport.west,
       south: viewport.south,
       east: viewport.east,
-      north: coveredBbox.south
+      north: Math.min(viewport.north, coveredBbox.south + lat)
     }
   ];
   return candidates.filter((strip) => {
@@ -111,14 +108,14 @@ function stripCandidates(viewport, coverage, missingPart) {
     return overlap !== null && area(overlap) > 0;
   });
 }
-function chooseBoundsForMissingPart(viewport, coverage, missingPart) {
+function chooseBoundsForMissingPart(viewport, coverage, missingPart, zoom, mapSizePx) {
   const partArea = area(missingPart);
   const partBbox = polygonToBounds(missingPart);
   const fillRatio = partArea / area(boundsToPolygon(partBbox));
   if (fillRatio >= HIGH_FILL_RATIO) {
     return [partBbox];
   }
-  const strips = stripCandidates(viewport, coverage, missingPart);
+  const strips = stripCandidates(viewport, coverage, missingPart, zoom, mapSizePx);
   const stripAreas = strips.map((strip) => ({ bounds: strip, area: boundsArea(strip) })).sort((a, b) => b.area - a.area);
   const stripTotalArea = stripAreas.reduce((sum, strip) => sum + strip.area, 0);
   const bboxArea = boundsArea(partBbox);
@@ -143,7 +140,7 @@ function computeMissingFetchRequests(viewport, coverage, zoom, mapSizePx) {
   );
   if (significantParts.length === 0) return [];
   const rawBounds = significantParts.flatMap(
-    (part) => chooseBoundsForMissingPart(viewport, coverage, part)
+    (part) => chooseBoundsForMissingPart(viewport, coverage, part, zoom, mapSizePx)
   );
   let requests = rawBounds.map((request) => {
     const prepared = prepareFetchBounds(request, viewport, zoom, mapSizePx);
@@ -160,6 +157,15 @@ function computeMissingFetchRequests(viewport, coverage, zoom, mapSizePx) {
     return full ? [full] : [];
   }
   requests = requests.slice(0, MAX_STRIP_REQUESTS);
+  let projected = coverage;
+  for (const request of requests) {
+    projected = unionIntoCoverage(projected, request.bounds);
+  }
+  const leftover = missingParts(viewport, projected).reduce((sum, part) => sum + area(part), 0);
+  if (leftover >= MIN_MISSING_AREA_RATIO * viewportArea) {
+    const full = createViewportFetchRequest(viewport, zoom, mapSizePx, "full");
+    return full ? [full] : [];
+  }
   return requests.map((request) => ({
     bounds: request.bounds,
     kind: request.kind

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@osm-editor-kit/osm-coverage",
-  "version": "0.1.0-alpha.2",
+  "version": "0.1.0-alpha.4",
   "description": "Incremental OSM coverage fetching for map viewports with TanStack Query session state.",
+  "homepage": "https://github.com/osmberlin/street-space-editor/tree/main/packages/osm-coverage",
   "license": "MIT",
   "author": "Tobias Jordans",
   "repository": {
@@ -9,12 +10,11 @@
     "url": "git+https://github.com/osmberlin/street-space-editor.git",
     "directory": "packages/osm-coverage"
   },
-  "homepage": "https://github.com/osmberlin/street-space-editor/tree/main/packages/osm-coverage",
-  "type": "module",
-  "sideEffects": false,
   "files": [
     "dist"
   ],
+  "type": "module",
+  "sideEffects": false,
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -36,7 +36,7 @@
     "postpack": "bun ../../scripts/package-exports-restore.ts"
   },
   "dependencies": {
-    "@osm-editor-kit/osm-data": "workspace:*",
+    "@osm-editor-kit/osm-data": "^0.1.0-alpha.1",
     "@tanstack/react-query": "^5.85.5",
     "@turf/area": "^7.3.5",
     "@turf/bbox": "^7.3.5",