Move OSM back into an atom family

Author: trevorgerhardt

apps/osm-merge/src/hooks/osm.ts

@@ -1,11 +1,12 @@
 import { addLogMessageAtom } from "@/state/log"
 import { osmWorkerAtom } from "@/state/worker"
 import * as Comlink from "comlink"
-import { useAtomValue, useSetAtom } from "jotai"
+import { useAtom, useAtomValue, useSetAtom } from "jotai"
 import { Osm } from "osm.ts"
 import { useEffect, useMemo, useState } from "react"
 import useStartTask from "./log"
 import { useFitBoundsOnChange } from "./map"
+import { osmAtomFamily } from "@/state/osm"
 
 export function useOsmWorker() {
 	const osmWorker = useAtomValue(osmWorkerAtom)
@@ -20,8 +21,8 @@ export function useOsmWorker() {
 	return osmWorker
 }
 
-export function useOsmFile(file: File | null, id?: string) {
-	const [osm, setOsm] = useState<Osm | null>(null)
+export function useOsmFile(id: string, file: File | null) {
+	const [osm, setOsm] = useAtom(osmAtomFamily(id))
 	const [isLoading, setIsLoading] = useState(false)
 	const osmWorker = useOsmWorker()
 	const startTask = useStartTask()
@@ -49,7 +50,7 @@ export function useOsmFile(file: File | null, id?: string) {
 			.finally(() => {
 				setIsLoading(false)
 			})
-	}, [file, id, osmWorker, startTask])
+	}, [file, id, osmWorker, setOsm, startTask])
 
 	return { osm, setOsm, isLoading }
 }

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

@@ -21,7 +21,7 @@ export default function ViewPage() {
 	const [file, setFile] = useState<File | null>(null)
 	const osmId = useMemo(() => file?.name ?? "default", [file])
 	const map = useAtomValue(mapAtom)
-	const { osm, isLoading: isLoadingFile } = useOsmFile(file)
+	const { osm, isLoading: isLoadingFile } = useOsmFile("inspect", file)
 	const bbox = useMemo(() => osm?.bbox(), [osm])
 	const logMessage = useSetAtom(addLogMessageAtom)
 	const setSelectedEntity = useSetAtom(selectedEntityAtom)

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

@@ -43,13 +43,13 @@ export default function Merge() {
 		osm: baseOsm,
 		setOsm: setBaseOsm,
 		isLoading: baseOsmIsLoading,
-	} = useOsmFile(baseFile, "base")
+	} = useOsmFile("base", baseFile)
 	const {
 		osm: patchOsm,
 		setOsm: setPatchOsm,
 		isLoading: patchOsmIsLoading,
-	} = useOsmFile(patchFile, "patch")
-	const [mergedOsm, setMergedOsm] = useState<Osm | null>(null)
+	} = useOsmFile("patch", patchFile)
+	const { osm: mergedOsm, setOsm: setMergedOsm } = useOsmFile("inspect", null)
 	const osmWorker = useOsmWorker()
 	const [isTransitioning, startTransition] = useTransition()
 	const [changes, setChanges] = useState<OsmChanges | null>(null)

apps/osm-merge/src/state/osm.ts

@@ -0,0 +1,5 @@
+import { atom } from "jotai"
+import { atomFamily } from "jotai/utils"
+import type { Osm } from "osm.ts"
+
+export const osmAtomFamily = atomFamily((id: string) => atom<Osm | null>(null))

packages/osm.ts/src/osm.ts

@@ -297,7 +297,7 @@ export class Osm {
 		return this.nodes.bbox ?? this.headerBbox()
 	}
 
-	generateChangeset(other: Osm, options: OsmMergeOptions) {
+	generateChangeset(other: Osm, options?: OsmMergeOptions) {
 		const changeset = new OsmChangeset(this)
 		changeset.generateFullChangeset(other, options)
 		return changeset