DBC22-1219: Rework done

DBC22-1219: Rework done. Updated according to the comments.
bcgov · Nov 27, 2023 · bd50a92 · bd50a92
1 parent 8eeaec3
commit bd50a92
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/frontend/src/Components/Map.js b/src/frontend/src/Components/Map.js
@@ -218,6 +218,11 @@ export default function MapWrapper({
     });
   }
 
+  // Define the function to be executed after the delay
+  function resetCameraPopupRef() {
+      cameraPopupRef.current = null;
+    }
+
   function getCameraCircle(camera) {
     if (!camera) {
       return {};
@@ -416,10 +421,9 @@ export default function MapWrapper({
 
           updateClickedCamera(feature);
 
-          if (!cameraPopupRef.current) {
-            cameraPopupRef.current = popup;
-          } 
+          cameraPopupRef.current = popup;  
 
+          setTimeout(resetCameraPopupRef, 500);
         }
       } else {
         // if it wasn't a webcam icon, check if it was an event
@@ -625,6 +629,8 @@ export default function MapWrapper({
       clickedEventRef.current.set('clicked', false);
       updateClickedEvent(null);
     }
+
+    cameraPopupRef.current = null;
   }
 
   const setRelatedGeometry = (event, state) => {

diff --git a/src/frontend/src/Components/map/mapPopup.js b/src/frontend/src/Components/map/mapPopup.js
@@ -51,10 +51,7 @@ export function getCamPopup(camFeature, setClickedCamera, navigate, cameraPopupR
   const handlePopupClick = (e) => {
     if (!cameraPopupRef.current) {
       navigate(`/cameras/${camData.id}`);
-    }
-    else{
       cameraPopupRef.current = null;
-      return;      
     }
   };