Handle null marker in left sidebar

openstreetmap-polska · Dec 24, 2023 · 06b1de7 · 06b1de7
1 parent 7f18d0c
commit 06b1de7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/components/map.tsx b/src/components/map.tsx
@@ -318,7 +318,7 @@ const Map: FC<MapProps> = ({ openChangesetId, setOpenChangesetId }) => {
 
     return (
         <>
-            { sidebarLeftShown && marker !== null && (
+            { sidebarLeftShown && (
                 <SidebarLeft
                     action={sidebarAction}
                     data={sidebarData}

diff --git a/src/components/sidebar-left.tsx b/src/components/sidebar-left.tsx
@@ -23,6 +23,10 @@ const SidebarLeft: FC<SidebarLeftProps> = (props) => {
         case SidebarAction.showDetails:
             return <DefibrillatorDetails data={data} closeSidebar={closeSidebar} />;
         case SidebarAction.addNode:
+            if (marker === null) {
+                console.error("Marker shouldn't be null");
+                return null;
+            }
             return (
                 <DefibrillatorEditor
                     closeSidebar={closeSidebar}
@@ -60,7 +64,7 @@ interface SidebarLeftProps {
     data: DefibrillatorData | null,
     closeSidebar: () => void,
     visible: boolean,
-    marker: Marker,
+    marker: Marker | null,
     openChangesetId: string,
     setOpenChangesetId: (changesetId: string) => void,
 }

diff --git a/src/components/sidebar/defibrillatorEditor.tsx b/src/components/sidebar/defibrillatorEditor.tsx
@@ -63,6 +63,10 @@ const DefibrillatorEditor: FC<DefibrillatorEditorProps> = ({
             });
         };
         if (newAED) {
+            if (marker === null) {
+                console.error("Marker shouldn't be null");
+                return null;
+            }
             const lngLat = marker.getLngLat();
             const newDefibrillatorData = {
                 lon: lngLat.lng,
@@ -135,7 +139,7 @@ const DefibrillatorEditor: FC<DefibrillatorEditorProps> = ({
 
 interface DefibrillatorEditorProps {
     closeSidebar: () => void,
-    marker: Marker,
+    marker: Marker | null,
     openChangesetId: string,
     setOpenChangesetId: (changesetId: string) => void,
     data: DefibrillatorData | null,