@osmix/core 0.0.1 → 0.0.6

package/dist/osmix/src/utils.js

@@ -0,0 +1,108 @@
+/**
+ * Utility functions for worker communication and data streaming.
+ *
+ * Provides helpers for collecting transferable buffers, feature detection,
+ * and converting Osm indexes to entity streams.
+ *
+ * @module
+ */
+import { transfer as comlinkTransfer } from "comlink";
+/**
+ * Recursively collect all transferable values from a nested object.
+ * Searches for ArrayBuffers, TypedArray buffers, and ReadableStreams.
+ * Used to prepare data for zero-copy transfer to or from workers.
+ */
+export function collectTransferables(value) {
+    const transferables = [];
+    if (value instanceof ArrayBuffer)
+        transferables.push(value);
+    else if (value instanceof ReadableStream)
+        transferables.push(value);
+    else if (ArrayBuffer.isView(value))
+        transferables.push(value.buffer);
+    else if (Array.isArray(value)) {
+        for (const item of value) {
+            transferables.push(...collectTransferables(item));
+        }
+    }
+    else if (value && typeof value === "object") {
+        for (const item of Object.values(value)) {
+            transferables.push(...collectTransferables(item));
+        }
+    }
+    return transferables;
+}
+/**
+ * Wrap data with Comlink.transfer, automatically collecting transferable buffers.
+ * Enables zero-copy message passing for typed arrays and streams.
+ */
+export function transfer(data) {
+    return comlinkTransfer(data, collectTransferables(data));
+}
+/**
+ * Feature-detect whether the browser supports transferable ReadableStreams.
+ * Attempts to post a stream through a MessageChannel; throws DataCloneError if unsupported.
+ */
+export function supportsReadableStreamTransfer() {
+    // Require the basics first
+    if (typeof ReadableStream === "undefined" ||
+        typeof MessageChannel === "undefined")
+        return false;
+    const { port1 } = new MessageChannel();
+    try {
+        const rs = new ReadableStream(); // empty is fine for feature test
+        // If transferable streams are unsupported, this line throws a DataCloneError
+        port1.postMessage(rs, [rs]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        port1.close();
+    }
+}
+/**
+ * Create a generator that yields all entities in the `Osm` index, sorted by type and ID.
+ * Order: nodes first, then ways, then relations, each sorted by ID.
+ */
+function* getAllEntitiesSorted(osm) {
+    for (const node of osm.nodes.sorted()) {
+        yield node;
+    }
+    for (const way of osm.ways.sorted()) {
+        yield way;
+    }
+    for (const relation of osm.relations.sorted()) {
+        yield relation;
+    }
+}
+/**
+ * Convert the `Osm` index to a `ReadableStream` of header and entity objects.
+ * Header is emitted first, followed by all entities in sorted order.
+ * Stream can be piped through transform streams for further processing.
+ */
+export function createReadableEntityStreamFromOsm(osm) {
+    let headerEnqueued = false;
+    const entityGenerator = getAllEntitiesSorted(osm);
+    return new ReadableStream({
+        pull: async (controller) => {
+            if (!headerEnqueued) {
+                controller.enqueue({
+                    ...osm.header,
+                    writingprogram: "@osmix/core",
+                    osmosis_replication_timestamp: Date.now(),
+                });
+                headerEnqueued = true;
+            }
+            const block = entityGenerator.next();
+            if (block.done) {
+                controller.close();
+            }
+            else {
+                controller.enqueue(block.value);
+            }
+        },
+    });
+}
+//# sourceMappingURL=utils.js.map

package/dist/osmix/src/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../osmix/src/utils.ts"],"names":[],"mappings":"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"}

package/dist/osmix/test/extract.bench.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=extract.bench.d.ts.map

package/dist/osmix/test/extract.bench.d.ts.map

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

package/dist/osmix/test/extract.bench.js

@@ -0,0 +1,26 @@
+import { beforeAll, describe } from "bun:test";
+import { getFixtureFile } from "@osmix/shared/test/fixtures";
+// @ts-expect-error - bench is available at runtime but not in types
+const { bench } = globalThis;
+import { createExtract } from "../src/extract";
+import { fromPbf } from "../src/pbf";
+const MONACO_BBOX = [7.4053929, 43.7232244, 7.4447259, 43.7543687];
+// const SEATTLE_BBOX: GeoBbox2D = [-122.33, 47.48, -122.29, 47.52]
+const BBOX = MONACO_BBOX;
+const PBF = "monaco.pbf";
+let buffer;
+beforeAll(async () => {
+    buffer = await getFixtureFile(PBF);
+});
+describe("simple extract benchmark", () => {
+    bench("two-step parse then extract", async () => {
+        const data = buffer.slice(0);
+        const full = await fromPbf(data);
+        createExtract(full, BBOX, "simple");
+    });
+    bench("streaming extract during parse", async () => {
+        const data = buffer.slice(0);
+        await fromPbf(data, { extractBbox: BBOX });
+    });
+});
+//# sourceMappingURL=extract.bench.js.map

package/dist/osmix/test/extract.bench.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extract.bench.js","sourceRoot":"","sources":["../../../../osmix/test/extract.bench.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAG5D,oEAAoE;AACpE,MAAM,EAAE,KAAK,EAAE,GAAG,UAAuD,CAAA;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,MAAM,WAAW,GAAc,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;AAC7E,mEAAmE;AAEnE,MAAM,IAAI,GAAG,WAAW,CAAA;AACxB,MAAM,GAAG,GAAG,YAAY,CAAA;AAExB,IAAI,MAAmC,CAAA;AAEvC,SAAS,CAAC,KAAK,IAAI,EAAE;IACpB,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,CAAA;AACnC,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACzC,KAAK,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC5B,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;QAChC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,KAAK,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC5B,MAAM,OAAO,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/osmix/test/extract.test.d.ts

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

package/dist/osmix/test/extract.test.d.ts.map

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

package/dist/osmix/test/extract.test.js

@@ -0,0 +1,392 @@
+import { describe, expect, test } from "bun:test";
+import { Osm } from "@osmix/core";
+import { getFixtureFileReadStream } from "@osmix/shared/test/fixtures";
+import { createExtract } from "../src/extract";
+import { fromPbf, toPbfBuffer, toPbfStream } from "../src/pbf";
+const TEST_BBOX = [-0.1, -0.1, 1, 1];
+const SEATTLE_BBOX = [-122.463226, 47.469878, -122.180328, 47.82883];
+function buildSourceOsm() {
+    const osm = new Osm({ id: "source" });
+    osm.nodes.addNode({
+        id: 1,
+        lat: 0,
+        lon: 0,
+        tags: {
+            name: "inside-a",
+        },
+    });
+    osm.nodes.addNode({
+        id: 2,
+        lat: 0,
+        lon: 2,
+        tags: {
+            name: "outside-a",
+        },
+    });
+    osm.nodes.addNode({
+        id: 3,
+        lat: 0.5,
+        lon: 0.5,
+    });
+    osm.nodes.addNode({
+        id: 4,
+        lat: 0.5,
+        lon: 1.5,
+    });
+    osm.ways.addWay({
+        id: 10,
+        refs: [1, 2],
+        tags: {
+            highway: "residential",
+        },
+    });
+    osm.ways.addWay({
+        id: 11,
+        refs: [3, 4],
+        tags: {
+            highway: "service",
+        },
+    });
+    osm.relations.addRelation({
+        id: 20,
+        members: [
+            {
+                type: "way",
+                ref: 10,
+                role: "outer",
+            },
+        ],
+        tags: {
+            type: "multipolygon",
+        },
+    });
+    osm.buildIndexes();
+    osm.buildSpatialIndexes();
+    return osm;
+}
+describe("extract", () => {
+    test("extract a BBOX while reading a PBF", async () => {
+        const source = buildSourceOsm();
+        const transform = new TransformStream();
+        const extractPromise = fromPbf(transform.readable, {
+            extractBbox: TEST_BBOX,
+        });
+        await toPbfStream(source).pipeTo(transform.writable);
+        const extract = await extractPromise;
+        expect(extract.nodes.size).toBe(2);
+        expect(extract.nodes.ids.has(1)).toBe(true);
+        expect(extract.nodes.ids.has(3)).toBe(true);
+        expect(extract.nodes.ids.has(2)).toBe(false);
+        expect(extract.nodes.ids.has(4)).toBe(false);
+        const truncatedWay = extract.ways.getById(10);
+        expect(truncatedWay).toBeDefined();
+        expect(truncatedWay?.refs).toEqual([1]);
+        expect(extract.ways.ids.has(11)).toBe(true);
+        expect(extract.relations.ids.has(20)).toBe(true);
+    });
+    test("extract a BBOX after reading a PBF", async () => {
+        const source = buildSourceOsm();
+        const buffer = await toPbfBuffer(source);
+        const streaming = await fromPbf(new Uint8Array(buffer.slice(0)), {
+            extractBbox: TEST_BBOX,
+        });
+        const twoStepOsmix = await fromPbf(new Uint8Array(buffer.slice(0)));
+        const twoStep = createExtract(twoStepOsmix, TEST_BBOX, "simple");
+        expect(streaming.nodes.size).toBe(twoStep.nodes.size);
+        expect(streaming.ways.size).toBe(twoStep.ways.size);
+        expect(streaming.relations.size).toBe(twoStep.relations.size);
+        expect(Array.from(streaming.nodes.ids.sorted)).toEqual(Array.from(twoStep.nodes.ids.sorted));
+        expect(Array.from(streaming.ways.ids.sorted)).toEqual(Array.from(twoStep.ways.ids.sorted));
+        expect(Array.from(streaming.relations.ids.sorted)).toEqual(Array.from(twoStep.relations.ids.sorted));
+        for (const nodeId of streaming.nodes.ids.sorted) {
+            const streamingNode = streaming.nodes.getById(nodeId);
+            const twoStepNode = twoStep.nodes.getById(nodeId);
+            expect(streamingNode).toEqual(twoStepNode);
+        }
+        for (const wayId of streaming.ways.ids.sorted) {
+            const streamingWay = streaming.ways.getById(wayId);
+            const twoStepWay = twoStep.ways.getById(wayId);
+            expect(streamingWay).toEqual(twoStepWay);
+        }
+        for (const relationId of streaming.relations.ids.sorted) {
+            const streamingRelation = streaming.relations.getById(relationId);
+            const twoStepRelation = twoStep.relations.getById(relationId);
+            expect(streamingRelation).toEqual(twoStepRelation);
+        }
+    });
+    test("extract with simple strategy filters way refs", () => {
+        const source = buildSourceOsm();
+        const extracted = createExtract(source, TEST_BBOX, "simple");
+        // Should only have nodes inside bbox
+        expect(extracted.nodes.size).toBe(2);
+        expect(extracted.nodes.ids.has(1)).toBe(true); // inside
+        expect(extracted.nodes.ids.has(3)).toBe(true); // inside
+        expect(extracted.nodes.ids.has(2)).toBe(false); // outside
+        expect(extracted.nodes.ids.has(4)).toBe(false); // outside
+        // Way 10 has nodes [1, 2] - node 1 is inside, node 2 is outside
+        // With simple strategy, should only include node 1
+        const way10 = extracted.ways.getById(10);
+        expect(way10).toBeDefined();
+        expect(way10?.refs).toEqual([1]);
+        // Way 11 has nodes [3, 4] - node 3 is inside, node 4 is outside
+        // With simple strategy, should only include node 3
+        const way11 = extracted.ways.getById(11);
+        expect(way11).toBeDefined();
+        expect(way11?.refs).toEqual([3]);
+        // Relation 20 has way 10 as member
+        // With simple strategy, relation should be included but way 10 is already filtered
+        expect(extracted.relations.ids.has(20)).toBe(true);
+        const relation20 = extracted.relations.getById(20);
+        expect(relation20).toBeDefined();
+        expect(relation20?.members.length).toBe(1);
+        expect(relation20?.members[0]).toEqual({
+            type: "way",
+            ref: 10,
+            role: "outer",
+        });
+    });
+    test("extract with complete_ways strategy includes all way nodes", () => {
+        const source = buildSourceOsm();
+        const extracted = createExtract(source, TEST_BBOX, "complete_ways");
+        // Should have nodes inside bbox PLUS all nodes from ways that cross bbox
+        // Nodes 1 and 3 are inside bbox
+        // Way 10 has nodes [1, 2] - node 2 should be included because way 10 crosses bbox
+        // Way 11 has nodes [3, 4] - node 4 should be included because way 11 crosses bbox
+        expect(extracted.nodes.size).toBe(4);
+        expect(extracted.nodes.ids.has(1)).toBe(true); // inside
+        expect(extracted.nodes.ids.has(2)).toBe(true); // outside but part of way 10
+        expect(extracted.nodes.ids.has(3)).toBe(true); // inside
+        expect(extracted.nodes.ids.has(4)).toBe(true); // outside but part of way 11
+        // Way 10 should include all nodes
+        const way10 = extracted.ways.getById(10);
+        expect(way10).toBeDefined();
+        expect(way10?.refs).toEqual([1, 2]);
+        // Way 11 should include all nodes
+        const way11 = extracted.ways.getById(11);
+        expect(way11).toBeDefined();
+        expect(way11?.refs).toEqual([3, 4]);
+        // Relation 20 should include all members (way 10)
+        expect(extracted.relations.ids.has(20)).toBe(true);
+        const relation20 = extracted.relations.getById(20);
+        expect(relation20).toBeDefined();
+        expect(relation20?.members.length).toBe(1);
+        expect(relation20?.members[0]).toEqual({
+            type: "way",
+            ref: 10,
+            role: "outer",
+        });
+    });
+    test("extract strategies differ for ways crossing bbox", () => {
+        const source = buildSourceOsm();
+        const simple = createExtract(source, TEST_BBOX, "simple");
+        const complete = createExtract(source, TEST_BBOX, "complete_ways");
+        // Simple strategy should have fewer nodes (only those inside bbox)
+        expect(simple.nodes.size < complete.nodes.size).toBe(true);
+        expect(simple.nodes.size).toBe(2);
+        expect(complete.nodes.size).toBe(4);
+        // Both should have the same ways
+        expect(simple.ways.size).toBe(complete.ways.size);
+        expect(simple.ways.size).toBe(2);
+        // But way refs should differ
+        const simpleWay10 = simple.ways.getById(10);
+        const completeWay10 = complete.ways.getById(10);
+        expect(simpleWay10).toBeDefined();
+        expect(completeWay10).toBeDefined();
+        expect(simpleWay10.refs.length < completeWay10.refs.length).toBe(true);
+        expect(simpleWay10.refs).toEqual([1]);
+        expect(completeWay10.refs).toEqual([1, 2]);
+    });
+    test("smart strategy keeps relation members reference complete", () => {
+        const osm = new Osm({ id: "test" });
+        // Create nodes: some inside, some outside bbox
+        osm.nodes.addNode({ id: 1, lat: 0, lon: 0 }); // inside
+        osm.nodes.addNode({ id: 2, lat: 0, lon: 2 }); // outside
+        osm.nodes.addNode({ id: 3, lat: 0.5, lon: 0.5 }); // inside
+        osm.nodes.addNode({ id: 4, lat: 0.5, lon: 1.5 }); // outside
+        osm.nodes.addNode({ id: 5, lat: 0.5, lon: 2.5 }); // outside, only used by way 20
+        osm.nodes.addNode({ id: 6, lat: 0.6, lon: 2.6 }); // outside, only used by way 20
+        // Create way 10 with nodes inside and outside
+        osm.ways.addWay({ id: 10, refs: [1, 2] });
+        // Create way 20 completely outside bbox (no shared nodes with inside ways)
+        osm.ways.addWay({ id: 20, refs: [5, 6] });
+        // Create relation with way 10 (crosses bbox) and way 20 (outside bbox)
+        osm.relations.addRelation({
+            id: 30,
+            members: [
+                { type: "way", ref: 10, role: "outer" },
+                { type: "way", ref: 20, role: "inner" },
+            ],
+            tags: { type: "multipolygon" },
+        });
+        osm.buildIndexes();
+        osm.buildSpatialIndexes();
+        const simple = createExtract(osm, TEST_BBOX, "simple");
+        const complete = createExtract(osm, TEST_BBOX, "complete_ways");
+        const smart = createExtract(osm, TEST_BBOX, "smart");
+        // Simple strategy: relation should only include way 10 (way 20 is outside)
+        const simpleRelation = simple.relations.getById(30);
+        expect(simpleRelation).toBeDefined();
+        expect(simpleRelation.members.length).toBe(1);
+        expect(simpleRelation.members[0]?.ref).toBe(10);
+        // Complete strategy preserves way integrity but keeps relation members inside bbox
+        const completeRelation = complete.relations.getById(30);
+        expect(completeRelation).toBeDefined();
+        expect(completeRelation.members.length).toBe(1);
+        expect(completeRelation.members[0]?.ref).toBe(10);
+        // Smart strategy includes all relation members (reference complete)
+        const smartRelation = smart.relations.getById(30);
+        expect(smartRelation).toBeDefined();
+        expect(smartRelation.members.length).toBe(2);
+        expect(smartRelation.members.some((m) => m.ref === 10)).toBe(true);
+        expect(smartRelation.members.some((m) => m.ref === 20)).toBe(true);
+        // Only smart strategy should include outside way 20 and its nodes
+        expect(simple.ways.ids.has(20)).toBe(false);
+        expect(complete.ways.ids.has(20)).toBe(false);
+        expect(smart.ways.ids.has(20)).toBe(true);
+        expect(smart.nodes.ids.has(5)).toBe(true);
+        expect(smart.nodes.ids.has(6)).toBe(true);
+    });
+    test("smart strategy retains node members of relations", () => {
+        const osm = new Osm({ id: "test" });
+        osm.nodes.addNode({ id: 1, lat: 0, lon: 0 }); // inside
+        osm.nodes.addNode({ id: 2, lat: 0, lon: 2 }); // outside
+        osm.nodes.addNode({ id: 3, lat: 0.5, lon: 0.5 }); // inside
+        osm.ways.addWay({ id: 10, refs: [1, 3] });
+        // Create relation with node members (some inside, some outside)
+        osm.relations.addRelation({
+            id: 20,
+            members: [
+                { type: "node", ref: 1, role: "label" },
+                { type: "node", ref: 2, role: "label" },
+                { type: "way", ref: 10, role: "outer" },
+            ],
+            tags: { type: "multipolygon" },
+        });
+        osm.buildIndexes();
+        osm.buildSpatialIndexes();
+        const simple = createExtract(osm, TEST_BBOX, "simple");
+        const complete = createExtract(osm, TEST_BBOX, "complete_ways");
+        const smart = createExtract(osm, TEST_BBOX, "smart");
+        // Simple strategy: relation should only include node 1 and way 10
+        const simpleRelation = simple.relations.getById(20);
+        expect(simpleRelation).toBeDefined();
+        expect(simpleRelation.members.length).toBe(2);
+        expect(simpleRelation.members.some((m) => m.type === "node" && m.ref === 1)).toBe(true);
+        expect(simpleRelation.members.some((m) => m.type === "way" && m.ref === 10)).toBe(true);
+        // Complete strategy behaves like simple for relation members (no outside nodes)
+        const completeRelation = complete.relations.getById(20);
+        expect(completeRelation).toBeDefined();
+        expect(completeRelation.members.length).toBe(2);
+        expect(completeRelation.members.some((m) => m.type === "node" && m.ref === 1)).toBe(true);
+        expect(completeRelation.members.some((m) => m.type === "way" && m.ref === 10)).toBe(true);
+        // Smart strategy keeps relations reference complete (includes node 2)
+        const smartRelation = smart.relations.getById(20);
+        expect(smartRelation).toBeDefined();
+        expect(smartRelation.members.length).toBe(3);
+        expect(smartRelation.members.some((m) => m.type === "node" && m.ref === 1)).toBe(true);
+        expect(smartRelation.members.some((m) => m.type === "node" && m.ref === 2)).toBe(true);
+        expect(smartRelation.members.some((m) => m.type === "way" && m.ref === 10)).toBe(true);
+        // Only smart strategy should include node 2
+        expect(smart.nodes.ids.has(2)).toBe(true);
+        expect(complete.nodes.ids.has(2)).toBe(false);
+        expect(simple.nodes.ids.has(2)).toBe(false);
+    });
+    test("smart strategy resolves multipolygon nested relation members", () => {
+        const osm = new Osm({ id: "nested" });
+        osm.nodes.addNode({ id: 1, lat: 0, lon: 0 }); // inside
+        osm.nodes.addNode({ id: 2, lat: 0, lon: 2 }); // outside
+        osm.nodes.addNode({ id: 3, lat: 0.2, lon: 2.2 }); // outside node member
+        osm.nodes.addNode({ id: 4, lat: 0.3, lon: 2.3 }); // outside nested node member
+        osm.ways.addWay({ id: 10, refs: [1, 2] });
+        osm.relations.addRelation({
+            id: 200,
+            members: [
+                { type: "way", ref: 10, role: "outer" },
+                { type: "node", ref: 3, role: "label" },
+            ],
+            tags: { type: "multipolygon" },
+        });
+        osm.relations.addRelation({
+            id: 300,
+            members: [
+                { type: "relation", ref: 200, role: "part" },
+                { type: "node", ref: 4, role: "label" },
+            ],
+            tags: { type: "site" },
+        });
+        osm.buildIndexes();
+        osm.buildSpatialIndexes();
+        const simple = createExtract(osm, TEST_BBOX, "simple");
+        const complete = createExtract(osm, TEST_BBOX, "complete_ways");
+        const smart = createExtract(osm, TEST_BBOX, "smart");
+        const simpleRelation200 = simple.relations.getById(200);
+        const completeRelation200 = complete.relations.getById(200);
+        const smartRelation200 = smart.relations.getById(200);
+        expect(simpleRelation200).toBeDefined();
+        expect(completeRelation200).toBeDefined();
+        expect(smartRelation200).toBeDefined();
+        expect(simpleRelation200.members.some((m) => m.type === "node" && m.ref === 3)).toBe(false);
+        expect(completeRelation200.members.some((m) => m.type === "node" && m.ref === 3)).toBe(false);
+        expect(smartRelation200.members.some((m) => m.type === "node" && m.ref === 3)).toBe(true);
+        const simpleRelation300 = simple.relations.getById(300);
+        const completeRelation300 = complete.relations.getById(300);
+        const smartRelation300 = smart.relations.getById(300);
+        expect(simpleRelation300).toBeDefined();
+        expect(completeRelation300).toBeDefined();
+        expect(smartRelation300).toBeDefined();
+        expect(simpleRelation300.members.some((m) => m.type === "node" && m.ref === 4)).toBe(false);
+        expect(completeRelation300.members.some((m) => m.type === "node" && m.ref === 4)).toBe(false);
+        expect(simpleRelation300.members.some((m) => m.type === "relation" && m.ref === 200)).toBe(true);
+        expect(completeRelation300.members.some((m) => m.type === "relation" && m.ref === 200)).toBe(true);
+        expect(smartRelation300.members.some((m) => m.type === "relation" && m.ref === 200)).toBe(true);
+        expect(smartRelation300.members.some((m) => m.type === "node" && m.ref === 4)).toBe(false);
+        expect(smart.nodes.ids.has(2)).toBe(true);
+        expect(smart.nodes.ids.has(3)).toBe(true);
+        expect(smart.nodes.ids.has(4)).toBe(false);
+        expect(simple.nodes.ids.has(3)).toBe(false);
+        expect(simple.nodes.ids.has(4)).toBe(false);
+        expect(complete.nodes.ids.has(3)).toBe(false);
+        expect(complete.nodes.ids.has(4)).toBe(false);
+    });
+    test("smart strategy does not extend non-multipolygon relations", () => {
+        const osm = new Osm({ id: "logic" });
+        osm.nodes.addNode({ id: 1, lat: 0, lon: 0 }); // inside
+        osm.nodes.addNode({ id: 2, lat: 0, lon: 2 }); // outside
+        osm.relations.addRelation({
+            id: 400,
+            members: [
+                { type: "node", ref: 1, role: "stop" },
+                { type: "node", ref: 2, role: "stop" },
+            ],
+            tags: { type: "route" },
+        });
+        osm.buildIndexes();
+        osm.buildSpatialIndexes();
+        const simple = createExtract(osm, TEST_BBOX, "simple");
+        const complete = createExtract(osm, TEST_BBOX, "complete_ways");
+        const smart = createExtract(osm, TEST_BBOX, "smart");
+        const smartRelation = smart.relations.getById(400);
+        const simpleRelation = simple.relations.getById(400);
+        const completeRelation = complete.relations.getById(400);
+        expect(smartRelation).toBeDefined();
+        expect(simpleRelation).toBeDefined();
+        expect(completeRelation).toBeDefined();
+        expect(smartRelation.members.some((m) => m.type === "node" && m.ref === 2)).toBe(false);
+        expect(simpleRelation.members.some((m) => m.type === "node" && m.ref === 2)).toBe(false);
+        expect(completeRelation.members.some((m) => m.type === "node" && m.ref === 2)).toBe(false);
+        expect(smart.nodes.ids.has(2)).toBe(false);
+        expect(simple.nodes.ids.has(2)).toBe(false);
+        expect(complete.nodes.ids.has(2)).toBe(false);
+    });
+    test.skip("extract from a large PBF", async () => {
+        const seattle = await fromPbf(getFixtureFileReadStream("usa.pbf"), {
+            extractBbox: SEATTLE_BBOX,
+        });
+        expect({
+            nodes: seattle.nodes.size,
+            ways: seattle.ways.size,
+            relations: seattle.relations.size,
+        }).toEqual({ nodes: 802_541, ways: 241_248, relations: 3_622 });
+    });
+});
+//# sourceMappingURL=extract.test.js.map

package/dist/osmix/test/extract.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extract.test.js","sourceRoot":"","sources":["../../../../osmix/test/extract.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@osmix/core",
 	"type": "module",
-	"version": "0.0.1",
+	"version": "0.0.6",
 	"description": "An OSM PBF reader, writer, and merge tool written in TypeScript",
 	"main": "./src/index.ts",
 	"publishConfig": {
@@ -33,21 +33,21 @@
 	"sideEffects": false,
 	"scripts": {
 		"build": "tsc",
-		"bench": "vitest bench",
-		"test": "vitest",
-		"typecheck": "tsc --noEmit"
+		"bench": "bun test --bench",
+		"prepublishOnly": "tsc",
+		"test": "bun test",
+		"typecheck": "tsgo --noEmit"
 	},
 	"devDependencies": {
-		"@types/geojson": "catalog:",
-		"typescript": "catalog:",
-		"vitest": "catalog:"
+		"@osmix/pbf": "workspace:*",
+		"@types/bun": "catalog:",
+		"typescript": "catalog:"
 	},
 	"dependencies": {
-		"@osmix/json": "workspace:*",
-		"@osmix/pbf": "workspace:*",
 		"@osmix/shared": "workspace:*",
 		"flatbush": "^4.4.1",
-		"kdbush": "mourner/kdbush#16416cd",
-		"sweepline-intersections": "^1.5.0"
+		"geoflatbush": "^2.0.0",
+		"geokdbush": "^2.0.1",
+		"kdbush": "mourner/kdbush#16416cd"
 	}
 }