Pass merge options when generating changeset

Author: trevorgerhardt

apps/osm-merge/src/pages/merge.tsx

@@ -15,6 +15,7 @@ import {
 	writeOsmToPbfStream,
 	type OsmChange,
 	type OsmChanges,
+	type OsmMergeOptions,
 } from "osm.ts"
 import { useCallback, useEffect, useRef, useState, useTransition } from "react"
 import Basemap from "../components/basemap"
@@ -55,8 +56,8 @@ export default function Merge() {
 
 	const [step, setStep] = useState<number>(1)
 
-	const [mergeOptions, setMergeOptions] = useState({
-		simple: true,
+	const [mergeOptions, setMergeOptions] = useState<OsmMergeOptions>({
+		directMerge: true,
 		deduplicateNodes: true,
 		createIntersections: true,
 	})
@@ -178,15 +179,18 @@ export default function Merge() {
 								<b>DIRECT MERGE:</b> Add all new entities from the patch onto
 								the base data set. Overwrite any entities that have matching
 								IDs.
+								<br />
+								<span className="font-bold">Direct merge is required.</span>
 							</p>
 							<input
 								type="checkbox"
-								checked={mergeOptions.simple}
+								disabled={true}
+								checked={mergeOptions.directMerge}
 								onChange={(e) => {
 									const simple = e.currentTarget.checked
 									setMergeOptions((m) => ({
 										...m,
-										simple,
+										directMerge: simple,
 									}))
 								}}
 							/>
@@ -237,6 +241,7 @@ export default function Merge() {
 									const results = await osmWorker.generateChangeset(
 										baseOsm.id,
 										patchOsm.id,
+										mergeOptions,
 									)
 									console.log(results)
 									setChanges(results)

apps/osm-merge/src/workers/osm.worker.ts

@@ -5,6 +5,7 @@ import {
 	type GeoBbox2D,
 	type OsmChanges,
 	type OsmChangeset,
+	type OsmMergeOptions,
 	type TileIndex,
 } from "osm.ts"
 import * as Performance from "osm.ts/performance"
@@ -103,9 +104,14 @@ const osmWorker = {
 		}
 	},
 	activeChangeset: null as OsmChangeset | null,
-	generateChangeset(baseOsmId: string, patchOsmId: string): OsmChanges {
+	generateChangeset(
+		baseOsmId: string,
+		patchOsmId: string,
+		options: OsmMergeOptions,
+	): OsmChanges {
 		const changeset = this.osm(baseOsmId).generateChangeset(
 			this.osm(patchOsmId),
+			options,
 		)
 		this.activeChangeset = changeset
 		return {

packages/osm.ts/src/changeset.ts

@@ -12,6 +12,12 @@ import type {
 } from "./types"
 import { entityPropertiesEqual, getEntityType } from "./utils"
 
+export type OsmMergeOptions = {
+	directMerge: boolean
+	deduplicateNodes: boolean
+	createIntersections: boolean
+}
+
 export type OsmChangesStats = {
 	deduplicatedNodes: number
 	deduplicatedNodesReplaced: number
@@ -305,17 +311,26 @@ export default class OsmChangeset {
 		}
 	}
 
-	generateFullChangeset(patch: Osm) {
-		this.generateDirectChanges(patch)
+	generateFullChangeset(
+		patch: Osm,
+		{ directMerge, deduplicateNodes, createIntersections }: OsmMergeOptions,
+	) {
+		if (directMerge) {
+			this.generateDirectChanges(patch)
+		}
 
-		// Then de-duplicate overlapping nodes
-		for (const node of patch.nodes) {
-			this.deduplicateOverlappingNodes(node)
+		if (deduplicateNodes) {
+			// Then de-duplicate overlapping nodes
+			for (const node of patch.nodes) {
+				this.deduplicateOverlappingNodes(node)
+			}
 		}
 
-		// Then handle intersecting ways
-		for (const way of patch.ways) {
-			this.handleIntersectingWays(way, patch)
+		if (createIntersections) {
+			// Then handle intersecting ways
+			for (const way of patch.ways) {
+				this.handleIntersectingWays(way, patch)
+			}
 		}
 	}
 

packages/osm.ts/src/index.ts

@@ -12,4 +12,8 @@ export { getEntityType } from "./utils"
 export { Nodes as NodeIndex } from "./nodes"
 export { createOsmIndexFromPbfData } from "./osm-from-pbf"
 export { writeOsmToPbfStream } from "./osm-to-pbf"
-export { default as OsmChangeset, type OsmChanges } from "./changeset"
+export {
+	default as OsmChangeset,
+	type OsmChanges,
+	type OsmMergeOptions,
+} from "./changeset"

packages/osm.ts/src/osm.ts

@@ -22,7 +22,7 @@ import type {
 import { isNode, isRelation, isWay } from "./utils"
 import { Ways, type WaysTransferables } from "./ways"
 import { IdArrayType } from "./typed-arrays"
-import OsmChangeset from "./changeset"
+import OsmChangeset, { type OsmMergeOptions } from "./changeset"
 
 export interface OsmTransferables {
 	id: string
@@ -297,9 +297,9 @@ export class Osm {
 		return this.nodes.bbox ?? this.headerBbox()
 	}
 
-	generateChangeset(other: Osm) {
+	generateChangeset(other: Osm, options: OsmMergeOptions) {
 		const changeset = new OsmChangeset(this)
-		changeset.generateFullChangeset(other)
+		changeset.generateFullChangeset(other, options)
 		return changeset
 	}
 }