@osmix/shapefile 0.0.3 → 0.0.6

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 CHANGED
@@ -1,5 +1,31 @@
1
1
  # @osmix/shapefile
2
2
 
3
+ ## 0.0.6
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [12728ed]
8
+ - @osmix/shared@0.0.10
9
+ - @osmix/core@0.1.5
10
+
11
+ ## 0.0.5
12
+
13
+ ### Patch Changes
14
+
15
+ - f32e4ee: General cleanup
16
+ - Updated dependencies [f32e4ee]
17
+ - @osmix/core@0.1.4
18
+ - @osmix/shared@0.0.9
19
+
20
+ ## 0.0.4
21
+
22
+ ### Patch Changes
23
+
24
+ - f468db5: Fix publishing (2)
25
+ - Updated dependencies [f468db5]
26
+ - @osmix/core@0.1.3
27
+ - @osmix/shared@0.0.8
28
+
3
29
  ## 0.0.3
4
30
 
5
31
  ### Patch Changes
package/dist/utils.js CHANGED
@@ -57,8 +57,10 @@ async function streamToArrayBuffer(stream) {
57
57
  const { done, value } = await reader.read();
58
58
  if (done)
59
59
  break;
60
- chunks.push(value);
61
- totalLength += value.byteLength;
60
+ if (value !== undefined) {
61
+ chunks.push(value);
62
+ totalLength += value.byteLength;
63
+ }
62
64
  }
63
65
  const result = new Uint8Array(totalLength);
64
66
  let offset = 0;
package/dist/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC;;;GAGG;AAGH,OAAO,GAAG,MAAM,OAAO,CAAA;AAGvB;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CACnC,IAA4B;IAE5B,IAAI,IAAI,IAAI,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;IAEjD,IAAI,KAA+B,CAAA;IAEnC,wCAAwC;IACxC,IAAI,IAAI,YAAY,cAAc,EAAE,CAAC;QACpC,KAAK,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACxC,CAAC;SAAM,IAAI,IAAI,YAAY,iBAAiB,EAAE,CAAC;QAC9C,mDAAmD;QACnD,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7C,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;QAC9C,KAAK,GAAG,IAAI,CAAA;IACb,CAAC;SAAM,CAAC;QACP,KAAK,GAAG,IAAI,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAgB,MAAM,GAAG,CAAC,KAAK,CAAC,CAAA;IAE5C,qBAAqB;IACrB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAA;IACd,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,CAAA;AAChB,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,mBAAmB,CACjC,MAAsB;IAEtB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;IACjC,MAAM,MAAM,GAAiB,EAAE,CAAA;IAC/B,IAAI,WAAW,GAAG,CAAC,CAAA;IAEnB,OAAO,IAAI,EAAE,CAAC;QACb,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;QAC3C,IAAI,IAAI;YAAE,MAAK;QACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAClB,WAAW,IAAI,KAAK,CAAC,UAAU,CAAA;IAChC,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,CAAA;IAC1C,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QACzB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAA;IAC3B,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAA;AACrB,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC;;;GAGG;AAGH,OAAO,GAAG,MAAM,OAAO,CAAA;AAGvB;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CACnC,IAA4B;IAE5B,IAAI,IAAI,IAAI,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;IAEjD,IAAI,KAA+B,CAAA;IAEnC,wCAAwC;IACxC,IAAI,IAAI,YAAY,cAAc,EAAE,CAAC;QACpC,KAAK,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACxC,CAAC;SAAM,IAAI,IAAI,YAAY,iBAAiB,EAAE,CAAC;QAC9C,mDAAmD;QACnD,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7C,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;QAC9C,KAAK,GAAG,IAAI,CAAA;IACb,CAAC;SAAM,CAAC;QACP,KAAK,GAAG,IAAI,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAgB,MAAM,GAAG,CAAC,KAAK,CAAC,CAAA;IAE5C,qBAAqB;IACrB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAA;IACd,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,CAAA;AAChB,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,mBAAmB,CACjC,MAAsB;IAEtB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;IACjC,MAAM,MAAM,GAAiB,EAAE,CAAA;IAC/B,IAAI,WAAW,GAAG,CAAC,CAAA;IAEnB,OAAO,IAAI,EAAE,CAAC;QACb,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;QAC3C,IAAI,IAAI;YAAE,MAAK;QACf,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YAClB,WAAW,IAAI,KAAK,CAAC,UAAU,CAAA;QAChC,CAAC;IACF,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,CAAA;IAC1C,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QACzB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAA;IAC3B,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAA;AACrB,CAAC"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "$schema": "https://json.schemastore.org/package",
3
3
  "name": "@osmix/shapefile",
4
4
  "description": "Import Shapefiles into Osmix indexes.",
5
- "version": "0.0.3",
5
+ "version": "0.0.6",
6
6
  "type": "module",
7
7
  "main": "./src/index.ts",
8
8
  "types": "./src/index.ts",
@@ -47,8 +47,8 @@
47
47
  "typescript": "^5.9.0"
48
48
  },
49
49
  "dependencies": {
50
- "@osmix/core": "0.1.2",
51
- "@osmix/shared": "0.0.7",
50
+ "@osmix/core": "0.1.5",
51
+ "@osmix/shared": "0.0.10",
52
52
  "@placemarkio/geojson-rewind": "^1.0.3",
53
53
  "shpjs": "^6.2.0"
54
54
  }
package/src/utils.ts CHANGED
@@ -67,8 +67,10 @@ async function streamToArrayBuffer(
67
67
  while (true) {
68
68
  const { done, value } = await reader.read()
69
69
  if (done) break
70
- chunks.push(value)
71
- totalLength += value.byteLength
70
+ if (value !== undefined) {
71
+ chunks.push(value)
72
+ totalLength += value.byteLength
73
+ }
72
74
  }
73
75
 
74
76
  const result = new Uint8Array(totalLength)
@@ -1,33 +0,0 @@
1
- /**
2
- * @osmix/shapefile - Import Shapefiles into Osmix indexes.
3
- *
4
- * Provides Shapefile import functionality for Osmix using shpjs:
5
- * - **Import**: Build an Osm index from Shapefile data (ZIP archive or URL).
6
- *
7
- * Shapefiles are first parsed to GeoJSON by shpjs (with automatic projection
8
- * to WGS84), then converted to OSM entities:
9
- * - Point/MultiPoint → Node(s)
10
- * - LineString/MultiLineString → Way(s)
11
- * - Polygon → Way or Relation (based on ring count)
12
- * - MultiPolygon → Relation
13
- *
14
- * @example
15
- * ```ts
16
- * // Import Shapefile to Osm index
17
- * import { fromShapefile } from "@osmix/shapefile"
18
- *
19
- * const zipBuffer = await Bun.file('./buildings.zip').arrayBuffer()
20
- * const osm = await fromShapefile(zipBuffer, { id: "buildings" })
21
- *
22
- * // Or from URL
23
- * const osm = await fromShapefile('https://example.com/data.zip')
24
- *
25
- * // Query the imported data
26
- * const buildings = osm.ways.search("building")
27
- * ```
28
- *
29
- * @module @osmix/shapefile
30
- */
31
- export * from "./osm-from-shapefile";
32
- export * from "./types";
33
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,cAAc,sBAAsB,CAAA;AACpC,cAAc,SAAS,CAAA"}
package/dist/src/index.js DELETED
@@ -1,33 +0,0 @@
1
- /**
2
- * @osmix/shapefile - Import Shapefiles into Osmix indexes.
3
- *
4
- * Provides Shapefile import functionality for Osmix using shpjs:
5
- * - **Import**: Build an Osm index from Shapefile data (ZIP archive or URL).
6
- *
7
- * Shapefiles are first parsed to GeoJSON by shpjs (with automatic projection
8
- * to WGS84), then converted to OSM entities:
9
- * - Point/MultiPoint → Node(s)
10
- * - LineString/MultiLineString → Way(s)
11
- * - Polygon → Way or Relation (based on ring count)
12
- * - MultiPolygon → Relation
13
- *
14
- * @example
15
- * ```ts
16
- * // Import Shapefile to Osm index
17
- * import { fromShapefile } from "@osmix/shapefile"
18
- *
19
- * const zipBuffer = await Bun.file('./buildings.zip').arrayBuffer()
20
- * const osm = await fromShapefile(zipBuffer, { id: "buildings" })
21
- *
22
- * // Or from URL
23
- * const osm = await fromShapefile('https://example.com/data.zip')
24
- *
25
- * // Query the imported data
26
- * const buildings = osm.ways.search("building")
27
- * ```
28
- *
29
- * @module @osmix/shapefile
30
- */
31
- export * from "./osm-from-shapefile";
32
- export * from "./types";
33
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,cAAc,sBAAsB,CAAA;AACpC,cAAc,SAAS,CAAA"}
@@ -1,67 +0,0 @@
1
- /**
2
- * Shapefile-to-OSM conversion utilities.
3
- *
4
- * Imports Shapefiles into Osm indexes by first parsing them to GeoJSON
5
- * using shpjs, then converting the GeoJSON to OSM entities.
6
- *
7
- * @module
8
- */
9
- import { Osm, type OsmOptions } from "@osmix/core";
10
- import { type ProgressEvent } from "@osmix/shared/progress";
11
- import type { FeatureCollection } from "geojson";
12
- import type { ReadShapefileDataTypes } from "./types";
13
- /**
14
- * Create an Osm index from Shapefile data.
15
- *
16
- * Parses Shapefiles using shpjs (which returns GeoJSON) and converts
17
- * the features to OSM entities:
18
- * - Point → Node
19
- * - LineString/MultiLineString → Way(s) with nodes
20
- * - Polygon → Way (simple) or Relation (with holes)
21
- * - MultiPolygon → Relation
22
- *
23
- * Feature properties become OSM tags.
24
- *
25
- * @param data - Shapefile data (URL string or ArrayBuffer of ZIP).
26
- * @param options - Osm index options (id, header).
27
- * @param onProgress - Progress callback for UI feedback.
28
- * @returns Populated Osm index with built indexes.
29
- *
30
- * @example
31
- * ```ts
32
- * import { fromShapefile } from "@osmix/shapefile"
33
- *
34
- * // From file
35
- * const zipBuffer = await Bun.file('./buildings.zip').arrayBuffer()
36
- * const osm = await fromShapefile(zipBuffer, { id: "buildings" })
37
- *
38
- * // From URL
39
- * const osm = await fromShapefile('https://example.com/data.zip')
40
- *
41
- * // Query the imported data
42
- * const buildings = osm.ways.search("building")
43
- * ```
44
- */
45
- export declare function fromShapefile(data: ReadShapefileDataTypes, options?: Partial<OsmOptions>, onProgress?: (progress: ProgressEvent) => void): Promise<Osm>;
46
- /**
47
- * Generator that converts GeoJSON features from a shapefile to OSM entities.
48
- *
49
- * This is the core conversion logic, yielding progress events as features
50
- * are processed.
51
- *
52
- * Geometry mapping:
53
- * - **Point**: Creates a single node with feature properties as tags.
54
- * - **MultiPoint**: Creates multiple nodes.
55
- * - **LineString**: Creates nodes for each coordinate, then a way referencing them.
56
- * - **MultiLineString**: Creates multiple ways.
57
- * - **Polygon**: Creates a way for simple polygons; for polygons with holes,
58
- * creates separate ways for outer and inner rings plus a multipolygon relation.
59
- * - **MultiPolygon**: Creates a multipolygon relation with all rings as way members.
60
- *
61
- * @param osm - Target Osm index to populate.
62
- * @param geojson - Parsed GeoJSON FeatureCollection from shapefile.
63
- * @param name - Name for progress reporting.
64
- * @yields Progress events during conversion.
65
- */
66
- export declare function startCreateOsmFromShapefile(osm: Osm, geojson: FeatureCollection, name: string): Generator<ProgressEvent>;
67
- //# sourceMappingURL=osm-from-shapefile.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"osm-from-shapefile.d.ts","sourceRoot":"","sources":["../../src/osm-from-shapefile.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,GAAG,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAEN,KAAK,aAAa,EAElB,MAAM,wBAAwB,CAAA;AAG/B,OAAO,KAAK,EAEX,iBAAiB,EAKjB,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAA;AAGrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAsB,aAAa,CAClC,IAAI,EAAE,sBAAsB,EAC5B,OAAO,GAAE,OAAO,CAAC,UAAU,CAAM,EACjC,UAAU,GAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,IAAkB,GACzD,OAAO,CAAC,GAAG,CAAC,CAmBd;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAiB,2BAA2B,CAC3C,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,MAAM,GACV,SAAS,CAAC,aAAa,CAAC,CAiK1B"}
@@ -1,335 +0,0 @@
1
- /**
2
- * Shapefile-to-OSM conversion utilities.
3
- *
4
- * Imports Shapefiles into Osm indexes by first parsing them to GeoJSON
5
- * using shpjs, then converting the GeoJSON to OSM entities.
6
- *
7
- * @module
8
- */
9
- import { Osm } from "@osmix/core";
10
- import { logProgress, progressEvent, } from "@osmix/shared/progress";
11
- import { rewindFeature } from "@placemarkio/geojson-rewind";
12
- import { parseShapefile } from "./utils";
13
- /**
14
- * Create an Osm index from Shapefile data.
15
- *
16
- * Parses Shapefiles using shpjs (which returns GeoJSON) and converts
17
- * the features to OSM entities:
18
- * - Point → Node
19
- * - LineString/MultiLineString → Way(s) with nodes
20
- * - Polygon → Way (simple) or Relation (with holes)
21
- * - MultiPolygon → Relation
22
- *
23
- * Feature properties become OSM tags.
24
- *
25
- * @param data - Shapefile data (URL string or ArrayBuffer of ZIP).
26
- * @param options - Osm index options (id, header).
27
- * @param onProgress - Progress callback for UI feedback.
28
- * @returns Populated Osm index with built indexes.
29
- *
30
- * @example
31
- * ```ts
32
- * import { fromShapefile } from "@osmix/shapefile"
33
- *
34
- * // From file
35
- * const zipBuffer = await Bun.file('./buildings.zip').arrayBuffer()
36
- * const osm = await fromShapefile(zipBuffer, { id: "buildings" })
37
- *
38
- * // From URL
39
- * const osm = await fromShapefile('https://example.com/data.zip')
40
- *
41
- * // Query the imported data
42
- * const buildings = osm.ways.search("building")
43
- * ```
44
- */
45
- export async function fromShapefile(data, options = {}, onProgress = logProgress) {
46
- const osm = new Osm(options);
47
- onProgress(progressEvent("Parsing Shapefile..."));
48
- const collections = await parseShapefile(data);
49
- for (const collection of collections) {
50
- const name = collection.fileName ?? "shapefile";
51
- for (const update of startCreateOsmFromShapefile(osm, collection, name)) {
52
- onProgress(update);
53
- }
54
- }
55
- // Build indexes after all collections are processed
56
- onProgress(progressEvent("Building indexes..."));
57
- osm.buildIndexes();
58
- osm.buildSpatialIndexes();
59
- return osm;
60
- }
61
- /**
62
- * Generator that converts GeoJSON features from a shapefile to OSM entities.
63
- *
64
- * This is the core conversion logic, yielding progress events as features
65
- * are processed.
66
- *
67
- * Geometry mapping:
68
- * - **Point**: Creates a single node with feature properties as tags.
69
- * - **MultiPoint**: Creates multiple nodes.
70
- * - **LineString**: Creates nodes for each coordinate, then a way referencing them.
71
- * - **MultiLineString**: Creates multiple ways.
72
- * - **Polygon**: Creates a way for simple polygons; for polygons with holes,
73
- * creates separate ways for outer and inner rings plus a multipolygon relation.
74
- * - **MultiPolygon**: Creates a multipolygon relation with all rings as way members.
75
- *
76
- * @param osm - Target Osm index to populate.
77
- * @param geojson - Parsed GeoJSON FeatureCollection from shapefile.
78
- * @param name - Name for progress reporting.
79
- * @yields Progress events during conversion.
80
- */
81
- export function* startCreateOsmFromShapefile(osm, geojson, name) {
82
- yield progressEvent(`Converting "${name}" to Osmix...`);
83
- // Map to track nodes by coordinate string for reuse when creating ways and relations
84
- const nodeMap = new Map();
85
- let nextNodeId = osm.nodes.size > 0 ? -osm.nodes.size - 1 : -1;
86
- let nextWayId = osm.ways.size > 0 ? -osm.ways.size - 1 : -1;
87
- let nextRelationId = osm.relations.size > 0 ? -osm.relations.size - 1 : -1;
88
- // Helper to get or create a node for a coordinate
89
- const getOrCreateNode = (lon, lat) => {
90
- const coordKey = `${lon},${lat}`;
91
- const existingNodeId = nodeMap.get(coordKey);
92
- if (existingNodeId !== undefined) {
93
- return existingNodeId;
94
- }
95
- const nodeId = nextNodeId--;
96
- nodeMap.set(coordKey, nodeId);
97
- osm.nodes.addNode({
98
- id: nodeId,
99
- lon,
100
- lat,
101
- });
102
- return nodeId;
103
- };
104
- // Process each feature
105
- let count = 0;
106
- for (const feature of geojson.features) {
107
- const geometry = feature.geometry;
108
- if (!geometry)
109
- continue;
110
- // Normalize winding order for polygons
111
- const normalizedFeature = geometry.type === "Polygon" || geometry.type === "MultiPolygon"
112
- ? rewindFeature(feature)
113
- : feature;
114
- const tags = propertiesToTags(normalizedFeature.properties);
115
- const featureId = extractFeatureId(normalizedFeature.id);
116
- const geomType = normalizedFeature.geometry?.type;
117
- if (geomType === "Point") {
118
- const coords = normalizedFeature.geometry.coordinates;
119
- const [lon, lat] = coords;
120
- if (lon === undefined || lat === undefined)
121
- continue;
122
- const nodeId = featureId ?? nextNodeId--;
123
- osm.nodes.addNode({
124
- id: nodeId,
125
- lon,
126
- lat,
127
- tags,
128
- });
129
- nodeMap.set(`${lon},${lat}`, nodeId);
130
- }
131
- else if (geomType === "MultiPoint") {
132
- const coords = normalizedFeature.geometry
133
- .coordinates;
134
- for (const [lon, lat] of coords) {
135
- if (lon === undefined || lat === undefined)
136
- continue;
137
- const nodeId = nextNodeId--;
138
- osm.nodes.addNode({
139
- id: nodeId,
140
- lon,
141
- lat,
142
- tags,
143
- });
144
- nodeMap.set(`${lon},${lat}`, nodeId);
145
- }
146
- }
147
- else if (geomType === "LineString") {
148
- const coords = normalizedFeature.geometry.coordinates;
149
- if (coords.length < 2)
150
- continue;
151
- const nodeRefs = [];
152
- for (const [lon, lat] of coords) {
153
- if (lon === undefined || lat === undefined)
154
- continue;
155
- const nodeId = getOrCreateNode(lon, lat);
156
- nodeRefs.push(nodeId);
157
- }
158
- if (nodeRefs.length >= 2) {
159
- const wayId = featureId ?? nextWayId--;
160
- osm.ways.addWay({
161
- id: wayId,
162
- refs: nodeRefs,
163
- tags,
164
- });
165
- }
166
- }
167
- else if (geomType === "MultiLineString") {
168
- const coords = normalizedFeature.geometry
169
- .coordinates;
170
- for (const line of coords) {
171
- if (line.length < 2)
172
- continue;
173
- const nodeRefs = [];
174
- for (const [lon, lat] of line) {
175
- if (lon === undefined || lat === undefined)
176
- continue;
177
- const nodeId = getOrCreateNode(lon, lat);
178
- nodeRefs.push(nodeId);
179
- }
180
- if (nodeRefs.length >= 2) {
181
- const wayId = nextWayId--;
182
- osm.ways.addWay({
183
- id: wayId,
184
- refs: nodeRefs,
185
- tags,
186
- });
187
- }
188
- }
189
- }
190
- else if (geomType === "Polygon") {
191
- const coords = normalizedFeature.geometry.coordinates;
192
- processPolygonRings(osm, coords, tags, featureId, () => nextWayId--, () => nextRelationId--, getOrCreateNode);
193
- }
194
- else if (geomType === "MultiPolygon") {
195
- const coords = normalizedFeature.geometry.coordinates;
196
- const relationMembers = [];
197
- for (const polygon of coords) {
198
- const { outerWayId, holeWayIds } = processPolygonRings(osm, polygon, undefined, // Tags go on relation
199
- undefined, () => nextWayId--, () => nextRelationId--, getOrCreateNode);
200
- if (outerWayId !== undefined) {
201
- relationMembers.push({ type: "way", ref: outerWayId, role: "outer" });
202
- for (const holeId of holeWayIds) {
203
- relationMembers.push({ type: "way", ref: holeId, role: "inner" });
204
- }
205
- }
206
- }
207
- if (relationMembers.length > 0) {
208
- osm.relations.addRelation({
209
- id: featureId ?? nextRelationId--,
210
- members: relationMembers,
211
- tags: { type: "multipolygon", ...tags },
212
- });
213
- }
214
- }
215
- if (++count % 1000 === 0) {
216
- yield progressEvent(`Processed ${count} features from "${name}"...`);
217
- }
218
- }
219
- yield progressEvent(`Finished converting "${name}" to Osmix...`);
220
- }
221
- /**
222
- * Process polygon rings and add to OSM index.
223
- * Returns the created way IDs for use in multipolygon relations.
224
- */
225
- function processPolygonRings(osm, coordinates, tags, featureId, getNextWayId, getNextRelationId, getOrCreateNode) {
226
- if (coordinates.length === 0) {
227
- return { outerWayId: undefined, holeWayIds: [] };
228
- }
229
- const outerRing = coordinates[0];
230
- if (!outerRing || outerRing.length < 3) {
231
- return { outerWayId: undefined, holeWayIds: [] };
232
- }
233
- const createRelation = coordinates.length > 1;
234
- // Create nodes for outer ring
235
- const outerNodeRefs = [];
236
- for (const coord of outerRing) {
237
- const [lon, lat] = coord;
238
- if (lon === undefined || lat === undefined)
239
- continue;
240
- const nodeId = getOrCreateNode(lon, lat);
241
- outerNodeRefs.push(nodeId);
242
- }
243
- if (outerNodeRefs.length < 3) {
244
- return { outerWayId: undefined, holeWayIds: [] };
245
- }
246
- // Ensure ring is closed
247
- if (outerNodeRefs[0] !== outerNodeRefs[outerNodeRefs.length - 1]) {
248
- outerNodeRefs.push(outerNodeRefs[0]);
249
- }
250
- // Create way for outer ring
251
- const outerWayId = createRelation
252
- ? getNextWayId()
253
- : (featureId ?? getNextWayId());
254
- osm.ways.addWay({
255
- id: outerWayId,
256
- refs: outerNodeRefs,
257
- tags: createRelation ? { area: "yes" } : { area: "yes", ...tags },
258
- });
259
- // Create separate ways for holes
260
- const holeWayIds = [];
261
- for (let i = 1; i < coordinates.length; i++) {
262
- const holeRing = coordinates[i];
263
- if (!holeRing || holeRing.length < 3)
264
- continue;
265
- const holeNodeRefs = [];
266
- for (const coord of holeRing) {
267
- const [lon, lat] = coord;
268
- if (lon === undefined || lat === undefined)
269
- continue;
270
- const nodeId = getOrCreateNode(lon, lat);
271
- holeNodeRefs.push(nodeId);
272
- }
273
- if (holeNodeRefs.length < 3)
274
- continue;
275
- // Ensure hole ring is closed
276
- if (holeNodeRefs[0] !== holeNodeRefs[holeNodeRefs.length - 1]) {
277
- holeNodeRefs.push(holeNodeRefs[0]);
278
- }
279
- const holeWayId = getNextWayId();
280
- osm.ways.addWay({
281
- id: holeWayId,
282
- refs: holeNodeRefs,
283
- tags: { area: "yes" },
284
- });
285
- holeWayIds.push(holeWayId);
286
- }
287
- if (createRelation) {
288
- osm.relations.addRelation({
289
- id: featureId ?? getNextRelationId(),
290
- members: [
291
- { type: "way", ref: outerWayId, role: "outer" },
292
- ...holeWayIds.map((id) => ({ type: "way", ref: id, role: "inner" })),
293
- ],
294
- tags: {
295
- type: "multipolygon",
296
- ...tags,
297
- },
298
- });
299
- }
300
- return { outerWayId, holeWayIds };
301
- }
302
- /**
303
- * Convert GeoJSON properties to OSM tags.
304
- */
305
- function propertiesToTags(properties) {
306
- if (!properties || Object.keys(properties).length === 0) {
307
- return undefined;
308
- }
309
- const tags = {};
310
- for (const [key, value] of Object.entries(properties)) {
311
- if (typeof value === "string" || typeof value === "number") {
312
- tags[key] = value;
313
- }
314
- else if (value != null) {
315
- tags[key] = String(value);
316
- }
317
- }
318
- return Object.keys(tags).length > 0 ? tags : undefined;
319
- }
320
- /**
321
- * Extract numeric ID from feature.
322
- */
323
- function extractFeatureId(featureId) {
324
- if (featureId === undefined)
325
- return undefined;
326
- if (typeof featureId === "number")
327
- return featureId;
328
- if (typeof featureId === "string") {
329
- const numId = Number.parseInt(featureId, 10);
330
- if (!Number.isNaN(numId))
331
- return numId;
332
- }
333
- return undefined;
334
- }
335
- //# sourceMappingURL=osm-from-shapefile.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"osm-from-shapefile.js","sourceRoot":"","sources":["../../src/osm-from-shapefile.ts"],"names":[],"mappings":"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"}
@@ -1,24 +0,0 @@
1
- /**
2
- * Type definitions for Shapefile import.
3
- * @module
4
- */
5
- import type { FeatureCollection } from "geojson";
6
- /**
7
- * Input types accepted by `fromShapefile`.
8
- *
9
- * Supports multiple formats:
10
- * - `ArrayBufferLike` - Binary ZIP data containing shapefile components
11
- * - `ReadableStream` - Stream of ZIP data (will be consumed to ArrayBuffer)
12
- * - `string` - URL to a shapefile or ZIP file
13
- */
14
- export type ReadShapefileDataTypes = ArrayBufferLike | ReadableStream | string;
15
- /**
16
- * Result from shpjs parsing.
17
- * Can be a single FeatureCollection or an array if the ZIP contains multiple shapefiles.
18
- */
19
- export type ShpjsResult = (FeatureCollection & {
20
- fileName?: string;
21
- }) | (FeatureCollection & {
22
- fileName?: string;
23
- })[];
24
- //# sourceMappingURL=types.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAEhD;;;;;;;GAOG;AACH,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAAG,cAAc,GAAG,MAAM,CAAA;AAE9E;;;GAGG;AACH,MAAM,MAAM,WAAW,GACpB,CAAC,iBAAiB,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAC3C,CAAC,iBAAiB,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EAAE,CAAA"}
package/dist/src/types.js DELETED
@@ -1,5 +0,0 @@
1
- /**
2
- * Type definitions for Shapefile import.
3
- * @module
4
- */
5
- //# sourceMappingURL=types.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG"}
@@ -1,28 +0,0 @@
1
- /**
2
- * Utility functions for Shapefile data handling.
3
- * @module
4
- */
5
- import type { FeatureCollection } from "geojson";
6
- import type { ReadShapefileDataTypes } from "./types";
7
- /**
8
- * Parse Shapefile data and return GeoJSON FeatureCollection(s).
9
- *
10
- * Uses shpjs to parse Shapefiles and automatically project to WGS84.
11
- *
12
- * @param data - Shapefile data (URL string, ArrayBuffer/ReadableStream of ZIP).
13
- * @returns Array of GeoJSON FeatureCollections with optional fileName.
14
- * @throws If data is null or parsing fails.
15
- *
16
- * @example
17
- * ```ts
18
- * // From ArrayBuffer
19
- * const collections = await parseShapefile(zipBuffer)
20
- *
21
- * // From URL
22
- * const collections = await parseShapefile('https://example.com/data.zip')
23
- * ```
24
- */
25
- export declare function parseShapefile(data: ReadShapefileDataTypes): Promise<(FeatureCollection & {
26
- fileName?: string;
27
- })[]>;
28
- //# sourceMappingURL=utils.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AACA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAEhD,OAAO,KAAK,EAAE,sBAAsB,EAAe,MAAM,SAAS,CAAA;AAElE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,cAAc,CACnC,IAAI,EAAE,sBAAsB,GAC1B,OAAO,CAAC,CAAC,iBAAiB,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EAAE,CAAC,CAwBxD"}
package/dist/src/utils.js DELETED
@@ -1,71 +0,0 @@
1
- /// <reference path="./shpjs.d.ts" />
2
- /**
3
- * Utility functions for Shapefile data handling.
4
- * @module
5
- */
6
- import shp from "shpjs";
7
- /**
8
- * Parse Shapefile data and return GeoJSON FeatureCollection(s).
9
- *
10
- * Uses shpjs to parse Shapefiles and automatically project to WGS84.
11
- *
12
- * @param data - Shapefile data (URL string, ArrayBuffer/ReadableStream of ZIP).
13
- * @returns Array of GeoJSON FeatureCollections with optional fileName.
14
- * @throws If data is null or parsing fails.
15
- *
16
- * @example
17
- * ```ts
18
- * // From ArrayBuffer
19
- * const collections = await parseShapefile(zipBuffer)
20
- *
21
- * // From URL
22
- * const collections = await parseShapefile('https://example.com/data.zip')
23
- * ```
24
- */
25
- export async function parseShapefile(data) {
26
- if (data == null)
27
- throw new Error("Data is null");
28
- let input;
29
- // Convert ReadableStream to ArrayBuffer
30
- if (data instanceof ReadableStream) {
31
- input = await streamToArrayBuffer(data);
32
- }
33
- else if (data instanceof SharedArrayBuffer) {
34
- // shpjs expects ArrayBuffer, not SharedArrayBuffer
35
- const copy = new ArrayBuffer(data.byteLength);
36
- new Uint8Array(copy).set(new Uint8Array(data));
37
- input = copy;
38
- }
39
- else {
40
- input = data;
41
- }
42
- const result = await shp(input);
43
- // Normalize to array
44
- if (Array.isArray(result)) {
45
- return result;
46
- }
47
- return [result];
48
- }
49
- /**
50
- * Convert a ReadableStream to an ArrayBuffer.
51
- */
52
- async function streamToArrayBuffer(stream) {
53
- const reader = stream.getReader();
54
- const chunks = [];
55
- let totalLength = 0;
56
- while (true) {
57
- const { done, value } = await reader.read();
58
- if (done)
59
- break;
60
- chunks.push(value);
61
- totalLength += value.byteLength;
62
- }
63
- const result = new Uint8Array(totalLength);
64
- let offset = 0;
65
- for (const chunk of chunks) {
66
- result.set(chunk, offset);
67
- offset += chunk.byteLength;
68
- }
69
- return result.buffer;
70
- }
71
- //# sourceMappingURL=utils.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC;;;GAGG;AAGH,OAAO,GAAG,MAAM,OAAO,CAAA;AAGvB;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CACnC,IAA4B;IAE5B,IAAI,IAAI,IAAI,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;IAEjD,IAAI,KAA+B,CAAA;IAEnC,wCAAwC;IACxC,IAAI,IAAI,YAAY,cAAc,EAAE,CAAC;QACpC,KAAK,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACxC,CAAC;SAAM,IAAI,IAAI,YAAY,iBAAiB,EAAE,CAAC;QAC9C,mDAAmD;QACnD,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7C,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;QAC9C,KAAK,GAAG,IAAI,CAAA;IACb,CAAC;SAAM,CAAC;QACP,KAAK,GAAG,IAAI,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAgB,MAAM,GAAG,CAAC,KAAK,CAAC,CAAA;IAE5C,qBAAqB;IACrB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAA;IACd,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,CAAA;AAChB,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,mBAAmB,CACjC,MAAsB;IAEtB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;IACjC,MAAM,MAAM,GAAiB,EAAE,CAAA;IAC/B,IAAI,WAAW,GAAG,CAAC,CAAA;IAEnB,OAAO,IAAI,EAAE,CAAC;QACb,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;QAC3C,IAAI,IAAI;YAAE,MAAK;QACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAClB,WAAW,IAAI,KAAK,CAAC,UAAU,CAAA;IAChC,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,CAAA;IAC1C,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QACzB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAA;IAC3B,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAA;AACrB,CAAC"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=osm-from-shapefile.test.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"osm-from-shapefile.test.d.ts","sourceRoot":"","sources":["../../test/osm-from-shapefile.test.ts"],"names":[],"mappings":""}
@@ -1,460 +0,0 @@
1
- import { describe, expect, it, mock } from "bun:test";
2
- import { Osm } from "@osmix/core";
3
- import { progressEventMessage } from "@osmix/shared/progress";
4
- import { startCreateOsmFromShapefile } from "../src/osm-from-shapefile";
5
- // Mock shpjs module
6
- mock.module("shpjs", () => ({
7
- default: async (input) => {
8
- // Return the mock data passed through
9
- return input;
10
- },
11
- }));
12
- describe("@osmix/shapefile: startCreateOsmFromShapefile", () => {
13
- it("should convert Point features to Nodes", () => {
14
- const osm = new Osm();
15
- const geojson = {
16
- type: "FeatureCollection",
17
- features: [
18
- {
19
- type: "Feature",
20
- geometry: {
21
- type: "Point",
22
- coordinates: [-122.4194, 37.7749],
23
- },
24
- properties: {
25
- name: "San Francisco",
26
- population: 873965,
27
- },
28
- },
29
- {
30
- type: "Feature",
31
- geometry: {
32
- type: "Point",
33
- coordinates: [-122.4094, 37.7849],
34
- },
35
- properties: {
36
- name: "Another Point",
37
- },
38
- },
39
- ],
40
- };
41
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
42
- // Consume generator
43
- }
44
- osm.buildIndexes();
45
- expect(osm.nodes.size).toBe(2);
46
- expect(osm.ways.size).toBe(0);
47
- const node1 = osm.nodes.getById(-1);
48
- expect(node1).toBeDefined();
49
- expect(node1?.lon).toBe(-122.4194);
50
- expect(node1?.lat).toBe(37.7749);
51
- expect(node1?.tags?.["name"]).toBe("San Francisco");
52
- // OSM tags are stored as strings
53
- expect(node1?.tags?.["population"]).toBe("873965");
54
- const node2 = osm.nodes.getById(-2);
55
- expect(node2).toBeDefined();
56
- expect(node2?.lon).toBe(-122.4094);
57
- expect(node2?.lat).toBe(37.7849);
58
- expect(node2?.tags?.["name"]).toBe("Another Point");
59
- });
60
- it("should convert LineString features to Ways with Nodes", () => {
61
- const osm = new Osm();
62
- const geojson = {
63
- type: "FeatureCollection",
64
- features: [
65
- {
66
- type: "Feature",
67
- geometry: {
68
- type: "LineString",
69
- coordinates: [
70
- [-122.4194, 37.7749],
71
- [-122.4094, 37.7849],
72
- [-122.3994, 37.7949],
73
- ],
74
- },
75
- properties: {
76
- highway: "primary",
77
- name: "Main Street",
78
- },
79
- },
80
- ],
81
- };
82
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
83
- // Consume generator
84
- }
85
- osm.buildIndexes();
86
- expect(osm.nodes.size).toBe(3);
87
- expect(osm.ways.size).toBe(1);
88
- const way = osm.ways.getById(-1);
89
- expect(way).toBeDefined();
90
- expect(way?.refs).toHaveLength(3);
91
- expect(way?.tags?.["highway"]).toBe("primary");
92
- expect(way?.tags?.["name"]).toBe("Main Street");
93
- // Verify nodes were created
94
- const node1 = osm.nodes.getById(way.refs[0]);
95
- const node2 = osm.nodes.getById(way.refs[1]);
96
- const node3 = osm.nodes.getById(way.refs[2]);
97
- expect(node1?.lon).toBe(-122.4194);
98
- expect(node1?.lat).toBe(37.7749);
99
- expect(node2?.lon).toBe(-122.4094);
100
- expect(node2?.lat).toBe(37.7849);
101
- expect(node3?.lon).toBe(-122.3994);
102
- expect(node3?.lat).toBe(37.7949);
103
- });
104
- it("should convert simple Polygon features to Ways with area tags", () => {
105
- const osm = new Osm();
106
- const geojson = {
107
- type: "FeatureCollection",
108
- features: [
109
- {
110
- type: "Feature",
111
- geometry: {
112
- type: "Polygon",
113
- coordinates: [
114
- [
115
- [-122.4194, 37.7749],
116
- [-122.4094, 37.7749],
117
- [-122.4094, 37.7849],
118
- [-122.4194, 37.7849],
119
- [-122.4194, 37.7749], // Closed ring
120
- ],
121
- ],
122
- },
123
- properties: {
124
- building: "yes",
125
- name: "Test Building",
126
- },
127
- },
128
- ],
129
- };
130
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
131
- // Consume generator
132
- }
133
- osm.buildIndexes();
134
- expect(osm.ways.size).toBe(1);
135
- expect(osm.relations.size).toBe(0); // No relation for simple polygon
136
- const way = osm.ways.getById(-1);
137
- expect(way).toBeDefined();
138
- expect(way?.tags?.["building"]).toBe("yes");
139
- expect(way?.tags?.["name"]).toBe("Test Building");
140
- expect(way?.tags?.["area"]).toBe("yes");
141
- });
142
- it("should convert Polygon with holes to relation with multiple Ways", () => {
143
- const osm = new Osm();
144
- const geojson = {
145
- type: "FeatureCollection",
146
- features: [
147
- {
148
- type: "Feature",
149
- geometry: {
150
- type: "Polygon",
151
- coordinates: [
152
- // Outer ring
153
- [
154
- [-122.4194, 37.7749],
155
- [-122.4094, 37.7749],
156
- [-122.4094, 37.7849],
157
- [-122.4194, 37.7849],
158
- [-122.4194, 37.7749],
159
- ],
160
- // Hole
161
- [
162
- [-122.4164, 37.7779],
163
- [-122.4144, 37.7779],
164
- [-122.4144, 37.7799],
165
- [-122.4164, 37.7799],
166
- [-122.4164, 37.7779],
167
- ],
168
- ],
169
- },
170
- properties: {
171
- building: "yes",
172
- },
173
- },
174
- ],
175
- };
176
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
177
- // Consume generator
178
- }
179
- osm.buildIndexes();
180
- // Should have outer ring way + hole way + relation
181
- expect(osm.ways.size).toBe(2);
182
- expect(osm.relations.size).toBe(1);
183
- const relation = osm.relations.getById(-1);
184
- expect(relation).toBeDefined();
185
- expect(relation?.tags?.["type"]).toBe("multipolygon");
186
- expect(relation?.tags?.["building"]).toBe("yes");
187
- expect(relation?.members).toHaveLength(2);
188
- expect(relation?.members[0]?.role).toBe("outer");
189
- expect(relation?.members[1]?.role).toBe("inner");
190
- });
191
- it("should convert MultiPoint features to multiple Nodes", () => {
192
- const osm = new Osm();
193
- const geojson = {
194
- type: "FeatureCollection",
195
- features: [
196
- {
197
- type: "Feature",
198
- geometry: {
199
- type: "MultiPoint",
200
- coordinates: [
201
- [-122.4194, 37.7749],
202
- [-122.4094, 37.7849],
203
- [-122.3994, 37.7949],
204
- ],
205
- },
206
- properties: {
207
- type: "stop",
208
- },
209
- },
210
- ],
211
- };
212
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
213
- // Consume generator
214
- }
215
- osm.buildIndexes();
216
- expect(osm.nodes.size).toBe(3);
217
- expect(osm.ways.size).toBe(0);
218
- // All three nodes should have the same tags
219
- const node1 = osm.nodes.getById(-1);
220
- const node2 = osm.nodes.getById(-2);
221
- const node3 = osm.nodes.getById(-3);
222
- expect(node1?.tags?.["type"]).toBe("stop");
223
- expect(node2?.tags?.["type"]).toBe("stop");
224
- expect(node3?.tags?.["type"]).toBe("stop");
225
- });
226
- it("should handle features without properties", () => {
227
- const osm = new Osm();
228
- const geojson = {
229
- type: "FeatureCollection",
230
- features: [
231
- {
232
- type: "Feature",
233
- geometry: {
234
- type: "Point",
235
- coordinates: [-122.4194, 37.7749],
236
- },
237
- properties: null,
238
- },
239
- ],
240
- };
241
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
242
- // Consume generator
243
- }
244
- osm.buildIndexes();
245
- expect(osm.nodes.size).toBe(1);
246
- const node = osm.nodes.getById(-1);
247
- expect(node).toBeDefined();
248
- expect(node?.tags).toBeUndefined();
249
- });
250
- it("should reuse nodes when features share coordinates", () => {
251
- const osm = new Osm();
252
- const geojson = {
253
- type: "FeatureCollection",
254
- features: [
255
- {
256
- type: "Feature",
257
- geometry: {
258
- type: "LineString",
259
- coordinates: [
260
- [-122.4194, 37.7749],
261
- [-122.4094, 37.7849],
262
- ],
263
- },
264
- properties: {
265
- highway: "primary",
266
- },
267
- },
268
- {
269
- type: "Feature",
270
- geometry: {
271
- type: "LineString",
272
- coordinates: [
273
- [-122.4094, 37.7849], // Shared coordinate
274
- [-122.3994, 37.7949],
275
- ],
276
- },
277
- properties: {
278
- highway: "secondary",
279
- },
280
- },
281
- ],
282
- };
283
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
284
- // Consume generator
285
- }
286
- osm.buildIndexes();
287
- // Should have 3 nodes (shared coordinate is reused)
288
- expect(osm.nodes.size).toBe(3);
289
- expect(osm.ways.size).toBe(2);
290
- const way1 = osm.ways.getById(-1);
291
- const way2 = osm.ways.getById(-2);
292
- // Each way should have 2 nodes
293
- expect(way1?.refs).toHaveLength(2);
294
- expect(way2?.refs).toHaveLength(2);
295
- // Nodes at the same coordinate are reused
296
- expect(way1?.refs[1]).toBe(way2?.refs[0]);
297
- });
298
- it("should use generator for custom progress handling", () => {
299
- const osm = new Osm();
300
- const geojson = {
301
- type: "FeatureCollection",
302
- features: [
303
- {
304
- type: "Feature",
305
- geometry: {
306
- type: "Point",
307
- coordinates: [-122.4194, 37.7749],
308
- },
309
- properties: {},
310
- },
311
- ],
312
- };
313
- const progressMessages = [];
314
- for (const update of startCreateOsmFromShapefile(osm, geojson, "test")) {
315
- progressMessages.push(progressEventMessage(update));
316
- }
317
- expect(progressMessages.length).toBeGreaterThan(0);
318
- expect(progressMessages[0]).toContain("Converting");
319
- expect(progressMessages[progressMessages.length - 1]).toContain("Finished converting");
320
- });
321
- it("should use feature IDs when present", () => {
322
- const osm = new Osm();
323
- const geojson = {
324
- type: "FeatureCollection",
325
- features: [
326
- {
327
- type: "Feature",
328
- id: 100,
329
- geometry: {
330
- type: "Point",
331
- coordinates: [-122.4194, 37.7749],
332
- },
333
- properties: {
334
- name: "Point with ID",
335
- },
336
- },
337
- {
338
- type: "Feature",
339
- id: "200",
340
- geometry: {
341
- type: "LineString",
342
- coordinates: [
343
- [-122.4194, 37.7749],
344
- [-122.4094, 37.7849],
345
- ],
346
- },
347
- properties: {
348
- highway: "primary",
349
- },
350
- },
351
- ],
352
- };
353
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
354
- // Consume generator
355
- }
356
- osm.buildIndexes();
357
- // Point should use ID 100
358
- const node = osm.nodes.getById(100);
359
- expect(node).toBeDefined();
360
- expect(node?.tags?.["name"]).toBe("Point with ID");
361
- // Way should use ID 200
362
- const way = osm.ways.getById(200);
363
- expect(way).toBeDefined();
364
- expect(way?.tags?.["highway"]).toBe("primary");
365
- });
366
- it("should handle MultiLineString features", () => {
367
- const osm = new Osm();
368
- const geojson = {
369
- type: "FeatureCollection",
370
- features: [
371
- {
372
- type: "Feature",
373
- geometry: {
374
- type: "MultiLineString",
375
- coordinates: [
376
- [
377
- [-122.4194, 37.7749],
378
- [-122.4094, 37.7849],
379
- ],
380
- [
381
- [-122.3994, 37.7949],
382
- [-122.3894, 37.8049],
383
- ],
384
- ],
385
- },
386
- properties: {
387
- highway: "secondary",
388
- },
389
- },
390
- ],
391
- };
392
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
393
- // Consume generator
394
- }
395
- osm.buildIndexes();
396
- // Should create 2 ways (one for each line)
397
- expect(osm.ways.size).toBe(2);
398
- expect(osm.nodes.size).toBe(4);
399
- const way1 = osm.ways.getById(-1);
400
- const way2 = osm.ways.getById(-2);
401
- expect(way1?.refs).toHaveLength(2);
402
- expect(way2?.refs).toHaveLength(2);
403
- expect(way1?.tags?.["highway"]).toBe("secondary");
404
- expect(way2?.tags?.["highway"]).toBe("secondary");
405
- });
406
- it("should handle MultiPolygon features", () => {
407
- const osm = new Osm();
408
- const geojson = {
409
- type: "FeatureCollection",
410
- features: [
411
- {
412
- type: "Feature",
413
- geometry: {
414
- type: "MultiPolygon",
415
- coordinates: [
416
- // First polygon
417
- [
418
- [
419
- [-122.4194, 37.7749],
420
- [-122.4094, 37.7749],
421
- [-122.4094, 37.7849],
422
- [-122.4194, 37.7849],
423
- [-122.4194, 37.7749],
424
- ],
425
- ],
426
- // Second polygon
427
- [
428
- [
429
- [-122.3994, 37.7649],
430
- [-122.3894, 37.7649],
431
- [-122.3894, 37.7749],
432
- [-122.3994, 37.7749],
433
- [-122.3994, 37.7649],
434
- ],
435
- ],
436
- ],
437
- },
438
- properties: {
439
- landuse: "residential",
440
- },
441
- },
442
- ],
443
- };
444
- for (const _ of startCreateOsmFromShapefile(osm, geojson, "test")) {
445
- // Consume generator
446
- }
447
- osm.buildIndexes();
448
- // Should have 2 ways + 1 relation
449
- expect(osm.ways.size).toBe(2);
450
- expect(osm.relations.size).toBe(1);
451
- const relation = osm.relations.getById(-1);
452
- expect(relation).toBeDefined();
453
- expect(relation?.tags?.["type"]).toBe("multipolygon");
454
- expect(relation?.tags?.["landuse"]).toBe("residential");
455
- expect(relation?.members).toHaveLength(2);
456
- expect(relation?.members[0]?.role).toBe("outer");
457
- expect(relation?.members[1]?.role).toBe("outer");
458
- });
459
- });
460
- //# sourceMappingURL=osm-from-shapefile.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"osm-from-shapefile.test.js","sourceRoot":"","sources":["../../test/osm-from-shapefile.test.ts"],"names":[],"mappings":"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"}