@osmix/core 0.1.5 → 0.1.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @osmix/core
 
+## 0.1.7
+
+### Patch Changes
+
+- 2a634cb: Fix publishing
+- Updated dependencies [2a634cb]
+  - @osmix/shared@0.0.12
+
+## 0.1.6
+
+### Patch Changes
+
+- 3c8ee95: Fix and simplify package exports
+- Updated dependencies [3c8ee95]
+  - @osmix/shared@0.0.11
+
 ## 0.1.5
 
 ### Patch Changes

package/dist/index.d.ts

@@ -21,6 +21,8 @@
  *
  * @module @osmix/core
  */
+export type { IdOrIndex } from "./ids";
+export * from "./mocks";
 export * from "./nodes";
 export * from "./osm";
 export * from "./relations";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAMH,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,QAAQ,CAAA;AACtB,OAAO,EAAE,iBAAiB,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACnE,cAAc,QAAQ,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAMH,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,QAAQ,CAAA;AACtB,OAAO,EAAE,iBAAiB,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACnE,cAAc,QAAQ,CAAA"}

package/dist/index.js

@@ -21,9 +21,7 @@
  *
  * @module @osmix/core
  */
-/// <reference path="./types/kdbush.d.ts" />
-/// <reference path="./types/geokdbush.d.ts" />
-/// <reference path="./types/geoflatbush.d.ts" />
+export * from "./mocks";
 export * from "./nodes";
 export * from "./osm";
 export * from "./relations";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,4CAA4C;AAC5C,+CAA+C;AAC/C,iDAAiD;AAEjD,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,QAAQ,CAAA;AACtB,OAAO,EAAE,iBAAiB,EAAmB,MAAM,gBAAgB,CAAA;AACnE,cAAc,QAAQ,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAOH,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,QAAQ,CAAA;AACtB,OAAO,EAAE,iBAAiB,EAAmB,MAAM,gBAAgB,CAAA;AACnE,cAAc,QAAQ,CAAA"}

package/dist/mocks.d.ts

@@ -0,0 +1,13 @@
+import { Osm } from "./osm";
+/**
+ * Create a base OSM with one way and two nodes.
+ */
+export declare function createMockBaseOsm(): Osm;
+/**
+ * Create a patch OSM with:
+ * - The same way as the base OSM, with new tags
+ * - A way that has an overlapping node with the first way, but does not share a node and so starts disconnected
+ * - A way that crosses over the first way, but does not share a node and so starts disconnected
+ */
+export declare function createMockPatchOsm(): Osm;
+//# sourceMappingURL=mocks.d.ts.map

package/dist/mocks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../src/mocks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAmC3B;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,GAAG,CAOvC;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,GAAG,CAqFxC"}

package/dist/mocks.js

@@ -0,0 +1,122 @@
+import { Osm } from "./osm";
+const YAKIM_LAT = 46.60207;
+const YAKIM_LON = -120.505898;
+const ONE_KM_LON = 0.0131; // approximately
+const ONE_KM_LAT = 0.009;
+const node0 = {
+    id: 0,
+    lat: YAKIM_LAT,
+    lon: YAKIM_LON,
+};
+const node1 = {
+    id: 1,
+    lat: YAKIM_LAT,
+    lon: YAKIM_LON - ONE_KM_LON, // approximately 1km west
+};
+function addBaseNodes(osm) {
+    osm.nodes.addNode(node0);
+    osm.nodes.addNode(node1);
+}
+function addBaseWays(osm) {
+    osm.ways.addWay({
+        id: 1,
+        refs: [0, 1],
+        tags: {
+            highway: "primary",
+        },
+    });
+}
+/**
+ * Create a base OSM with one way and two nodes.
+ */
+export function createMockBaseOsm() {
+    const base = new Osm();
+    addBaseNodes(base);
+    base.nodes.buildIndex();
+    addBaseWays(base);
+    base.buildIndexes();
+    return base;
+}
+/**
+ * Create a patch OSM with:
+ * - The same way as the base OSM, with new tags
+ * - A way that has an overlapping node with the first way, but does not share a node and so starts disconnected
+ * - A way that crosses over the first way, but does not share a node and so starts disconnected
+ */
+export function createMockPatchOsm() {
+    const osm = new Osm();
+    addBaseNodes(osm);
+    // Add way the connects with base way node 0 (will replace it)
+    osm.nodes.addNode({
+        ...node0,
+        id: 2,
+        tags: {
+            crossing: "yes",
+        },
+    });
+    osm.nodes.addNode({
+        ...node1,
+        id: 3,
+        lon: YAKIM_LON + ONE_KM_LON, // ends 1km east of the center point
+    });
+    // Add nodes for disconnected way
+    osm.nodes.addNode({
+        id: 4,
+        lat: YAKIM_LAT - ONE_KM_LAT, // 1km south
+        lon: YAKIM_LON + ONE_KM_LON / 4, // 250m east
+    });
+    osm.nodes.addNode({
+        id: 5,
+        lat: YAKIM_LAT + ONE_KM_LAT, // 1km north
+        lon: YAKIM_LON + ONE_KM_LON / 4, // 250m east
+    });
+    // Add nodes for crossing way
+    osm.nodes.addNode({
+        id: 6,
+        lat: YAKIM_LAT - ONE_KM_LAT, // 1km south
+        lon: YAKIM_LON + ONE_KM_LON / 2, // 500m east
+    });
+    osm.nodes.addNode({
+        id: 7,
+        lat: YAKIM_LAT + ONE_KM_LAT, // 1km north
+        lon: YAKIM_LON + ONE_KM_LON / 2, // 500m east
+    });
+    osm.nodes.buildIndex();
+    // Add same base way with new tags
+    osm.ways.addWay({
+        id: 1,
+        refs: [0, 1],
+        tags: {
+            highway: "primary",
+            version: "2",
+        },
+    });
+    // Add way that overlaps with base way node 1. Node should be de-duplicated.
+    osm.ways.addWay({
+        id: 2,
+        refs: [2, 3],
+        tags: {
+            highway: "secondary",
+        },
+    });
+    // Add way that crosses way 2, and should generate 1 intersection.
+    osm.ways.addWay({
+        id: 3,
+        refs: [4, 5],
+        tags: {
+            highway: "primary",
+        },
+    });
+    // Add a way that crosses way 2, but has a tag indicating it is an underpass and should be left alone
+    osm.ways.addWay({
+        id: 4,
+        refs: [6, 7],
+        tags: {
+            highway: "underpass",
+            tunnel: "yes",
+        },
+    });
+    osm.buildIndexes();
+    return osm;
+}
+//# sourceMappingURL=mocks.js.map

package/dist/mocks.js.map

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

package/package.json

@@ -1,55 +1,32 @@
 {
-	"$schema": "https://json.schemastore.org/package",
+	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@osmix/core",
 	"type": "module",
-	"version": "0.1.5",
+	"version": "0.1.7",
 	"description": "An OSM PBF reader, writer, and merge tool written in TypeScript",
-	"main": "./src/index.ts",
-	"publishConfig": {
-		"access": "public",
-		"registry": "https://registry.npmjs.org/",
-		"main": "./dist/index.js",
-		"types": "./dist/index.d.ts",
-		"exports": {
-			".": {
-				"import": "./dist/index.js",
-				"types": "./dist/index.d.ts"
-			}
-		},
-		"files": [
-			"dist",
-			"README.md",
-			"LICENSE"
-		]
-	},
 	"license": "MIT",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/conveyal/osmix.git"
 	},
-	"homepage": "https://github.com/conveyal/osmix#readme",
-	"bugs": {
-		"url": "https://github.com/conveyal/osmix/issues"
-	},
-	"sideEffects": false,
+	"main": "./dist/index.js",
 	"scripts": {
 		"build": "tsc -p tsconfig.build.json",
 		"bench": "bun test --bench",
-		"prepare": "bun run build",
-		"release": "bun publish",
 		"test": "bun test",
 		"typecheck": "tsgo --noEmit"
 	},
 	"devDependencies": {
-		"@osmix/pbf": "0.0.6",
-		"@types/bun": "^1.3.3",
+		"@osmix/pbf": "0.0.8",
+		"@types/bun": "^1.3.9",
 		"typescript": "^5.9.0"
 	},
 	"dependencies": {
-		"@osmix/shared": "0.0.10",
+		"@osmix/shared": "0.0.12",
 		"flatbush": "^4.4.1",
 		"geoflatbush": "^2.1.0",
 		"geokdbush": "^2.0.1",
 		"kdbush": "mourner/kdbush#16416cd"
-	}
-}
+	},
+	"types": "./dist/index.d.ts"
+}

package/src/index.ts

@@ -26,6 +26,8 @@
 /// <reference path="./types/geokdbush.d.ts" />
 /// <reference path="./types/geoflatbush.d.ts" />
 
+export type { IdOrIndex } from "./ids"
+export * from "./mocks"
 export * from "./nodes"
 export * from "./osm"
 export * from "./relations"

package/{test/mock-osm.ts → src/mocks.ts}

@@ -1,5 +1,5 @@
 import type { OsmNode } from "@osmix/shared/types"
-import { Osm } from "../src/osm"
+import { Osm } from "./osm"
 
 const YAKIM_LAT = 46.60207
 const YAKIM_LON = -120.505898
@@ -37,7 +37,7 @@ function addBaseWays(osm: Osm) {
 /**
  * Create a base OSM with one way and two nodes.
  */
-export function createBaseOsm(): Osm {
+export function createMockBaseOsm(): Osm {
 	const base = new Osm()
 	addBaseNodes(base)
 	base.nodes.buildIndex()
@@ -52,7 +52,7 @@ export function createBaseOsm(): Osm {
  * - A way that has an overlapping node with the first way, but does not share a node and so starts disconnected
  * - A way that crosses over the first way, but does not share a node and so starts disconnected
  */
-export function createPatchOsm(): Osm {
+export function createMockPatchOsm(): Osm {
 	const osm = new Osm()
 
 	addBaseNodes(osm)