fix: Resetting the map should also clear the Map cached by Valetudo

Hypfer · Jul 25, 2021 · e70041f · e70041f
1 parent 2bbd86f
commit e70041f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/backend/lib/core/ValetudoRobot.js b/backend/lib/core/ValetudoRobot.js
@@ -15,10 +15,19 @@ class ValetudoRobot {
         this.capabilities = {};
 
         this.state = new entities.state.RobotState({
-            map: require("../res/default_map")
+            map: ValetudoRobot.DEFAULT_MAP
         });
     }
 
+    /**
+     * @public
+     */
+    clearValetudoMap() {
+        this.state.map = ValetudoRobot.DEFAULT_MAP;
+
+        this.emitMapUpdated();
+    }
+
     /**
      *
      * @param {import("./capabilities/Capability")} capability
@@ -148,4 +157,6 @@ ValetudoRobot.EVENTS = {
     MapUpdated: "MapUpdated"
 };
 
+ValetudoRobot.DEFAULT_MAP = require("../res/default_map");
+
 module.exports = ValetudoRobot;
diff --git a/backend/lib/robots/dreame/capabilities/DreameMapResetCapability.js b/backend/lib/robots/dreame/capabilities/DreameMapResetCapability.js
@@ -56,6 +56,7 @@ class DreameMapResetCapability extends MapResetCapability {
             ) {
                 switch (res.out[0].value) {
                     case 0:
+                        this.robot.clearValetudoMap();
                         return;
                     default:
                         throw new Error("Got error " + res.out[0].value + " while resetting map.");

diff --git a/backend/lib/robots/roborock/capabilities/RoborockMapResetCapability.js b/backend/lib/robots/roborock/capabilities/RoborockMapResetCapability.js
@@ -13,6 +13,8 @@ class RoborockMapResetCapability extends MapResetCapability {
         if (!(Array.isArray(res) && res[0] === "ok")) {
             throw new Error("Failed to reset map: " + res);
         }
+
+        this.robot.clearValetudoMap();
     }
 }
 

diff --git a/backend/lib/robots/roborock/capabilities/RoborockMultiMapMapResetCapability.js b/backend/lib/robots/roborock/capabilities/RoborockMultiMapMapResetCapability.js
@@ -13,6 +13,8 @@ class RoborockMultiMapMapResetCapability extends MapResetCapability {
         if (!(Array.isArray(res) && res[0] === "ok")) {
             throw new Error("Failed to reset map: " + res);
         }
+
+        this.robot.clearValetudoMap();
     }
 }
 

diff --git a/backend/lib/robots/viomi/capabilities/ViomiMapResetCapability.js b/backend/lib/robots/viomi/capabilities/ViomiMapResetCapability.js
@@ -9,6 +9,8 @@ class ViomiMapResetCapability extends MapResetCapability {
      */
     async reset() {
         await this.robot.sendCommand("set_resetmap", [], {});
+
+        this.robot.clearValetudoMap();
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,8 @@ class RoborockMapResetCapability extends MapResetCapability { @@
             if (!(Array.isArray(res) && res[0] === "ok")) {
                 throw new Error("Failed to reset map: " + res);
             }
+            this.robot.clearValetudoMap();
         }
     }
@@ Expand Down @@