@osmix/core 0.1.10 → 0.3.0

package/dist/osm.d.ts

@@ -1,28 +1,81 @@
 import type { OsmPbfHeaderBlock } from "@osmix/pbf";
-import type { GeoBbox2D } from "@osmix/shared/types";
+import type { GeoBbox2D } from "@osmix/types";
 import { Nodes, type NodesTransferables } from "./nodes.ts";
 import { Relations, type RelationsTransferables } from "./relations.ts";
 import StringTable, { type StringTableTransferables } from "./stringtable.ts";
 import type { BufferType } from "./typed-arrays.ts";
 import { Ways, type WaysTransferables } from "./ways.ts";
+export declare const OSM_TRANSFER_VERSION: 2;
+export declare const OSM_CONTENT_HASH_VERSION: 2;
 export interface OsmTransferables<T extends BufferType = BufferType> {
+    transferVersion: typeof OSM_TRANSFER_VERSION;
+    contentHashVersion: typeof OSM_CONTENT_HASH_VERSION;
     id: string;
     header: OsmPbfHeaderBlock;
     contentHash: string;
+    loadDiagnostics?: OsmLoadDiagnostics;
     stringTable: StringTableTransferables<T>;
     nodes: NodesTransferables<T>;
     ways: WaysTransferables<T>;
     relations: RelationsTransferables<T>;
 }
+export type OsmLoadProfile = "auto" | "full" | "view";
+export type ResolvedOsmLoadProfile = Exclude<OsmLoadProfile, "auto">;
+export interface OsmLoadDiagnosticReason {
+    code: string;
+    level: "info" | "warning";
+    message: string;
+}
+/** Plain-data diagnostics attached by loaders and safe to transfer between workers. */
+export interface OsmLoadDiagnostics {
+    requestedProfile: OsmLoadProfile;
+    selectedProfile: ResolvedOsmLoadProfile;
+    reasons: OsmLoadDiagnosticReason[];
+    bytes: {
+        residentTypedBuffers: number;
+        projectedTypedBufferPeak: number;
+        largestPlannedAllocation: number;
+        storageBytes?: number;
+    };
+    budgets: {
+        workingSet?: number;
+        singleAllocation?: number;
+        allNodeSpatialIndex?: number;
+        arrayBufferCeiling?: number;
+        sharedArrayBufferCeiling?: number;
+    };
+    phaseTimingsMs: Record<string, number>;
+    counters: {
+        taggedNodes?: number;
+        taggedWays?: number;
+        taggedRelations?: number;
+        nodeTagPairs?: number;
+        wayTagPairs?: number;
+        relationTagPairs?: number;
+        wayReferences?: number;
+        missingWayReferences?: number;
+        relationMembers?: number;
+    };
+}
 export interface OsmInfo {
     id: string;
-    bbox: GeoBbox2D;
+    /** Bounding box of all nodes, or `null` when the dataset has no nodes. */
+    bbox: GeoBbox2D | null;
     header: OsmPbfHeaderBlock;
     stats: {
         nodes: number;
         ways: number;
         relations: number;
     };
+    spatialIndexes: {
+        nodes: {
+            all: boolean;
+            tagged: boolean;
+        };
+        ways: boolean;
+        relations: boolean;
+    };
+    loadDiagnostics?: OsmLoadDiagnostics;
 }
 export interface OsmOptions {
     id: string;
@@ -40,6 +93,7 @@ export declare class Osm {
     readonly relations: Relations;
     private indexBuilt;
     private _contentHash;
+    private _loadDiagnostics?;
     /**
      * Create a new OSM Entity index.
      */
@@ -62,13 +116,15 @@ export declare class Osm {
      */
     hasSpatialIndexes(): boolean;
     /**
-     * Get the bounding box of all entities in the OSM index.
+     * Get the bounding box of all entities in the OSM index, or `null` when there are no nodes.
      */
-    bbox(): GeoBbox2D;
+    bbox(): GeoBbox2D | null;
     /**
      * Get information about the OSM index.
      */
     info(): OsmInfo;
+    /** Attach loader-provided diagnostics for `info()` and worker transfer. */
+    setLoadDiagnostics(loadDiagnostics: OsmLoadDiagnostics | undefined): void;
     /**
      * Get transferable objects for passing to another thread.
      */

package/dist/osm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"osm.d.ts","sourceRoot":"","sources":["../src/osm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,KAAK,EAAE,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,KAAK,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AACvE,OAAO,WAAW,EAAE,EAAE,KAAK,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,IAAI,EAAE,KAAK,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAExD,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAClE,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,iBAAiB,CAAA;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAA;IACxC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAA;IAC5B,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAA;IAC1B,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAA;CACpC;AAED,MAAM,WAAW,OAAO;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,SAAS,CAAA;IACf,MAAM,EAAE,iBAAiB,CAAA;IACzB,KAAK,EAAE;QACN,KAAK,EAAE,MAAM,CAAA;QACb,IAAI,EAAE,MAAM,CAAA;QACZ,SAAS,EAAE,MAAM,CAAA;KACjB,CAAA;CACD;AAED,MAAM,WAAW,UAAU;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,iBAAiB,CAAA;CACzB;AAED;;GAEG;AACH,qBAAa,GAAG;IAEf,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAA;IAGlC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;IACjC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAA;IACnB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAE7B,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,YAAY,CAAK;IAEzB;;OAEG;IACH,YAAY,IAAI,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,gBAAgB,GAAG,GAAG,EA0C9D;IAED;;;OAGG;IACH,YAAY,SAQX;IAED;;OAEG;IACH,OAAO,YAON;IAED;;OAEG;IACH,mBAAmB,SAIlB;IAED;;OAEG;IACH,iBAAiB,IAAI,OAAO,CAM3B;IAED;;OAEG;IACH,IAAI,IAAI,SAAS,CAEhB;IAED;;OAEG;IACH,IAAI,IAAI,OAAO,CAWd;IAED;;OAEG;IACH,aAAa,IAAI,gBAAgB,CAUhC;IAED;;;;;OAKG;IACH,WAAW,IAAI,MAAM,CAEpB;IAED;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG9C;IAED;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;CAU1B"}
+{"version":3,"file":"osm.d.ts","sourceRoot":"","sources":["../src/osm.ts"],"names":[],"mappings":"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"}

package/dist/osm.js

@@ -3,6 +3,8 @@ import { Nodes } from "./nodes.js";
 import { Relations } from "./relations.js";
 import StringTable, {} from "./stringtable.js";
 import { Ways } from "./ways.js";
+export const OSM_TRANSFER_VERSION = 2;
+export const OSM_CONTENT_HASH_VERSION = 2;
 /**
  * OSM Entity Index.
  */
@@ -17,6 +19,7 @@ export class Osm {
     relations;
     indexBuilt = false;
     _contentHash = "";
+    _loadDiagnostics;
     /**
      * Create a new OSM Entity index.
      */
@@ -33,14 +36,22 @@ export class Osm {
                 this.ways = new Ways(this.stringTable, this.nodes, opts.ways.transferables());
                 this.relations = new Relations(this.stringTable, this.nodes, this.ways, opts.relations.transferables());
                 this._contentHash = opts._contentHash;
+                this._loadDiagnostics = opts._loadDiagnostics;
                 this.indexBuilt = true;
             }
             else {
+                if (opts.transferVersion !== OSM_TRANSFER_VERSION) {
+                    throw Error(`Unsupported OSM transfer version: ${String(opts.transferVersion)}. Expected ${String(OSM_TRANSFER_VERSION)}.`);
+                }
+                if (opts.contentHashVersion !== OSM_CONTENT_HASH_VERSION) {
+                    throw Error(`Unsupported OSM content hash version: ${String(opts.contentHashVersion)}. Expected ${String(OSM_CONTENT_HASH_VERSION)}.`);
+                }
                 this.stringTable = new StringTable(opts.stringTable);
                 this.nodes = new Nodes(this.stringTable, opts.nodes);
                 this.ways = new Ways(this.stringTable, this.nodes, opts.ways);
                 this.relations = new Relations(this.stringTable, this.nodes, this.ways, opts.relations);
                 this._contentHash = opts.contentHash;
+                this._loadDiagnostics = opts.loadDiagnostics;
                 this.indexBuilt = true;
             }
         }
@@ -68,15 +79,13 @@ export class Osm {
      * Check if the index is built and ready for use.
      */
     isReady() {
-        return (this.nodes.isReady() &&
-            this.ways.isReady() &&
-            this.relations.isReady() &&
-            this.indexBuilt);
+        return (this.nodes.isReady() && this.ways.isReady() && this.relations.isReady() && this.indexBuilt);
     }
     /**
      * Build spatial indexes for all entities.
      */
     buildSpatialIndexes() {
+        this.nodes.buildSpatialIndex("tagged");
         this.nodes.buildSpatialIndex();
         this.ways.buildSpatialIndex();
         this.relations.buildSpatialIndex();
@@ -86,11 +95,12 @@ export class Osm {
      */
     hasSpatialIndexes() {
         return (this.nodes.hasSpatialIndex() &&
+            this.nodes.hasSpatialIndex("tagged") &&
             this.ways.hasSpatialIndex() &&
             this.relations.hasSpatialIndex());
     }
     /**
-     * Get the bounding box of all entities in the OSM index.
+     * Get the bounding box of all entities in the OSM index, or `null` when there are no nodes.
      */
     bbox() {
         return this.nodes.getBbox();
@@ -108,16 +118,32 @@ export class Osm {
                 ways: this.ways.size,
                 relations: this.relations.size,
             },
+            spatialIndexes: {
+                nodes: {
+                    all: this.nodes.hasSpatialIndex("all"),
+                    tagged: this.nodes.hasSpatialIndex("tagged"),
+                },
+                ways: this.ways.hasSpatialIndex(),
+                relations: this.relations.hasSpatialIndex(),
+            },
+            ...(this._loadDiagnostics ? { loadDiagnostics: this._loadDiagnostics } : {}),
         };
     }
+    /** Attach loader-provided diagnostics for `info()` and worker transfer. */
+    setLoadDiagnostics(loadDiagnostics) {
+        this._loadDiagnostics = loadDiagnostics;
+    }
     /**
      * Get transferable objects for passing to another thread.
      */
     transferables() {
         return {
+            transferVersion: OSM_TRANSFER_VERSION,
+            contentHashVersion: OSM_CONTENT_HASH_VERSION,
             id: this.id,
             header: this.header,
             contentHash: this._contentHash,
+            ...(this._loadDiagnostics ? { loadDiagnostics: this._loadDiagnostics } : {}),
             stringTable: this.stringTable.transferables(),
             nodes: this.nodes.transferables(),
             ways: this.ways.transferables(),
@@ -152,7 +178,7 @@ export class Osm {
      * @returns A hex string hash of the content.
      */
     computeContentHash() {
-        const hasher = new ContentHasher();
+        const hasher = new ContentHasher().updateNumber(OSM_CONTENT_HASH_VERSION);
         // Hash string table first (shared by all entities)
         this.stringTable.updateHash(hasher);
         // Hash each entity collection

package/dist/osm.js.map

@@ -1 +1 @@
-{"version":3,"file":"osm.js","sourceRoot":"","sources":["../src/osm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"osm.js","sourceRoot":"","sources":["../src/osm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAG7D,OAAO,EAAE,KAAK,EAA2B,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,SAAS,EAA+B,MAAM,gBAAgB,CAAC;AACxE,OAAO,WAAW,EAAE,EAAiC,MAAM,kBAAkB,CAAC;AAE9E,OAAO,EAAE,IAAI,EAA0B,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAU,CAAC;AAC/C,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAU,CAAC;AA+EnD;;GAEG;AACH,MAAM,OAAO,GAAG;IACd,2CAA2C;IAClC,EAAE,CAAS;IACX,MAAM,CAAoB;IAEnC,gEAAgE;IACvD,WAAW,CAAc;IACzB,KAAK,CAAQ;IACb,IAAI,CAAO;IACX,SAAS,CAAY;IAEtB,UAAU,GAAG,KAAK,CAAC;IACnB,YAAY,GAAG,EAAE,CAAC;IAClB,gBAAgB,CAAsB;IAE9C;;OAEG;IACH,YAAY,IAAmD;QAC7D,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,IAAI,SAAS,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI;YAC5B,iBAAiB,EAAE,EAAE;YACrB,iBAAiB,EAAE,EAAE;SACtB,CAAC;QACF,IAAI,IAAI,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;YAClC,IAAI,IAAI,YAAY,GAAG,EAAE,CAAC;gBACxB,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,CAAC;gBACrE,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC;gBACrE,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;gBAC9E,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAC5B,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAC/B,CAAC;gBACF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;gBACtC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;gBAC9C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,IAAI,IAAI,CAAC,eAAe,KAAK,oBAAoB,EAAE,CAAC;oBAClD,MAAM,KAAK,CACT,qCAAqC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAC/G,CAAC;gBACJ,CAAC;gBACD,IAAI,IAAI,CAAC,kBAAkB,KAAK,wBAAwB,EAAE,CAAC;oBACzD,MAAM,KAAK,CACT,yCAAyC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,MAAM,CAAC,wBAAwB,CAAC,GAAG,CAC1H,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACrD,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBACrD,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9D,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBACxF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;gBACrC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC;gBAC7C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACzB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzC,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,YAAY;QACV,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,+CAA+C;QAC/C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,OAAO;QACL,OAAO,CACL,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,UAAU,CAC3F,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,mBAAmB;QACjB,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO,CACL,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE;YAC5B,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YAC3B,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CACjC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,IAAI;QACF,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACtB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;gBACpB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;aAC/B;YACD,cAAc,EAAE;gBACd,KAAK,EAAE;oBACL,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC;oBACtC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC7C;gBACD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBACjC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE;aAC5C;YACD,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7E,CAAC;IACJ,CAAC;IAED,2EAA2E;IAC3E,kBAAkB,CAAC,eAA+C;QAChE,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,aAAa;QACX,OAAO;YACL,eAAe,EAAE,oBAAoB;YACrC,kBAAkB,EAAE,wBAAwB;YAC5C,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW,EAAE,IAAI,CAAC,YAAY;YAC9B,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5E,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;YAC7C,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;YACjC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE;SAC1C,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,WAAW;QACT,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,KAA6B;QACnC,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC,YAAY,KAAK,KAAK,CAAC,YAAY,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACK,kBAAkB;QACxB,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC,YAAY,CAAC,wBAAwB,CAAC,CAAC;QAC1E,mDAAmD;QACnD,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,8BAA8B;QAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;CACF"}

package/dist/relations.d.ts

@@ -1,6 +1,6 @@
 import type { OsmPbfRelation } from "@osmix/pbf";
 import type { ContentHasher } from "@osmix/shared/content-hasher";
-import type { GeoBbox2D, LonLat, OsmEntityType, OsmRelation, OsmRelationMember, OsmTags } from "@osmix/shared/types";
+import type { GeoBbox2D, LonLat, OsmEntityType, OsmRelation, OsmRelationMember, OsmTags } from "@osmix/types";
 import Flatbush from "flatbush";
 import { Entities, type EntitiesTransferables } from "./entities.ts";
 import { type IdOrIndex } from "./ids.ts";
@@ -30,10 +30,13 @@ export declare class Relations extends Entities<OsmRelation> {
     private bbox;
     private nodes;
     private ways;
+    private wayMemberCache;
     /**
      * Create a new Relations index.
      */
     constructor(stringTable: StringTable, nodes: Nodes, ways: Ways, transferables?: RelationsTransferables);
+    /** Reject a relation whose member count would wrap `memberCount` or `memberStart`. */
+    private assertMemberCapacity;
     /**
      * Add a single relation to the index.
      */
@@ -50,6 +53,7 @@ export declare class Relations extends Entities<OsmRelation> {
      * Build the spatial index for relations.
      * Handles nested relations by resolving all descendant nodes and ways.
      * If bbox data already exists (e.g., loaded from storage), reuses it.
+     * Returns the existing index when it is already built.
      */
     buildSpatialIndex(): Flatbush;
     /**
@@ -78,10 +82,13 @@ export declare class Relations extends Entities<OsmRelation> {
      */
     includesMember(index: number, memberRef: number, memberType: OsmEntityType, memberRole?: string): boolean;
     /**
-     * Get all way IDs that are members of relations, including nested relations.
+     * Check whether a way is a member of any relation, including through nested relations.
      * Used to exclude these ways from individual rendering.
+     *
+     * Membership is computed once and cached as one bit per way index. Requires the way ID index.
      */
-    getWayMemberIds(): Set<number>;
+    isWayMember(wayIndex: number): boolean;
+    private getWayMembers;
     /**
      * Get relation geometry based on its kind.
      * Returns coordinates suitable for rendering based on relation type.
@@ -114,7 +121,7 @@ export declare class Relations extends Entities<OsmRelation> {
     /**
      * Get the approximate memory requirements for a given number of relations in bytes.
      */
-    static getBytesRequired(count: number): number;
+    static getBytesRequired(count: number, memberCount?: number, tagCount?: number): number;
     /**
      * Update a ContentHasher with relation-specific data (members).
      */

package/dist/relations.d.ts.map

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

package/dist/relations.js

@@ -1,18 +1,20 @@
+import { buildRelationRings } from "@osmix/geo/relation-multipolygon";
 import { assertValue } from "@osmix/shared/assert";
-import { buildRelationLineStrings, collectRelationPoints, isAreaRelation, isLineRelation, isPointRelation, isSuperRelation, resolveRelationMembers, } from "@osmix/shared/relation-kind";
-import { buildRelationRings } from "@osmix/shared/relation-multipolygon";
-import { bboxFromLonLats } from "@osmix/shared/utils";
+import { BitSet } from "@osmix/shared/bit-set";
+import { buildRelationLineStrings, collectRelationPoints, isAreaRelation, isLineRelation, isPointRelation, isSuperRelation, resolveRelationMembers, } from "@osmix/types/relation-kind";
+import { bboxFromLonLats } from "@osmix/types/utils";
 import Flatbush from "flatbush";
 import { around as geoAround } from "geoflatbush";
-import { Entities } from "./entities.js";
+import { Entities, isValidSpatialBbox } from "./entities.js";
 import { Ids } from "./ids.js";
+import { MAX_RELATION_MEMBERS, MAX_UINT32_OFFSET, assertCapacity } from "./limits.js";
 import { Tags } from "./tags.js";
 import { BufferConstructor, IdArrayType, ResizeableTypedArray as RTA, } from "./typed-arrays.js";
 const RELATION_MEMBER_TYPES = ["node", "way", "relation"];
 export class Relations extends Entities {
     stringTable;
     memberStart;
-    memberCount; // Maximum 65,535 members per relation
+    memberCount; // Maximum MAX_RELATION_MEMBERS (65,535) per relation
     // Store the ID of the member because relations have other relations as members.
     memberRefs;
     memberTypes;
@@ -26,6 +28,9 @@ export class Relations extends Entities {
     // Node and Way indexes
     nodes;
     ways;
+    // Lazily computed relation way membership keyed by way index. Invalidated whenever relations
+    // change, and rebuilt if the way count no longer matches.
+    wayMemberCache = null;
     /**
      * Create a new Relations index.
      */
@@ -58,10 +63,17 @@ export class Relations extends Entities {
         this.ways = ways;
         this.stringTable = stringTable;
     }
+    /** Reject a relation whose member count would wrap `memberCount` or `memberStart`. */
+    assertMemberCapacity(relationId, memberCount) {
+        assertCapacity("relation-members", memberCount, MAX_RELATION_MEMBERS, () => `Relation ${relationId}`);
+        assertCapacity("total-relation-members", this.memberRefs.length + memberCount, MAX_UINT32_OFFSET, () => `The dataset (at relation ${relationId})`);
+    }
     /**
      * Add a single relation to the index.
      */
     addRelation(relation) {
+        this.wayMemberCache = null;
+        this.assertMemberCapacity(relation.id, relation.members.length);
         const relationIndex = this.addEntity(relation.id, relation.tags ?? {});
         this.memberStart.push(this.memberRefs.length);
         this.memberCount.push(relation.members.length);
@@ -76,6 +88,7 @@ export class Relations extends Entities {
      * Bulk add relations directly from a PBF PrimitiveBlock.
      */
     addRelations(relations, blockStringIndexMap, filter) {
+        this.wayMemberCache = null;
         const blockToStringTable = (k) => {
             const index = blockStringIndexMap[k];
             if (index === undefined)
@@ -122,6 +135,7 @@ export class Relations extends Entities {
                 : null;
             if (filter && filteredRelation === null)
                 continue;
+            this.assertMemberCapacity(relation.id, filteredRelation?.members.length ?? memberRefs.length);
             added++;
             this.addEntity(relation.id, tagKeys, tagValues);
             this.memberStart.push(this.memberRefs.length);
@@ -146,14 +160,20 @@ export class Relations extends Entities {
      * Build the spatial index for relations.
      * Handles nested relations by resolving all descendant nodes and ways.
      * If bbox data already exists (e.g., loaded from storage), reuses it.
+     * Returns the existing index when it is already built.
      */
     buildSpatialIndex() {
         if (!this.nodes.isReady())
             throw Error("Node index is not ready.");
         if (!this.ways.isReady())
             throw Error("Way index is not ready.");
-        if (this.size === 0)
+        if (this.spatialIndexBuilt)
+            return this.spatialIndex;
+        if (this.size === 0) {
+            this.spatialIndex = new Flatbush(1, 128, Float64Array, BufferConstructor);
+            this.spatialIndexBuilt = true;
             return this.spatialIndex;
+        }
         console.time("RelationIndex.buildSpatialIndex");
         this.spatialIndex = new Flatbush(this.size, 128, Float64Array, BufferConstructor);
         // If bbox already has data (loaded from storage), use it directly
@@ -219,12 +239,13 @@ export class Relations extends Entities {
             if (ll)
                 lls.push(ll);
         }
-        // Collect coordinates from resolved ways
+        // Collect coordinates from resolved ways. Member ways may reference nodes
+        // outside a referentially incomplete extract, so skip unresolvable refs.
         for (const wayId of resolved.ways) {
             const wayIndex = this.ways.ids.getIndexFromId(wayId);
             if (wayIndex === -1)
                 continue;
-            const wayPositions = this.ways.getCoordinates(wayIndex);
+            const wayPositions = this.ways.getResolvedCoordinates(wayIndex);
             lls.push(...wayPositions);
         }
         return lls;
@@ -283,32 +304,42 @@ export class Relations extends Entities {
             const ref = this.memberRefs.at(i);
             if (ref !== memberRef)
                 continue;
-            if (memberRole !== undefined &&
-                this.stringTable.get(this.memberRoles.at(i)) !== memberRole)
+            if (memberRole !== undefined && this.stringTable.get(this.memberRoles.at(i)) !== memberRole)
                 continue;
             return true;
         }
         return false;
     }
     /**
-     * Get all way IDs that are members of relations, including nested relations.
+     * Check whether a way is a member of any relation, including through nested relations.
      * Used to exclude these ways from individual rendering.
+     *
+     * Membership is computed once and cached as one bit per way index. Requires the way ID index.
      */
-    getWayMemberIds() {
-        const wayIds = new Set();
+    isWayMember(wayIndex) {
+        return this.getWayMembers().has(wayIndex);
+    }
+    getWayMembers() {
+        if (this.wayMemberCache !== null && this.wayMemberCache.size === this.ways.size) {
+            return this.wayMemberCache;
+        }
+        const members = new BitSet(this.ways.size);
+        const getRelation = (relId) => {
+            const relIndex = this.ids.getIndexFromId(relId);
+            if (relIndex === -1)
+                return null;
+            return this.getByIndex(relIndex);
+        };
         for (let i = 0; i < this.size; i++) {
-            const relation = this.getByIndex(i);
-            const resolved = resolveRelationMembers(relation, (relId) => {
-                const relIndex = this.ids.getIndexFromId(relId);
-                if (relIndex === -1)
-                    return null;
-                return this.getByIndex(relIndex);
-            }, 10);
+            const resolved = resolveRelationMembers(this.getByIndex(i), getRelation, 10);
             for (const wayId of resolved.ways) {
-                wayIds.add(wayId);
+                const wayIndex = this.ways.ids.getIndexFromId(wayId);
+                if (wayIndex !== -1)
+                    members.add(wayIndex);
             }
         }
-        return wayIds;
+        this.wayMemberCache = members;
+        return members;
     }
     /**
      * Get relation geometry based on its kind.
@@ -320,19 +351,19 @@ export class Relations extends Entities {
         const relation = this.getByIndex(index);
         if (isAreaRelation(relation)) {
             return {
-                rings: buildRelationRings(relation, (ref) => this.ways.getById(ref), (id) => this.nodes.getNodeLonLat({ id })),
+                rings: buildRelationRings(relation, (ref) => this.ways.getById(ref), (id) => this.nodes.getNodeLonLat({ id }) ?? undefined),
             };
         }
         // Point relations
         if (isPointRelation(relation)) {
             return {
-                points: collectRelationPoints(relation, (id) => this.nodes.getNodeLonLat({ id })),
+                points: collectRelationPoints(relation, (id) => this.nodes.getNodeLonLat({ id }) ?? undefined),
             };
         }
         // Line relations
         if (isLineRelation(relation)) {
             return {
-                lineStrings: buildRelationLineStrings(relation, (ref) => this.ways.getById(ref), (id) => this.nodes.getNodeLonLat({ id })),
+                lineStrings: buildRelationLineStrings(relation, (ref) => this.ways.getById(ref), (id) => this.nodes.getNodeLonLat({ id }) ?? undefined),
             };
         }
         // Super relations are handled by individual relation geometry methods
@@ -349,7 +380,14 @@ export class Relations extends Entities {
     intersects(bbox, filterFn) {
         if (this.size === 0)
             return [];
-        return this.spatialIndex.search(bbox[0], bbox[1], bbox[2], bbox[3], filterFn);
+        // A relation with no resolvable member geometry stores an inverted bbox.
+        // Flatbush's contained-node fast path skips per-leaf intersection tests,
+        // so filter inverted boxes out explicitly.
+        return this.spatialIndex.search(bbox[0], bbox[1], bbox[2], bbox[3], (index, x0, y0, x1, y1) => {
+            if (!isValidSpatialBbox(x0, y0, x1, y1))
+                return false;
+            return filterFn ? filterFn(index) : true;
+        });
     }
     /**
      * Find relation indexes near a point using great-circle distance.
@@ -363,7 +401,10 @@ export class Relations extends Entities {
         if (this.size === 0)
             return [];
         // Use geoflatbush for proper geographic distance calculations
-        return geoAround(this.spatialIndex, lon, lat, maxResults, maxDistanceKm);
+        return geoAround(this.spatialIndex, lon, lat, maxResults, maxDistanceKm, (index) => {
+            const offset = index * 4;
+            return isValidSpatialBbox(this.bbox.at(offset), this.bbox.at(offset + 1), this.bbox.at(offset + 2), this.bbox.at(offset + 3));
+        });
     }
     /**
      * Get transferable objects for passing to another thread.
@@ -388,7 +429,7 @@ export class Relations extends Entities {
     /**
      * Get the approximate memory requirements for a given number of relations in bytes.
      */
-    static getBytesRequired(count) {
+    static getBytesRequired(count, memberCount = 0, tagCount = 0) {
         if (count === 0)
             return 0;
         // Approximate members per relation
@@ -402,9 +443,12 @@ export class Relations extends Entities {
         const boxesBytes = numNodes * 4 * Float64Array.BYTES_PER_ELEMENT;
         const spatialIndexBytes = 8 + indexBytes + boxesBytes;
         return (Ids.getBytesRequired(count) +
-            Tags.getBytesRequired(count) +
+            Tags.getBytesRequired(count, count, tagCount) +
             count * Uint32Array.BYTES_PER_ELEMENT + // memberStart
             count * Uint16Array.BYTES_PER_ELEMENT + // memberCount
+            memberCount * Float64Array.BYTES_PER_ELEMENT + // memberRefs
+            memberCount * Uint8Array.BYTES_PER_ELEMENT + // memberTypes
+            memberCount * Uint32Array.BYTES_PER_ELEMENT + // memberRoles
             count * 4 * Float64Array.BYTES_PER_ELEMENT + // bbox
             spatialIndexBytes);
     }