@osmix/shared 0.0.2 → 0.0.7

package/test/relation-multipolygon.test.ts

@@ -0,0 +1,265 @@
+import { describe, expect, it } from "bun:test"
+import {
+	buildRelationRings,
+	connectWaysToRings,
+	getWayMembersByRole,
+} from "../src/relation-multipolygon"
+import type { OsmRelation, OsmWay } from "../src/types"
+
+describe("relation-multipolygon", () => {
+	describe("getWayMembersByRole", () => {
+		it("groups way members by outer and inner roles", () => {
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { type: "multipolygon" },
+				members: [
+					{ type: "way", ref: 10, role: "outer" },
+					{ type: "way", ref: 11, role: "inner" },
+					{ type: "way", ref: 12, role: "outer" },
+					{ type: "node", ref: 1 },
+					{ type: "way", ref: 13, role: "inner" },
+				],
+			}
+
+			const { outer, inner } = getWayMembersByRole(relation)
+			expect(outer).toHaveLength(2)
+			expect(outer[0]?.ref).toBe(10)
+			expect(outer[1]?.ref).toBe(12)
+			expect(inner).toHaveLength(2)
+			expect(inner[0]?.ref).toBe(11)
+			expect(inner[1]?.ref).toBe(13)
+		})
+
+		it("handles case-insensitive roles", () => {
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { type: "multipolygon" },
+				members: [
+					{ type: "way", ref: 10, role: "OUTER" },
+					{ type: "way", ref: 11, role: "Inner" },
+				],
+			}
+
+			const { outer, inner } = getWayMembersByRole(relation)
+			expect(outer).toHaveLength(1)
+			expect(inner).toHaveLength(1)
+		})
+
+		it("handles missing roles", () => {
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { type: "multipolygon" },
+				members: [
+					{ type: "way", ref: 10 },
+					{ type: "way", ref: 11, role: "outer" },
+				],
+			}
+
+			const { outer, inner } = getWayMembersByRole(relation)
+			expect(outer).toHaveLength(1)
+			expect(inner).toHaveLength(0)
+		})
+	})
+
+	describe("connectWaysToRings", () => {
+		it("connects ways sharing endpoints into a single ring", () => {
+			const way1: OsmWay = { id: 1, refs: [1, 2] }
+			const way2: OsmWay = { id: 2, refs: [2, 3] }
+			const way3: OsmWay = { id: 3, refs: [3, 1] }
+
+			const rings = connectWaysToRings([way1, way2, way3])
+			expect(rings).toHaveLength(1)
+			expect(rings[0]).toEqual([way1, way2, way3])
+		})
+
+		it("handles ways that need to be reversed", () => {
+			// way1 ends at 2, way2 starts at 2 (normal connection)
+			const way1: OsmWay = { id: 1, refs: [1, 2] }
+			const way2: OsmWay = { id: 2, refs: [2, 3, 4] }
+
+			const rings = connectWaysToRings([way1, way2])
+			// Should create a ring if ways connect and form a closed loop
+			// This test verifies basic connection logic
+			expect(rings.length).toBeGreaterThanOrEqual(0)
+		})
+
+		it("creates separate rings for disconnected ways", () => {
+			const way1: OsmWay = { id: 1, refs: [1, 2, 1] } // closed ring
+			const way2: OsmWay = { id: 2, refs: [3, 4, 3] } // separate closed ring
+
+			const rings = connectWaysToRings([way1, way2])
+			expect(rings).toHaveLength(2)
+		})
+
+		it("only includes closed rings", () => {
+			const way1: OsmWay = { id: 1, refs: [1, 2, 3] } // not closed
+			const way2: OsmWay = { id: 2, refs: [4, 5, 4] } // closed
+
+			const rings = connectWaysToRings([way1, way2])
+			// Only the closed ring should be included
+			expect(rings.length).toBeGreaterThanOrEqual(1)
+		})
+	})
+
+	describe("buildRelationRings", () => {
+		it("builds simple multipolygon with outer ring only", () => {
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { type: "multipolygon" },
+				members: [{ type: "way", ref: 1, role: "outer" }],
+			}
+
+			const way1: OsmWay = {
+				id: 1,
+				refs: [1, 2, 3, 4, 1],
+			}
+
+			const getWay = (id: number) => (id === 1 ? way1 : null)
+			const getNodeCoordinates = (id: number) => {
+				const coords: Record<number, [number, number]> = {
+					1: [0.0, 0.0],
+					2: [1.0, 0.0],
+					3: [1.0, 1.0],
+					4: [0.0, 1.0],
+				}
+				return coords[id]
+			}
+
+			const rings = buildRelationRings(relation, getWay, getNodeCoordinates)
+			expect(rings).toHaveLength(1)
+			expect(rings[0]).toHaveLength(1) // one outer ring
+			expect(rings[0]?.[0]).toHaveLength(5) // closed ring with 5 points
+		})
+
+		it("builds multipolygon with outer and inner rings (holes)", () => {
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { type: "multipolygon" },
+				members: [
+					{ type: "way", ref: 1, role: "outer" },
+					{ type: "way", ref: 2, role: "inner" },
+				],
+			}
+
+			const way1: OsmWay = {
+				id: 1,
+				refs: [1, 2, 3, 4, 1], // outer square
+			}
+			const way2: OsmWay = {
+				id: 2,
+				refs: [5, 6, 7, 5], // inner triangle
+			}
+
+			const getWay = (id: number) => {
+				if (id === 1) return way1
+				if (id === 2) return way2
+				return null
+			}
+			const getNodeCoordinates = (id: number) => {
+				const coords: Record<number, [number, number]> = {
+					1: [-1.0, -1.0],
+					2: [1.0, -1.0],
+					3: [1.0, 1.0],
+					4: [-1.0, 1.0],
+					5: [-0.5, 0.0],
+					6: [0.5, 0.0],
+					7: [0.0, 0.5],
+				}
+				return coords[id]
+			}
+
+			const rings = buildRelationRings(relation, getWay, getNodeCoordinates)
+			expect(rings).toHaveLength(1)
+			expect(rings[0]).toHaveLength(2) // outer + inner
+			expect(rings[0]?.[0]).toBeDefined() // outer ring
+			expect(rings[0]?.[1]).toBeDefined() // inner ring (hole)
+		})
+
+		it("builds multipolygon with multiple outer rings", () => {
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { type: "multipolygon" },
+				members: [
+					{ type: "way", ref: 1, role: "outer" },
+					{ type: "way", ref: 2, role: "outer" },
+				],
+			}
+
+			const way1: OsmWay = {
+				id: 1,
+				refs: [1, 2, 3, 1], // first polygon
+			}
+			const way2: OsmWay = {
+				id: 2,
+				refs: [4, 5, 6, 4], // second polygon
+			}
+
+			const getWay = (id: number) => {
+				if (id === 1) return way1
+				if (id === 2) return way2
+				return null
+			}
+			const getNodeCoordinates = (id: number) => {
+				const coords: Record<number, [number, number]> = {
+					1: [0.0, 0.0],
+					2: [1.0, 0.0],
+					3: [0.5, 1.0],
+					4: [2.0, 0.0],
+					5: [3.0, 0.0],
+					6: [2.5, 1.0],
+				}
+				return coords[id]
+			}
+
+			const rings = buildRelationRings(relation, getWay, getNodeCoordinates)
+			expect(rings).toHaveLength(2) // two separate polygons
+		})
+
+		it("handles relation similar to osmtogeojson test case", () => {
+			// Based on: https://github.com/placemark/osmtogeojson/blob/main/test/osm.test.js
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { type: "multipolygon" },
+				members: [
+					{ type: "way", ref: 2, role: "outer" },
+					{ type: "way", ref: 3, role: "inner" },
+				],
+			}
+
+			const way2: OsmWay = {
+				id: 2,
+				refs: [4, 5, 6, 7, 4], // outer square
+			}
+			const way3: OsmWay = {
+				id: 3,
+				refs: [8, 9, 10, 8], // inner triangle
+			}
+
+			const getWay = (id: number) => {
+				if (id === 2) return way2
+				if (id === 3) return way3
+				return null
+			}
+			const getNodeCoordinates = (id: number) => {
+				const coords: Record<number, [number, number]> = {
+					4: [-1.0, -1.0],
+					5: [-1.0, 1.0],
+					6: [1.0, 1.0],
+					7: [1.0, -1.0],
+					8: [-0.5, 0.0],
+					9: [0.5, 0.0],
+					10: [0.0, 0.5],
+				}
+				return coords[id]
+			}
+
+			const rings = buildRelationRings(relation, getWay, getNodeCoordinates)
+			expect(rings).toHaveLength(1)
+			expect(rings[0]).toHaveLength(2) // outer + inner
+			// Outer ring should have 5 points (closed square)
+			expect(rings[0]?.[0]).toHaveLength(5)
+			// Inner ring should have 4 points (closed triangle)
+			expect(rings[0]?.[1]).toHaveLength(4)
+		})
+	})
+})

package/test/utils.test.ts

@@ -0,0 +1,103 @@
+import { describe, expect, it } from "bun:test"
+import type {
+	OsmNode,
+	OsmRelation,
+	OsmRelationMember,
+	OsmWay,
+} from "../src/types"
+import {
+	entityPropertiesEqual,
+	getEntityType,
+	isMultipolygonRelation,
+	isNode,
+	isNodeEqual,
+	isRelation,
+	isRelationEqual,
+	isWay,
+	isWayEqual,
+} from "../src/utils"
+
+describe("utils", () => {
+	const node: OsmNode = {
+		id: 1,
+		lat: 10,
+		lon: 20,
+		tags: { name: "node" },
+	}
+	const way: OsmWay = {
+		id: 2,
+		refs: [1, 2, 3],
+		tags: { highway: "residential" },
+	}
+	const members: OsmRelationMember[] = [
+		{
+			type: "node",
+			ref: 1,
+		},
+	]
+	const relation: OsmRelation = {
+		id: 3,
+		members,
+		tags: { type: "multipolygon" },
+	}
+
+	it("narrows entity types", () => {
+		expect(isNode(node)).toBe(true)
+		expect(isWay(way)).toBe(true)
+		expect(isRelation(relation)).toBe(true)
+	})
+
+	it("compares entity equality", () => {
+		expect(isNodeEqual(node, { ...node })).toBe(true)
+		expect(isWayEqual(way, { ...way })).toBe(true)
+		expect(isRelationEqual(relation, { ...relation })).toBe(true)
+	})
+
+	it("detects property differences", () => {
+		expect(
+			entityPropertiesEqual(node, { ...node, tags: { name: "changed" } }),
+		).toBe(false)
+		expect(entityPropertiesEqual(way, { ...way, refs: [1, 2, 4] })).toBe(false)
+		expect(
+			entityPropertiesEqual(relation, {
+				...relation,
+				members: [{ type: "node", ref: 2 }],
+			}),
+		).toBe(false)
+	})
+
+	it("provides entity type", () => {
+		expect(getEntityType(node)).toBe("node")
+		expect(getEntityType(way)).toBe("way")
+		expect(getEntityType(relation)).toBe("relation")
+	})
+
+	describe("isMultipolygonRelation", () => {
+		it("identifies multipolygon relations", () => {
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { type: "multipolygon" },
+				members: [],
+			}
+			expect(isMultipolygonRelation(relation)).toBe(true)
+		})
+
+		it("rejects non-multipolygon relations", () => {
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { type: "route" },
+				members: [],
+			}
+			expect(isMultipolygonRelation(relation)).toBe(false)
+		})
+
+		it("rejects relations without type tag", () => {
+			const relation: OsmRelation = {
+				id: 1,
+				tags: { name: "test" },
+				members: [],
+			}
+			expect(isMultipolygonRelation(relation)).toBe(false)
+		})
+	})
+})

package/test/way-is-area.test.ts

@@ -0,0 +1,42 @@
+import { describe, expect, it } from "bun:test"
+import { wayIsArea } from "../src/way-is-area"
+
+describe("wayIsArea", () => {
+	it("returns false for open ways", () => {
+		const refs = [1, 2, 3]
+		expect(wayIsArea({ id: 0, refs, tags: { building: "yes" } })).toBe(false)
+	})
+
+	it("returns true for closed way without tags", () => {
+		const refs = [1, 2, 3, 1]
+		expect(wayIsArea({ id: 0, refs })).toBe(true)
+	})
+
+	it("honors explicit area override", () => {
+		const refs = [1, 2, 3, 1]
+		expect(
+			wayIsArea({ id: 0, refs, tags: { area: "no", building: "yes" } }),
+		).toBe(false)
+		expect(wayIsArea({ id: 0, refs, tags: { area: "yes" } })).toBe(true)
+	})
+
+	it("treats implied tags as areas", () => {
+		const refs = [1, 2, 3, 1]
+		expect(wayIsArea({ id: 0, refs, tags: { building: "yes" } })).toBe(true)
+	})
+
+	it("considers included values", () => {
+		const refs = [1, 2, 3, 1]
+		expect(wayIsArea({ id: 0, refs, tags: { highway: "rest_area" } })).toBe(
+			true,
+		)
+		expect(wayIsArea({ id: 0, refs, tags: { highway: "primary" } })).toBe(false)
+	})
+
+	it("rejects excluded values", () => {
+		const refs = [1, 2, 3, 1]
+		expect(wayIsArea({ id: 0, refs, tags: { natural: "coastline" } })).toBe(
+			false,
+		)
+	})
+})

package/tsconfig/test.json

@@ -2,6 +2,7 @@
 	"$schema": "https://json.schemastore.org/tsconfig",
 	"display": "@osmix/tsconfig/test",
 	"extends": "./base.json",
+	"exclude": ["node_modules", "dist"],
 	"compilerOptions": {
 		"noEmit": true,
 

package/tsconfig.build.json

@@ -0,0 +1,5 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig",
+	"extends": "./tsconfig.json",
+	"include": ["src"]
+}

package/dist/src/spherical-mercator.d.ts

@@ -1,15 +0,0 @@
-import { SphericalMercator } from "@mapbox/sphericalmercator";
-import type { GeoBbox2D, LonLat, Tile, XY } from "./types";
-/**
- * Extends the SphericalMercator class to provide tile-local pixel coordinate calculations and clamping.
- */
-export default class SphericalMercatorTile extends SphericalMercator {
-    tileSize: number;
-    tile?: Tile;
-    constructor(options: ConstructorParameters<typeof SphericalMercator>[0] & {
-        tile?: Tile;
-    });
-    llToTilePx(ll: LonLat, tile?: Tile): XY;
-    clampAndRoundPx(px: XY, bbox?: GeoBbox2D): XY;
-}
-//# sourceMappingURL=spherical-mercator.d.ts.map

package/dist/src/spherical-mercator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"spherical-mercator.d.ts","sourceRoot":"","sources":["../../src/spherical-mercator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAE1D;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,iBAAiB;IACnE,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,IAAI,CAAA;gBAEV,OAAO,EAAE,qBAAqB,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAAG;QAC7D,IAAI,CAAC,EAAE,IAAI,CAAA;KACX;IAOF,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE;IAUvC,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,EAAE;CAY7C"}

package/dist/src/spherical-mercator.js

@@ -1,35 +0,0 @@
-import { SphericalMercator } from "@mapbox/sphericalmercator";
-/**
- * Extends the SphericalMercator class to provide tile-local pixel coordinate calculations and clamping.
- */
-export default class SphericalMercatorTile extends SphericalMercator {
-    tileSize;
-    tile;
-    constructor(options) {
-        super(options);
-        this.tile = options?.tile;
-        this.tileSize = options?.size ?? 256;
-    }
-    llToTilePx(ll, tile) {
-        if (tile == null && this.tile == null)
-            throw Error("Tile must be set on construction or passed as an argument.");
-        const [tx, ty, tz] = (tile ?? this.tile);
-        const merc = this.px(ll, tz);
-        const x = merc[0] - tx * this.tileSize;
-        const y = merc[1] - ty * this.tileSize;
-        return [x, y];
-    }
-    clampAndRoundPx(px, bbox) {
-        const [minX, minY, maxX, maxY] = bbox ?? [
-            0,
-            0,
-            this.tileSize,
-            this.tileSize,
-        ];
-        return [
-            Math.max(minX, Math.min(maxX, Math.round(px[0]))),
-            Math.max(minY, Math.min(maxY, Math.round(px[1]))),
-        ];
-    }
-}
-//# sourceMappingURL=spherical-mercator.js.map

package/dist/src/spherical-mercator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"spherical-mercator.js","sourceRoot":"","sources":["../../src/spherical-mercator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAG7D;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,iBAAiB;IACnE,QAAQ,CAAQ;IAChB,IAAI,CAAO;IACX,YACC,OAEC;QAED,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,CAAA;QACzB,IAAI,CAAC,QAAQ,GAAG,OAAO,EAAE,IAAI,IAAI,GAAG,CAAA;IACrC,CAAC;IAED,UAAU,CAAC,EAAU,EAAE,IAAW;QACjC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI;YACpC,MAAM,KAAK,CAAC,4DAA4D,CAAC,CAAA;QAC1E,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAE,CAAA;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;QAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;QACtC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;QACtC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACd,CAAC;IAED,eAAe,CAAC,EAAM,EAAE,IAAgB;QACvC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,IAAI;YACxC,CAAC;YACD,CAAC;YACD,IAAI,CAAC,QAAQ;YACb,IAAI,CAAC,QAAQ;SACb,CAAA;QACD,OAAO;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACjD,CAAA;IACF,CAAC;CACD"}

package/dist/src/spherical-mercator.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=spherical-mercator.test.d.ts.map

package/dist/src/spherical-mercator.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"spherical-mercator.test.d.ts","sourceRoot":"","sources":["../../src/spherical-mercator.test.ts"],"names":[],"mappings":""}

package/dist/src/spherical-mercator.test.js

@@ -1,25 +0,0 @@
-import { describe, expect, it } from "vitest";
-import SphericalMercatorTile from "./spherical-mercator";
-function lonLatForPixel(merc, tileIndex, tileSize, px, py) {
-    const [x, y, z] = tileIndex;
-    return merc.ll([x * tileSize + px, y * tileSize + py], z);
-}
-describe("SphericalMercatorTile", () => {
-    it("projects lon/lat to tile-local pixels", () => {
-        const tile = [300, 300, 10];
-        const [tx, ty, tz] = tile;
-        const tileSize = 256;
-        const merc = new SphericalMercatorTile({ size: tileSize, tile });
-        const insideLonLat = lonLatForPixel(merc, tile, tileSize, 32, 16);
-        expect(merc.llToTilePx(insideLonLat)).toEqual([32, 16]);
-        const outsideTopLeft = merc.ll([tx * tileSize - 10, ty * tileSize - 10], tz);
-        expect(outsideTopLeft).toEqual([-74.54498291015625, 59.54128017205441]);
-        expect(merc.llToTilePx(outsideTopLeft)).toEqual([-10, -10]);
-        const outsideBottomRight = merc.ll([(tx + 1) * tileSize + 10, (ty + 1) * tileSize + 10], tz);
-        expect(merc.llToTilePx(outsideBottomRight, tile)).toEqual([
-            tileSize + 10,
-            tileSize + 10,
-        ]);
-    });
-});
-//# sourceMappingURL=spherical-mercator.test.js.map

package/dist/src/spherical-mercator.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"spherical-mercator.test.js","sourceRoot":"","sources":["../../src/spherical-mercator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,qBAAqB,MAAM,sBAAsB,CAAA;AAGxD,SAAS,cAAc,CACtB,IAA2B,EAC3B,SAAe,EACf,QAAgB,EAChB,EAAU,EACV,EAAU;IAEV,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAA;IAC3B,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,EAAE,EAAE,CAAC,GAAG,QAAQ,GAAG,EAAE,CAAC,EAAE,CAAC,CAAqB,CAAA;AAC9E,CAAC;AAED,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAChD,MAAM,IAAI,GAAS,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;QACjC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAA;QACzB,MAAM,QAAQ,GAAG,GAAG,CAAA;QACpB,MAAM,IAAI,GAAG,IAAI,qBAAqB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;QAEhE,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QACjE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QAEvD,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,CAC7B,CAAC,EAAE,GAAG,QAAQ,GAAG,EAAE,EAAE,EAAE,GAAG,QAAQ,GAAG,EAAE,CAAC,EACxC,EAAE,CACkB,CAAA;QACrB,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAA;QACvE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QAE3D,MAAM,kBAAkB,GAAG,IAAI,CAAC,EAAE,CACjC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,QAAQ,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,QAAQ,GAAG,EAAE,CAAC,EACpD,EAAE,CACkB,CAAA;QACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;YACzD,QAAQ,GAAG,EAAE;YACb,QAAQ,GAAG,EAAE;SACb,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/src/spherical-mercator.test.ts

@@ -1,42 +0,0 @@
-import { describe, expect, it } from "vitest"
-import SphericalMercatorTile from "./spherical-mercator"
-import type { Tile } from "./types"
-
-function lonLatForPixel(
-	merc: SphericalMercatorTile,
-	tileIndex: Tile,
-	tileSize: number,
-	px: number,
-	py: number,
-): [number, number] {
-	const [x, y, z] = tileIndex
-	return merc.ll([x * tileSize + px, y * tileSize + py], z) as [number, number]
-}
-
-describe("SphericalMercatorTile", () => {
-	it("projects lon/lat to tile-local pixels", () => {
-		const tile: Tile = [300, 300, 10]
-		const [tx, ty, tz] = tile
-		const tileSize = 256
-		const merc = new SphericalMercatorTile({ size: tileSize, tile })
-
-		const insideLonLat = lonLatForPixel(merc, tile, tileSize, 32, 16)
-		expect(merc.llToTilePx(insideLonLat)).toEqual([32, 16])
-
-		const outsideTopLeft = merc.ll(
-			[tx * tileSize - 10, ty * tileSize - 10],
-			tz,
-		) as [number, number]
-		expect(outsideTopLeft).toEqual([-74.54498291015625, 59.54128017205441])
-		expect(merc.llToTilePx(outsideTopLeft)).toEqual([-10, -10])
-
-		const outsideBottomRight = merc.ll(
-			[(tx + 1) * tileSize + 10, (ty + 1) * tileSize + 10],
-			tz,
-		) as [number, number]
-		expect(merc.llToTilePx(outsideBottomRight, tile)).toEqual([
-			tileSize + 10,
-			tileSize + 10,
-		])
-	})
-})

package/src/spherical-mercator.ts

@@ -1,42 +0,0 @@
-import { SphericalMercator } from "@mapbox/sphericalmercator"
-import type { GeoBbox2D, LonLat, Tile, XY } from "./types"
-
-/**
- * Extends the SphericalMercator class to provide tile-local pixel coordinate calculations and clamping.
- */
-export default class SphericalMercatorTile extends SphericalMercator {
-	tileSize: number
-	tile?: Tile
-	constructor(
-		options: ConstructorParameters<typeof SphericalMercator>[0] & {
-			tile?: Tile
-		},
-	) {
-		super(options)
-		this.tile = options?.tile
-		this.tileSize = options?.size ?? 256
-	}
-
-	llToTilePx(ll: LonLat, tile?: Tile): XY {
-		if (tile == null && this.tile == null)
-			throw Error("Tile must be set on construction or passed as an argument.")
-		const [tx, ty, tz] = (tile ?? this.tile)!
-		const merc = this.px(ll, tz)
-		const x = merc[0] - tx * this.tileSize
-		const y = merc[1] - ty * this.tileSize
-		return [x, y]
-	}
-
-	clampAndRoundPx(px: XY, bbox?: GeoBbox2D): XY {
-		const [minX, minY, maxX, maxY] = bbox ?? [
-			0,
-			0,
-			this.tileSize,
-			this.tileSize,
-		]
-		return [
-			Math.max(minX, Math.min(maxX, Math.round(px[0]))),
-			Math.max(minY, Math.min(maxY, Math.round(px[1]))),
-		]
-	}
-}