restore reset/clear map funcs

DFO-Ocean-Navigator · Feb 3, 2025 · 10a5a5d · 10a5a5d
1 parent 186ccec
commit 10a5a5d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/oceannavigator/frontend/src/components/DrawingTools.jsx b/oceannavigator/frontend/src/components/DrawingTools.jsx
@@ -18,7 +18,7 @@ function DrawingTools(props) {
   };
 
   const handleClear = () => {
-    props.action("clearPoints");
+    props.action("clearFeatures");
   };
 
   const handleUndo = () => {

diff --git a/oceannavigator/frontend/src/components/OceanNavigator.jsx b/oceannavigator/frontend/src/components/OceanNavigator.jsx
@@ -124,13 +124,15 @@ function OceanNavigator(props) {
       case "undoMapFeature":
         mapRef.current.undoFeature();
         break;
-      case "clearPoints":
-        // TODO: update
-        setVectorId(null);
+      case "clearFeatures":
+        mapRef.current.removeFeatures("all")
         break;
       case "resetMap":
         // TODO: update
         mapRef.current.resetMap();
+        if (uiSettings.showDrawingTools) {
+          mapRef.current.startDrawing();
+        }
         break;
       case "addPoints":
         // TODO: remove

diff --git a/oceannavigator/frontend/src/components/map/Map.jsx b/oceannavigator/frontend/src/components/map/Map.jsx
@@ -529,9 +529,14 @@ const Map = forwardRef((props, ref) => {
   };
 
   const removeFeatures = (featureIds) => {
-    let toRemove = featureIds.map((id) => {
-      return vectorSource.getFeatureById(id);
-    });
+    let toRemove;
+    if (featureIds === "all") {
+      toRemove = vectorSource.getFeatures();
+    } else {
+      toRemove = featureIds.map((id) => {
+        return vectorSource.getFeatureById(id);
+      });
+    }
     vectorSource.removeFeatures(toRemove);
   };
 
@@ -698,9 +703,6 @@ const Map = forwardRef((props, ref) => {
     if (props.compareDatasets) {
       removeMapInteractions(map1, "all");
     }
-    // TODO: refactor 
-    props.updateState(["vectorType", "vectorId", "names"], ["point", null, []]);
-    props.action("clearPoints");
 
     let newVectorSource = new VectorSource({
       features: [],