fix(vendor.roborock): Fix segment rename

Hypfer · Mar 24, 2021 · 0bed81a · 0bed81a
1 parent 306b8ba
commit 0bed81a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/client/segment-edit-map.html b/client/segment-edit-map.html
@@ -19,7 +19,7 @@
         <ons-fab ripple id="segment-edit-join">
             <ons-icon icon="fa-object-group"></ons-icon>
         </ons-fab>
-        <ons-fab ripple id="segment-rename" onclick="handleSegmentRenameButton()">
+        <ons-fab ripple id="segment-rename">
             <ons-icon icon="fa-i-cursor"></ons-icon>
         </ons-fab>
     </div>

diff --git a/client/segment-edit-map.js b/client/segment-edit-map.js
@@ -99,6 +99,8 @@ function segmentConfigInit() {
             segmentId = locations.selectedSegments[0].id;
             segmentRenameDialogNameInput.value = locations.selectedSegments[0].name;
             segmentRenameDialog.show();
+        } else {
+            ons.notification.toast("You need to select exactly one segment to rename it.",{buttonLabel: "Dismiss", timeout: window.fn.toastErrorTimeout});
         }
     };
 

diff --git a/lib/robots/roborock/capabilities/RoborockMapSegmentRenameCapability.js b/lib/robots/roborock/capabilities/RoborockMapSegmentRenameCapability.js
@@ -19,7 +19,7 @@ class RoborockMapSegmentRenameCapability extends MapSegmentRenameCapability {
         ];
 
         Object.keys(this.segmentNames).forEach(k => {
-            if (k !== segment.id) {
+            if (parseInt(k) !== parseInt(segment.id)) {
                 payload.push({
                     miRoomId: this.segmentNames[k],
                     robotRoomId: parseInt(k)

diff --git a/lib/robots/viomi/ViomiValetudoRobot.js b/lib/robots/viomi/ViomiValetudoRobot.js
@@ -451,18 +451,7 @@ class ViomiValetudoRobot extends MiioValetudoRobot {
         try {
             // noinspection UnnecessaryLocalVariableJS
             const map = new ViomiMapParser(data).parse();
-            // TODO: reimplement zones
-            // const zones = this.configuration.getZones();
-            // zones.forEach((v, k) => v.user || zones.delete(k));
-            // // TODO: Remove this once Valetudo supports named rooms in the zone clean menu.
-            // map.layers.forEach(layer => {
-            //     if (layer.type !== MapLayer.TYPE.SEGMENT) {
-            //         return;
-            //     }
-            //     const id = layer.metaData.segmentId;
-            //     zones.set(id, {id: id, name: layer.metaData.name, user: false});
-            // });
-            // this.configuration.setZones(zones);
+
             this.state.map = map;
 
             this.emitMapUpdated();