@osmix/core 0.0.1 → 0.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/dist/src/entities.d.ts +26 -0
- package/dist/src/entities.d.ts.map +1 -0
- package/dist/src/entities.js +69 -0
- package/dist/src/entities.js.map +1 -0
- package/dist/src/ids.d.ts +50 -0
- package/dist/src/ids.d.ts.map +1 -0
- package/dist/src/ids.js +171 -0
- package/dist/src/ids.js.map +1 -0
- package/dist/src/index.d.ts +6 -0
- package/dist/src/index.d.ts.map +1 -0
- package/dist/src/index.js +7 -0
- package/dist/src/index.js.map +1 -0
- package/dist/src/nodes.d.ts +36 -0
- package/dist/src/nodes.d.ts.map +1 -0
- package/dist/src/nodes.js +171 -0
- package/dist/src/nodes.js.map +1 -0
- package/dist/src/osmix.d.ts +88 -0
- package/dist/src/osmix.d.ts.map +1 -0
- package/dist/src/osmix.js +438 -0
- package/dist/src/osmix.js.map +1 -0
- package/dist/src/relations.d.ts +31 -0
- package/dist/src/relations.d.ts.map +1 -0
- package/dist/src/relations.js +161 -0
- package/dist/src/relations.js.map +1 -0
- package/dist/src/stringtable.d.ts +37 -0
- package/dist/src/stringtable.d.ts.map +1 -0
- package/dist/src/stringtable.js +101 -0
- package/dist/src/stringtable.js.map +1 -0
- package/dist/src/tags.d.ts +33 -0
- package/dist/src/tags.d.ts.map +1 -0
- package/dist/src/tags.js +92 -0
- package/dist/src/tags.js.map +1 -0
- package/dist/src/typed-arrays.d.ts +50 -0
- package/dist/src/typed-arrays.d.ts.map +1 -0
- package/dist/src/typed-arrays.js +119 -0
- package/dist/src/typed-arrays.js.map +1 -0
- package/dist/src/utils.d.ts +4 -0
- package/dist/src/utils.d.ts.map +1 -0
- package/dist/src/utils.js +28 -0
- package/dist/src/utils.js.map +1 -0
- package/dist/src/ways.d.ts +42 -0
- package/dist/src/ways.d.ts.map +1 -0
- package/dist/src/ways.js +186 -0
- package/dist/src/ways.js.map +1 -0
- package/dist/test/extract.bench.d.ts +2 -0
- package/dist/test/extract.bench.d.ts.map +1 -0
- package/dist/test/extract.bench.js +23 -0
- package/dist/test/extract.bench.js.map +1 -0
- package/dist/test/extract.test.d.ts +2 -0
- package/dist/test/extract.test.d.ts.map +1 -0
- package/dist/test/extract.test.js +127 -0
- package/dist/test/extract.test.js.map +1 -0
- package/dist/test/mock-osm.d.ts +13 -0
- package/dist/test/mock-osm.d.ts.map +1 -0
- package/dist/test/mock-osm.js +122 -0
- package/dist/test/mock-osm.js.map +1 -0
- package/dist/test/read.test.d.ts +2 -0
- package/dist/test/read.test.d.ts.map +1 -0
- package/dist/test/read.test.js +17 -0
- package/dist/test/read.test.js.map +1 -0
- package/dist/test/typed-arrays.test.d.ts +2 -0
- package/dist/test/typed-arrays.test.d.ts.map +1 -0
- package/dist/test/typed-arrays.test.js +100 -0
- package/dist/test/typed-arrays.test.js.map +1 -0
- package/dist/test/write.test.d.ts +2 -0
- package/dist/test/write.test.d.ts.map +1 -0
- package/dist/test/write.test.js +55 -0
- package/dist/test/write.test.js.map +1 -0
- package/package.json +3 -1
- package/src/osmix.ts +2 -2
- package/test/extract.bench.ts +1 -1
- package/test/extract.test.ts +8 -3
- package/test/write.test.ts +4 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5D,wBAAgB,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,EAC3C,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,EAC1B,SAAS,EAAE,MAAM,IAGT,GAAG,MAAM,CAAC,UAOlB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAY5D"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export function throttle(func, timeFrame) {
|
|
2
|
+
let lastTime = 0;
|
|
3
|
+
return (...args) => {
|
|
4
|
+
const now = Date.now();
|
|
5
|
+
if (now - lastTime >= timeFrame) {
|
|
6
|
+
func(...args);
|
|
7
|
+
lastTime = now;
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
}
|
|
11
|
+
export function bboxFromLonLats(lonLats) {
|
|
12
|
+
let minLon = Number.POSITIVE_INFINITY;
|
|
13
|
+
let minLat = Number.POSITIVE_INFINITY;
|
|
14
|
+
let maxLon = Number.NEGATIVE_INFINITY;
|
|
15
|
+
let maxLat = Number.NEGATIVE_INFINITY;
|
|
16
|
+
for (const [lon, lat] of lonLats) {
|
|
17
|
+
if (lon < minLon)
|
|
18
|
+
minLon = lon;
|
|
19
|
+
if (lat < minLat)
|
|
20
|
+
minLat = lat;
|
|
21
|
+
if (lon > maxLon)
|
|
22
|
+
maxLon = lon;
|
|
23
|
+
if (lat > maxLat)
|
|
24
|
+
maxLat = lat;
|
|
25
|
+
}
|
|
26
|
+
return [minLon, minLat, maxLon, maxLat];
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,QAAQ,CACvB,IAA0B,EAC1B,SAAiB;IAEjB,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,OAAO,CAAC,GAAG,IAAO,EAAE,EAAE;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACtB,IAAI,GAAG,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;YACb,QAAQ,GAAG,GAAG,CAAA;QACf,CAAC;IACF,CAAC,CAAA;AACF,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAiB;IAChD,IAAI,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAA;IACrC,IAAI,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAA;IACrC,IAAI,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAA;IACrC,IAAI,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAA;IACrC,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC;QAClC,IAAI,GAAG,GAAG,MAAM;YAAE,MAAM,GAAG,GAAG,CAAA;QAC9B,IAAI,GAAG,GAAG,MAAM;YAAE,MAAM,GAAG,GAAG,CAAA;QAC9B,IAAI,GAAG,GAAG,MAAM;YAAE,MAAM,GAAG,GAAG,CAAA;QAC9B,IAAI,GAAG,GAAG,MAAM;YAAE,MAAM,GAAG,GAAG,CAAA;IAC/B,CAAC;IACD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;AACxC,CAAC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { OsmTags, OsmWay } from "@osmix/json";
|
|
2
|
+
import type { OsmPbfWay } from "@osmix/pbf";
|
|
3
|
+
import type { GeoBbox2D, LonLat } from "@osmix/shared/types";
|
|
4
|
+
import Flatbush from "flatbush";
|
|
5
|
+
import { Entities, type EntitiesTransferables } from "./entities";
|
|
6
|
+
import { type IdOrIndex, Ids } from "./ids";
|
|
7
|
+
import type { Nodes } from "./nodes";
|
|
8
|
+
import type StringTable from "./stringtable";
|
|
9
|
+
import { Tags } from "./tags";
|
|
10
|
+
import { type BufferType, ResizeableTypedArray } from "./typed-arrays";
|
|
11
|
+
export interface WaysTransferables extends EntitiesTransferables {
|
|
12
|
+
refStart: BufferType;
|
|
13
|
+
refCount: BufferType;
|
|
14
|
+
refs: BufferType;
|
|
15
|
+
bbox: BufferType;
|
|
16
|
+
spatialIndex: BufferType;
|
|
17
|
+
}
|
|
18
|
+
export declare class Ways extends Entities<OsmWay> {
|
|
19
|
+
spatialIndex: Flatbush;
|
|
20
|
+
refStart: ResizeableTypedArray<Uint32Array>;
|
|
21
|
+
refCount: ResizeableTypedArray<Uint16Array>;
|
|
22
|
+
refs: ResizeableTypedArray<Float64Array>;
|
|
23
|
+
bbox: ResizeableTypedArray<Float64Array>;
|
|
24
|
+
static from(stringTable: StringTable, wits: WaysTransferables): Ways;
|
|
25
|
+
constructor(stringTable: StringTable, idIndex?: Ids, tagIndex?: Tags);
|
|
26
|
+
transferables(): WaysTransferables;
|
|
27
|
+
addWay(way: OsmWay): void;
|
|
28
|
+
/**
|
|
29
|
+
* Bulk add ways directly from a PBF PrimitiveBlock.
|
|
30
|
+
*/
|
|
31
|
+
addWays(ways: OsmPbfWay[], blockStringIndexMap: Map<number, number>, filter?: (way: OsmWay) => OsmWay | null): number;
|
|
32
|
+
buildEntityIndex(): void;
|
|
33
|
+
buildSpatialIndex(nodeIndex: Nodes): Flatbush;
|
|
34
|
+
getFullEntity(index: number, id: number, tags?: OsmTags): OsmWay;
|
|
35
|
+
getRefIds(index: number): Uint8Array<ArrayBuffer> | Int8Array<ArrayBuffer> | Uint8ClampedArray<ArrayBuffer> | Int16Array<ArrayBuffer> | Uint16Array<ArrayBuffer> | Int32Array<ArrayBuffer> | Uint32Array<ArrayBuffer> | Float32Array<ArrayBuffer> | Float64Array<ArrayBuffer>;
|
|
36
|
+
getBbox(idOrIndex: IdOrIndex): GeoBbox2D;
|
|
37
|
+
getLine(index: number, nodeIndex: Nodes): Float64Array<ArrayBuffer>;
|
|
38
|
+
getCoordinates(index: number, nodeIndex: Nodes): LonLat[];
|
|
39
|
+
intersects(bbox: GeoBbox2D, filterFn?: (index: number) => boolean): number[];
|
|
40
|
+
neighbors(x: number, y: number, maxResults?: number, maxDistance?: number): number[];
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=ways.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ways.d.ts","sourceRoot":"","sources":["../../src/ways.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAA;AACjE,OAAO,EAAE,KAAK,SAAS,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,KAAK,WAAW,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAEN,KAAK,UAAU,EAGf,oBAAoB,EACpB,MAAM,gBAAgB,CAAA;AAEvB,MAAM,WAAW,iBAAkB,SAAQ,qBAAqB;IAC/D,QAAQ,EAAE,UAAU,CAAA;IACpB,QAAQ,EAAE,UAAU,CAAA;IACpB,IAAI,EAAE,UAAU,CAAA;IAChB,IAAI,EAAE,UAAU,CAAA;IAChB,YAAY,EAAE,UAAU,CAAA;CACxB;AAED,qBAAa,IAAK,SAAQ,QAAQ,CAAC,MAAM,CAAC;IACzC,YAAY,EAAE,QAAQ,CAAkB;IAExC,QAAQ,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAA;IAC3C,QAAQ,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAA;IAG3C,IAAI,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAA;IAGxC,IAAI,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAA;IAExC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,iBAAiB;gBAYjD,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,IAAI;IAQpE,aAAa,IAAI,iBAAiB;IAYlC,MAAM,CAAC,GAAG,EAAE,MAAM;IAQlB;;OAEG;IACH,OAAO,CACN,IAAI,EAAE,SAAS,EAAE,EACjB,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI;IAuCxC,gBAAgB;IAMhB,iBAAiB,CAAC,SAAS,EAAE,KAAK;IAkClC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM;IAQhE,SAAS,CAAC,KAAK,EAAE,MAAM;IAMvB,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS;IAWxC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK;IAavC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,GAAG,MAAM,EAAE;IAsBzD,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,EAAE;IAU5E,SAAS,CACR,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GAClB,MAAM,EAAE;CAGX"}
|
package/dist/src/ways.js
ADDED
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
import Flatbush from "flatbush";
|
|
2
|
+
import { Entities } from "./entities";
|
|
3
|
+
import { Ids } from "./ids";
|
|
4
|
+
import { Tags } from "./tags";
|
|
5
|
+
import { BufferConstructor, CoordinateArrayType, IdArrayType, ResizeableTypedArray, } from "./typed-arrays";
|
|
6
|
+
export class Ways extends Entities {
|
|
7
|
+
spatialIndex = new Flatbush(1);
|
|
8
|
+
refStart;
|
|
9
|
+
refCount; // Maximum 2,000 nodes per way
|
|
10
|
+
// Node IDs
|
|
11
|
+
refs;
|
|
12
|
+
// Bounding box of the way in geographic coordinates
|
|
13
|
+
bbox;
|
|
14
|
+
static from(stringTable, wits) {
|
|
15
|
+
const idIndex = Ids.from(wits);
|
|
16
|
+
const tagIndex = Tags.from(stringTable, wits);
|
|
17
|
+
const wayIndex = new Ways(stringTable, idIndex, tagIndex);
|
|
18
|
+
wayIndex.refStart = ResizeableTypedArray.from(Uint32Array, wits.refStart);
|
|
19
|
+
wayIndex.refCount = ResizeableTypedArray.from(Uint16Array, wits.refCount);
|
|
20
|
+
wayIndex.refs = ResizeableTypedArray.from(IdArrayType, wits.refs);
|
|
21
|
+
wayIndex.bbox = ResizeableTypedArray.from(CoordinateArrayType, wits.bbox);
|
|
22
|
+
wayIndex.spatialIndex = Flatbush.from(wits.spatialIndex);
|
|
23
|
+
return wayIndex;
|
|
24
|
+
}
|
|
25
|
+
constructor(stringTable, idIndex, tagIndex) {
|
|
26
|
+
super("way", stringTable, idIndex, tagIndex);
|
|
27
|
+
this.refStart = new ResizeableTypedArray(Uint32Array);
|
|
28
|
+
this.refCount = new ResizeableTypedArray(Uint16Array);
|
|
29
|
+
this.refs = new ResizeableTypedArray(IdArrayType);
|
|
30
|
+
this.bbox = new ResizeableTypedArray(CoordinateArrayType);
|
|
31
|
+
}
|
|
32
|
+
transferables() {
|
|
33
|
+
return {
|
|
34
|
+
refStart: this.refStart.array.buffer,
|
|
35
|
+
refCount: this.refCount.array.buffer,
|
|
36
|
+
refs: this.refs.array.buffer,
|
|
37
|
+
bbox: this.bbox.array.buffer,
|
|
38
|
+
spatialIndex: this.spatialIndex.data,
|
|
39
|
+
...this.ids.transferables(),
|
|
40
|
+
...this.tags.transferables(),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
addWay(way) {
|
|
44
|
+
this.ids.add(way.id);
|
|
45
|
+
this.tags.addTags(way.tags);
|
|
46
|
+
this.refStart.push(this.refs.length);
|
|
47
|
+
this.refCount.push(way.refs.length);
|
|
48
|
+
for (const ref of way.refs)
|
|
49
|
+
this.refs.push(ref);
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Bulk add ways directly from a PBF PrimitiveBlock.
|
|
53
|
+
*/
|
|
54
|
+
addWays(ways, blockStringIndexMap, filter) {
|
|
55
|
+
let added = 0;
|
|
56
|
+
for (const way of ways) {
|
|
57
|
+
let prevRefId = 0;
|
|
58
|
+
const refs = way.refs.map((refId) => {
|
|
59
|
+
prevRefId += refId;
|
|
60
|
+
return prevRefId;
|
|
61
|
+
});
|
|
62
|
+
const filteredWay = filter
|
|
63
|
+
? filter({
|
|
64
|
+
id: way.id,
|
|
65
|
+
refs,
|
|
66
|
+
tags: this.tags.getTagsFromIndices(way.keys, way.vals),
|
|
67
|
+
})
|
|
68
|
+
: null;
|
|
69
|
+
if (filter && filteredWay === null)
|
|
70
|
+
continue;
|
|
71
|
+
this.ids.add(way.id);
|
|
72
|
+
this.refStart.push(this.refs.length);
|
|
73
|
+
this.refCount.push(filteredWay?.refs.length ?? refs.length);
|
|
74
|
+
this.refs.pushMany(filteredWay?.refs ?? refs);
|
|
75
|
+
const tagKeys = way.keys.map((key) => {
|
|
76
|
+
const index = blockStringIndexMap.get(key);
|
|
77
|
+
if (index === undefined)
|
|
78
|
+
throw Error("Tag key not found");
|
|
79
|
+
return index;
|
|
80
|
+
});
|
|
81
|
+
const tagValues = way.vals.map((val) => {
|
|
82
|
+
const index = blockStringIndexMap.get(val);
|
|
83
|
+
if (index === undefined)
|
|
84
|
+
throw Error("Tag value not found");
|
|
85
|
+
return index;
|
|
86
|
+
});
|
|
87
|
+
this.tags.addTagKeysAndValues(tagKeys, tagValues);
|
|
88
|
+
added++;
|
|
89
|
+
}
|
|
90
|
+
return added;
|
|
91
|
+
}
|
|
92
|
+
buildEntityIndex() {
|
|
93
|
+
this.refStart.compact();
|
|
94
|
+
this.refCount.compact();
|
|
95
|
+
this.refs.compact();
|
|
96
|
+
}
|
|
97
|
+
buildSpatialIndex(nodeIndex) {
|
|
98
|
+
console.time("WayIndex.buildSpatialIndex");
|
|
99
|
+
this.spatialIndex = new Flatbush(this.size, 128, Float64Array, BufferConstructor);
|
|
100
|
+
for (let i = 0; i < this.size; i++) {
|
|
101
|
+
let minX = Number.POSITIVE_INFINITY;
|
|
102
|
+
let minY = Number.POSITIVE_INFINITY;
|
|
103
|
+
let maxX = Number.NEGATIVE_INFINITY;
|
|
104
|
+
let maxY = Number.NEGATIVE_INFINITY;
|
|
105
|
+
const start = this.refStart.at(i);
|
|
106
|
+
const count = this.refCount.at(i);
|
|
107
|
+
for (let j = start; j < start + count; j++) {
|
|
108
|
+
const refId = this.refs.at(j);
|
|
109
|
+
const [lon, lat] = nodeIndex.getNodeLonLat({ id: refId });
|
|
110
|
+
if (lon < minX)
|
|
111
|
+
minX = lon;
|
|
112
|
+
if (lon > maxX)
|
|
113
|
+
maxX = lon;
|
|
114
|
+
if (lat < minY)
|
|
115
|
+
minY = lat;
|
|
116
|
+
if (lat > maxY)
|
|
117
|
+
maxY = lat;
|
|
118
|
+
}
|
|
119
|
+
this.bbox.push(minX);
|
|
120
|
+
this.bbox.push(minY);
|
|
121
|
+
this.bbox.push(maxX);
|
|
122
|
+
this.bbox.push(maxY);
|
|
123
|
+
this.spatialIndex.add(minX, minY, maxX, maxY);
|
|
124
|
+
}
|
|
125
|
+
this.spatialIndex.finish();
|
|
126
|
+
console.timeEnd("WayIndex.buildSpatialIndex");
|
|
127
|
+
return this.spatialIndex;
|
|
128
|
+
}
|
|
129
|
+
getFullEntity(index, id, tags) {
|
|
130
|
+
return {
|
|
131
|
+
id,
|
|
132
|
+
refs: [...this.getRefIds(index)],
|
|
133
|
+
tags,
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
getRefIds(index) {
|
|
137
|
+
const start = this.refStart.at(index);
|
|
138
|
+
const count = this.refCount.at(index);
|
|
139
|
+
return this.refs.slice(start, start + count);
|
|
140
|
+
}
|
|
141
|
+
getBbox(idOrIndex) {
|
|
142
|
+
const index = "index" in idOrIndex ? idOrIndex.index : this.ids.idOrIndex(idOrIndex)[0];
|
|
143
|
+
return [
|
|
144
|
+
this.bbox.at(index * 4),
|
|
145
|
+
this.bbox.at(index * 4 + 1),
|
|
146
|
+
this.bbox.at(index * 4 + 2),
|
|
147
|
+
this.bbox.at(index * 4 + 3),
|
|
148
|
+
];
|
|
149
|
+
}
|
|
150
|
+
getLine(index, nodeIndex) {
|
|
151
|
+
const count = this.refCount.at(index);
|
|
152
|
+
const start = this.refStart.at(index);
|
|
153
|
+
const line = new Float64Array(count * 2);
|
|
154
|
+
for (let i = 0; i < count; i++) {
|
|
155
|
+
const ref = this.refs.at(start + i);
|
|
156
|
+
const [lon, lat] = nodeIndex.getNodeLonLat({ id: ref });
|
|
157
|
+
line[i * 2] = lon;
|
|
158
|
+
line[i * 2 + 1] = lat;
|
|
159
|
+
}
|
|
160
|
+
return line;
|
|
161
|
+
}
|
|
162
|
+
getCoordinates(index, nodeIndex) {
|
|
163
|
+
const count = this.refCount.at(index);
|
|
164
|
+
const start = this.refStart.at(index);
|
|
165
|
+
const coords = [];
|
|
166
|
+
for (let refIndex = start; refIndex < start + count; refIndex++) {
|
|
167
|
+
const ref = this.refs.at(refIndex);
|
|
168
|
+
const coord = nodeIndex.getNodeLonLat({ id: ref });
|
|
169
|
+
if (coord === undefined ||
|
|
170
|
+
coord[0] === undefined ||
|
|
171
|
+
coord[1] === undefined) {
|
|
172
|
+
console.error("node index has ref", nodeIndex.ids.has(ref));
|
|
173
|
+
throw Error(`Invalid coordinate for way id ${this.ids.at(index)}, index ${index}, node ref ${ref}, ref index ${refIndex}`);
|
|
174
|
+
}
|
|
175
|
+
coords.push(coord);
|
|
176
|
+
}
|
|
177
|
+
return coords;
|
|
178
|
+
}
|
|
179
|
+
intersects(bbox, filterFn) {
|
|
180
|
+
return this.spatialIndex.search(bbox[0], bbox[1], bbox[2], bbox[3], filterFn);
|
|
181
|
+
}
|
|
182
|
+
neighbors(x, y, maxResults, maxDistance) {
|
|
183
|
+
return this.spatialIndex.neighbors(x, y, maxResults, maxDistance);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
//# sourceMappingURL=ways.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ways.js","sourceRoot":"","sources":["../../src/ways.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"extract.bench.d.ts","sourceRoot":"","sources":["../../test/extract.bench.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { getFixtureFile } from "@osmix/shared/test/fixtures";
|
|
2
|
+
import { beforeAll, bench, describe } from "vitest";
|
|
3
|
+
import { Osmix } from "../src/osmix";
|
|
4
|
+
const MONACO_BBOX = [7.4053929, 43.7232244, 7.4447259, 43.7543687];
|
|
5
|
+
// const SEATTLE_BBOX: GeoBbox2D = [-122.33, 47.48, -122.29, 47.52]
|
|
6
|
+
const BBOX = MONACO_BBOX;
|
|
7
|
+
const PBF = "monaco.pbf";
|
|
8
|
+
let buffer;
|
|
9
|
+
beforeAll(async () => {
|
|
10
|
+
buffer = await getFixtureFile(PBF);
|
|
11
|
+
});
|
|
12
|
+
describe("simple extract benchmark", () => {
|
|
13
|
+
bench("two-step parse then extract", async () => {
|
|
14
|
+
const data = buffer.slice(0);
|
|
15
|
+
const full = await Osmix.fromPbf(data);
|
|
16
|
+
full.extract(BBOX);
|
|
17
|
+
});
|
|
18
|
+
bench("streaming extract during parse", async () => {
|
|
19
|
+
const data = buffer.slice(0);
|
|
20
|
+
await Osmix.fromPbf(data, { extractBbox: BBOX });
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
//# sourceMappingURL=extract.bench.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"extract.bench.js","sourceRoot":"","sources":["../../test/extract.bench.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,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,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,KAAK,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC5B,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;IACjD,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"extract.test.d.ts","sourceRoot":"","sources":["../../test/extract.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { getFixtureFileReadStream } from "@osmix/shared/test/fixtures";
|
|
2
|
+
import { assert, test } from "vitest";
|
|
3
|
+
import { Osmix } from "../src/osmix";
|
|
4
|
+
const TEST_BBOX = [-0.1, -0.1, 1, 1];
|
|
5
|
+
const SEATTLE_BBOX = [-122.463226, 47.469878, -122.180328, 47.82883];
|
|
6
|
+
function buildSourceOsm() {
|
|
7
|
+
const osm = new Osmix({ id: "source" });
|
|
8
|
+
osm.nodes.addNode({
|
|
9
|
+
id: 1,
|
|
10
|
+
lat: 0,
|
|
11
|
+
lon: 0,
|
|
12
|
+
tags: {
|
|
13
|
+
name: "inside-a",
|
|
14
|
+
},
|
|
15
|
+
});
|
|
16
|
+
osm.nodes.addNode({
|
|
17
|
+
id: 2,
|
|
18
|
+
lat: 0,
|
|
19
|
+
lon: 2,
|
|
20
|
+
tags: {
|
|
21
|
+
name: "outside-a",
|
|
22
|
+
},
|
|
23
|
+
});
|
|
24
|
+
osm.nodes.addNode({
|
|
25
|
+
id: 3,
|
|
26
|
+
lat: 0.5,
|
|
27
|
+
lon: 0.5,
|
|
28
|
+
});
|
|
29
|
+
osm.nodes.addNode({
|
|
30
|
+
id: 4,
|
|
31
|
+
lat: 0.5,
|
|
32
|
+
lon: 1.5,
|
|
33
|
+
});
|
|
34
|
+
osm.ways.addWay({
|
|
35
|
+
id: 10,
|
|
36
|
+
refs: [1, 2],
|
|
37
|
+
tags: {
|
|
38
|
+
highway: "residential",
|
|
39
|
+
},
|
|
40
|
+
});
|
|
41
|
+
osm.ways.addWay({
|
|
42
|
+
id: 11,
|
|
43
|
+
refs: [3, 4],
|
|
44
|
+
tags: {
|
|
45
|
+
highway: "service",
|
|
46
|
+
},
|
|
47
|
+
});
|
|
48
|
+
osm.relations.addRelation({
|
|
49
|
+
id: 20,
|
|
50
|
+
members: [
|
|
51
|
+
{
|
|
52
|
+
type: "way",
|
|
53
|
+
ref: 10,
|
|
54
|
+
role: "outer",
|
|
55
|
+
},
|
|
56
|
+
],
|
|
57
|
+
tags: {
|
|
58
|
+
type: "multipolygon",
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
osm.buildIndexes();
|
|
62
|
+
return osm;
|
|
63
|
+
}
|
|
64
|
+
test("extract a BBOX while reading a PBF", async () => {
|
|
65
|
+
const source = buildSourceOsm();
|
|
66
|
+
const transform = new TransformStream();
|
|
67
|
+
const extract = new Osmix();
|
|
68
|
+
const extractPromise = extract.readPbf(transform.readable, {
|
|
69
|
+
extractBbox: TEST_BBOX,
|
|
70
|
+
});
|
|
71
|
+
await source.toPbfStream().pipeTo(transform.writable);
|
|
72
|
+
await extractPromise;
|
|
73
|
+
assert.equal(extract.nodes.size, 2);
|
|
74
|
+
assert.isTrue(extract.nodes.ids.has(1));
|
|
75
|
+
assert.isTrue(extract.nodes.ids.has(3));
|
|
76
|
+
assert.isNotTrue(extract.nodes.ids.has(2));
|
|
77
|
+
assert.isNotTrue(extract.nodes.ids.has(4));
|
|
78
|
+
const truncatedWay = extract.ways.getById(10);
|
|
79
|
+
assert.exists(truncatedWay);
|
|
80
|
+
assert.deepEqual(truncatedWay?.refs, [1]);
|
|
81
|
+
assert.isTrue(extract.ways.ids.has(11));
|
|
82
|
+
assert.isTrue(extract.relations.ids.has(20));
|
|
83
|
+
});
|
|
84
|
+
test("extract a BBOX after reading a PBF", async () => {
|
|
85
|
+
const source = buildSourceOsm();
|
|
86
|
+
const buffer = await source.toPbfBuffer();
|
|
87
|
+
const streaming = new Osmix();
|
|
88
|
+
await streaming.readPbf(new Uint8Array(buffer.slice(0)), {
|
|
89
|
+
extractBbox: TEST_BBOX,
|
|
90
|
+
});
|
|
91
|
+
const twoStepOsmix = new Osmix();
|
|
92
|
+
await twoStepOsmix.readPbf(new Uint8Array(buffer.slice(0)));
|
|
93
|
+
const twoStep = twoStepOsmix.extract(TEST_BBOX);
|
|
94
|
+
assert.equal(streaming.nodes.size, twoStep.nodes.size);
|
|
95
|
+
assert.equal(streaming.ways.size, twoStep.ways.size);
|
|
96
|
+
assert.equal(streaming.relations.size, twoStep.relations.size);
|
|
97
|
+
assert.deepEqual(Array.from(streaming.nodes.ids.sorted), Array.from(twoStep.nodes.ids.sorted));
|
|
98
|
+
assert.deepEqual(Array.from(streaming.ways.ids.sorted), Array.from(twoStep.ways.ids.sorted));
|
|
99
|
+
assert.deepEqual(Array.from(streaming.relations.ids.sorted), Array.from(twoStep.relations.ids.sorted));
|
|
100
|
+
for (const nodeId of streaming.nodes.ids.sorted) {
|
|
101
|
+
const streamingNode = streaming.nodes.getById(nodeId);
|
|
102
|
+
const twoStepNode = twoStep.nodes.getById(nodeId);
|
|
103
|
+
assert.deepEqual(streamingNode, twoStepNode);
|
|
104
|
+
}
|
|
105
|
+
for (const wayId of streaming.ways.ids.sorted) {
|
|
106
|
+
const streamingWay = streaming.ways.getById(wayId);
|
|
107
|
+
const twoStepWay = twoStep.ways.getById(wayId);
|
|
108
|
+
assert.deepEqual(streamingWay, twoStepWay);
|
|
109
|
+
}
|
|
110
|
+
for (const relationId of streaming.relations.ids.sorted) {
|
|
111
|
+
const streamingRelation = streaming.relations.getById(relationId);
|
|
112
|
+
const twoStepRelation = twoStep.relations.getById(relationId);
|
|
113
|
+
assert.deepEqual(streamingRelation, twoStepRelation);
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
test.skip("extract from a large PBF", { timeout: 500_000 }, async () => {
|
|
117
|
+
const seattle = new Osmix({ logger: console.error });
|
|
118
|
+
await seattle.readPbf(getFixtureFileReadStream("usa.pbf"), {
|
|
119
|
+
extractBbox: SEATTLE_BBOX,
|
|
120
|
+
});
|
|
121
|
+
assert.deepEqual({
|
|
122
|
+
nodes: seattle.nodes.size,
|
|
123
|
+
ways: seattle.ways.size,
|
|
124
|
+
relations: seattle.relations.size,
|
|
125
|
+
}, { nodes: 802_541, ways: 241_248, relations: 3_622 });
|
|
126
|
+
});
|
|
127
|
+
//# sourceMappingURL=extract.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"extract.test.js","sourceRoot":"","sources":["../../test/extract.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Osmix } from "../src/osmix";
|
|
2
|
+
/**
|
|
3
|
+
* Create a base OSM with one way and two nodes.
|
|
4
|
+
*/
|
|
5
|
+
export declare function createBaseOsm(): Osmix;
|
|
6
|
+
/**
|
|
7
|
+
* Create a patch OSM with:
|
|
8
|
+
* - The same way as the base OSM, with new tags
|
|
9
|
+
* - A way that has an overlapping node with the first way, but does not share a node and so starts disconnected
|
|
10
|
+
* - A way that crosses over the first way, but does not share a node and so starts disconnected
|
|
11
|
+
*/
|
|
12
|
+
export declare function createPatchOsm(): Osmix;
|
|
13
|
+
//# sourceMappingURL=mock-osm.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mock-osm.d.ts","sourceRoot":"","sources":["../../test/mock-osm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAmCpC;;GAEG;AACH,wBAAgB,aAAa,IAAI,KAAK,CAOrC;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,IAAI,KAAK,CAqFtC"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import { Osmix } from "../src/osmix";
|
|
2
|
+
const YAKIM_LAT = 46.60207;
|
|
3
|
+
const YAKIM_LON = -120.505898;
|
|
4
|
+
const ONE_KM_LON = 0.0131; // approximately
|
|
5
|
+
const ONE_KM_LAT = 0.009;
|
|
6
|
+
const node0 = {
|
|
7
|
+
id: 0,
|
|
8
|
+
lat: YAKIM_LAT,
|
|
9
|
+
lon: YAKIM_LON,
|
|
10
|
+
};
|
|
11
|
+
const node1 = {
|
|
12
|
+
id: 1,
|
|
13
|
+
lat: YAKIM_LAT,
|
|
14
|
+
lon: YAKIM_LON - ONE_KM_LON, // approximately 1km west
|
|
15
|
+
};
|
|
16
|
+
function addBaseNodes(osm) {
|
|
17
|
+
osm.nodes.addNode(node0);
|
|
18
|
+
osm.nodes.addNode(node1);
|
|
19
|
+
}
|
|
20
|
+
function addBaseWays(osm) {
|
|
21
|
+
osm.ways.addWay({
|
|
22
|
+
id: 1,
|
|
23
|
+
refs: [0, 1],
|
|
24
|
+
tags: {
|
|
25
|
+
highway: "primary",
|
|
26
|
+
},
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Create a base OSM with one way and two nodes.
|
|
31
|
+
*/
|
|
32
|
+
export function createBaseOsm() {
|
|
33
|
+
const base = new Osmix();
|
|
34
|
+
addBaseNodes(base);
|
|
35
|
+
base.nodes.buildIndex();
|
|
36
|
+
addBaseWays(base);
|
|
37
|
+
base.buildIndexes();
|
|
38
|
+
return base;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Create a patch OSM with:
|
|
42
|
+
* - The same way as the base OSM, with new tags
|
|
43
|
+
* - A way that has an overlapping node with the first way, but does not share a node and so starts disconnected
|
|
44
|
+
* - A way that crosses over the first way, but does not share a node and so starts disconnected
|
|
45
|
+
*/
|
|
46
|
+
export function createPatchOsm() {
|
|
47
|
+
const osm = new Osmix();
|
|
48
|
+
addBaseNodes(osm);
|
|
49
|
+
// Add way the connects with base way node 0 (will replace it)
|
|
50
|
+
osm.nodes.addNode({
|
|
51
|
+
...node0,
|
|
52
|
+
id: 2,
|
|
53
|
+
tags: {
|
|
54
|
+
crossing: "yes",
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
osm.nodes.addNode({
|
|
58
|
+
...node1,
|
|
59
|
+
id: 3,
|
|
60
|
+
lon: YAKIM_LON + ONE_KM_LON, // ends 1km east of the center point
|
|
61
|
+
});
|
|
62
|
+
// Add nodes for disconnected way
|
|
63
|
+
osm.nodes.addNode({
|
|
64
|
+
id: 4,
|
|
65
|
+
lat: YAKIM_LAT - ONE_KM_LAT, // 1km south
|
|
66
|
+
lon: YAKIM_LON + ONE_KM_LON / 4, // 250m east
|
|
67
|
+
});
|
|
68
|
+
osm.nodes.addNode({
|
|
69
|
+
id: 5,
|
|
70
|
+
lat: YAKIM_LAT + ONE_KM_LAT, // 1km north
|
|
71
|
+
lon: YAKIM_LON + ONE_KM_LON / 4, // 250m east
|
|
72
|
+
});
|
|
73
|
+
// Add nodes for crossing way
|
|
74
|
+
osm.nodes.addNode({
|
|
75
|
+
id: 6,
|
|
76
|
+
lat: YAKIM_LAT - ONE_KM_LAT, // 1km south
|
|
77
|
+
lon: YAKIM_LON + ONE_KM_LON / 2, // 500m east
|
|
78
|
+
});
|
|
79
|
+
osm.nodes.addNode({
|
|
80
|
+
id: 7,
|
|
81
|
+
lat: YAKIM_LAT + ONE_KM_LAT, // 1km north
|
|
82
|
+
lon: YAKIM_LON + ONE_KM_LON / 2, // 500m east
|
|
83
|
+
});
|
|
84
|
+
osm.nodes.buildIndex();
|
|
85
|
+
// Add same base way with new tags
|
|
86
|
+
osm.ways.addWay({
|
|
87
|
+
id: 1,
|
|
88
|
+
refs: [0, 1],
|
|
89
|
+
tags: {
|
|
90
|
+
highway: "primary",
|
|
91
|
+
version: "2",
|
|
92
|
+
},
|
|
93
|
+
});
|
|
94
|
+
// Add way that overlaps with base way node 1. Node should be de-duplicated.
|
|
95
|
+
osm.ways.addWay({
|
|
96
|
+
id: 2,
|
|
97
|
+
refs: [2, 3],
|
|
98
|
+
tags: {
|
|
99
|
+
highway: "secondary",
|
|
100
|
+
},
|
|
101
|
+
});
|
|
102
|
+
// Add way that crosses way 2, and should generate 1 intersection.
|
|
103
|
+
osm.ways.addWay({
|
|
104
|
+
id: 3,
|
|
105
|
+
refs: [4, 5],
|
|
106
|
+
tags: {
|
|
107
|
+
highway: "primary",
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
// Add a way that crosses way 2, but has a tag indicating it is an underpass and should be left alone
|
|
111
|
+
osm.ways.addWay({
|
|
112
|
+
id: 4,
|
|
113
|
+
refs: [6, 7],
|
|
114
|
+
tags: {
|
|
115
|
+
highway: "underpass",
|
|
116
|
+
tunnel: "yes",
|
|
117
|
+
},
|
|
118
|
+
});
|
|
119
|
+
osm.buildIndexes();
|
|
120
|
+
return osm;
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=mock-osm.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mock-osm.js","sourceRoot":"","sources":["../../test/mock-osm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAEpC,MAAM,SAAS,GAAG,QAAQ,CAAA;AAC1B,MAAM,SAAS,GAAG,CAAC,UAAU,CAAA;AAE7B,MAAM,UAAU,GAAG,MAAM,CAAA,CAAC,gBAAgB;AAC1C,MAAM,UAAU,GAAG,KAAK,CAAA;AAExB,MAAM,KAAK,GAAY;IACtB,EAAE,EAAE,CAAC;IACL,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;CACd,CAAA;AAED,MAAM,KAAK,GAAY;IACtB,EAAE,EAAE,CAAC;IACL,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS,GAAG,UAAU,EAAE,yBAAyB;CACtD,CAAA;AAED,SAAS,YAAY,CAAC,GAAU;IAC/B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACxB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AACzB,CAAC;AAED,SAAS,WAAW,CAAC,GAAU;IAC9B,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QACf,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,IAAI,EAAE;YACL,OAAO,EAAE,SAAS;SAClB;KACD,CAAC,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa;IAC5B,MAAM,IAAI,GAAG,IAAI,KAAK,EAAE,CAAA;IACxB,YAAY,CAAC,IAAI,CAAC,CAAA;IAClB,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAA;IACvB,WAAW,CAAC,IAAI,CAAC,CAAA;IACjB,IAAI,CAAC,YAAY,EAAE,CAAA;IACnB,OAAO,IAAI,CAAA;AACZ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc;IAC7B,MAAM,GAAG,GAAG,IAAI,KAAK,EAAE,CAAA;IAEvB,YAAY,CAAC,GAAG,CAAC,CAAA;IAEjB,8DAA8D;IAC9D,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QACjB,GAAG,KAAK;QACR,EAAE,EAAE,CAAC;QACL,IAAI,EAAE;YACL,QAAQ,EAAE,KAAK;SACf;KACD,CAAC,CAAA;IACF,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QACjB,GAAG,KAAK;QACR,EAAE,EAAE,CAAC;QACL,GAAG,EAAE,SAAS,GAAG,UAAU,EAAE,oCAAoC;KACjE,CAAC,CAAA;IAEF,iCAAiC;IACjC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QACjB,EAAE,EAAE,CAAC;QACL,GAAG,EAAE,SAAS,GAAG,UAAU,EAAE,YAAY;QACzC,GAAG,EAAE,SAAS,GAAG,UAAU,GAAG,CAAC,EAAE,YAAY;KAC7C,CAAC,CAAA;IACF,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QACjB,EAAE,EAAE,CAAC;QACL,GAAG,EAAE,SAAS,GAAG,UAAU,EAAE,YAAY;QACzC,GAAG,EAAE,SAAS,GAAG,UAAU,GAAG,CAAC,EAAE,YAAY;KAC7C,CAAC,CAAA;IAEF,6BAA6B;IAC7B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QACjB,EAAE,EAAE,CAAC;QACL,GAAG,EAAE,SAAS,GAAG,UAAU,EAAE,YAAY;QACzC,GAAG,EAAE,SAAS,GAAG,UAAU,GAAG,CAAC,EAAE,YAAY;KAC7C,CAAC,CAAA;IACF,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QACjB,EAAE,EAAE,CAAC;QACL,GAAG,EAAE,SAAS,GAAG,UAAU,EAAE,YAAY;QACzC,GAAG,EAAE,SAAS,GAAG,UAAU,GAAG,CAAC,EAAE,YAAY;KAC7C,CAAC,CAAA;IAEF,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,CAAA;IAEtB,kCAAkC;IAClC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QACf,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,IAAI,EAAE;YACL,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,GAAG;SACZ;KACD,CAAC,CAAA;IAEF,4EAA4E;IAC5E,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QACf,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,IAAI,EAAE;YACL,OAAO,EAAE,WAAW;SACpB;KACD,CAAC,CAAA;IAEF,kEAAkE;IAClE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QACf,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,IAAI,EAAE;YACL,OAAO,EAAE,SAAS;SAClB;KACD,CAAC,CAAA;IAEF,qGAAqG;IACrG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QACf,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,IAAI,EAAE;YACL,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,KAAK;SACb;KACD,CAAC,CAAA;IAEF,GAAG,CAAC,YAAY,EAAE,CAAA;IAClB,OAAO,GAAG,CAAA;AACX,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read.test.d.ts","sourceRoot":"","sources":["../../test/read.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { getFixtureFile, getFixtureFileReadStream, PBFs, } from "@osmix/shared/test/fixtures";
|
|
2
|
+
import { assert, beforeAll, describe, it } from "vitest";
|
|
3
|
+
import { Osmix } from "../src/osmix";
|
|
4
|
+
describe("read", () => {
|
|
5
|
+
describe.each(Object.entries(PBFs))("%s", async (name, pbf) => {
|
|
6
|
+
beforeAll(() => getFixtureFile(pbf.url));
|
|
7
|
+
it("into OSM class", async () => {
|
|
8
|
+
const fileStream = getFixtureFileReadStream(pbf.url);
|
|
9
|
+
const osm = await Osmix.fromPbf(fileStream, { id: name });
|
|
10
|
+
assert.equal(osm.nodes.size, pbf.nodes);
|
|
11
|
+
assert.equal(osm.stringTable.length, pbf.uniqueStrings);
|
|
12
|
+
assert.deepEqual(osm.nodes.getByIndex(0), pbf.node0);
|
|
13
|
+
assert.equal(osm.ways.size, pbf.ways);
|
|
14
|
+
});
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
//# sourceMappingURL=read.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read.test.js","sourceRoot":"","sources":["../../test/read.test.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,cAAc,EACd,wBAAwB,EACxB,IAAI,GACJ,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAEpC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACrB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAC7D,SAAS,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;QAExC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;YAC/B,MAAM,UAAU,GAAG,wBAAwB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACpD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YACzD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;YACvC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,aAAa,CAAC,CAAA;YACvD,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;YACpD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QACtC,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
|