Fixes map opening when user selects a new location after map has been…

… closed
concord-consortium · Feb 1, 2024 · f1235e3 · f1235e3
1 parent 6d40de8
commit f1235e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -102,10 +102,11 @@ export const App = () => {
 
     const createMapListener = (listenerRes: ClientNotification) => {
       const { values } = listenerRes;
-      if (values.operation === "delete" && values.type === "DG.MapView" && values.name === "US Weather Stations") {
+      if (values.operation === "delete" && values.type === "DG.MapView" && values.name === "US-Weather-Stations") {
         setState((draft) => {
           draft.zoomMap = false;
           draft.isMapOpen = false;
+          draft.didUserSelectStationFromMap = false;
         });
       }
     };

diff --git a/src/components/location-picker.tsx b/src/components/location-picker.tsx
@@ -225,8 +225,10 @@ export const LocationPicker = () => {
         placeNameSelected(locationPossibilities[selectedLocIdx]);
         setState(draft=>{
           draft.location = locationPossibilities[selectedLocIdx];
-          draft.zoomMap = true;
           draft.didUserSelectStationFromMap = false;
+          if (state.isMapOpen) {
+            draft.zoomMap = true;
+          }
         });
       }
     }