From b87e49e12f2568d85aa7f46fe978d4f290f4d654 Mon Sep 17 00:00:00 2001
From: Antoine de Maleprade <az0uz@users.noreply.github.com>
Date: Sat, 27 Apr 2019 22:52:49 -0700
Subject: [PATCH] fix: zone services discovery

---
 index.js | 59 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/index.js b/index.js
index a8c75d9..d16abb3 100644
--- a/index.js
+++ b/index.js
@@ -102,33 +102,6 @@ function NeatoVacuumRobotAccessory(robot, platform) {
 	this.vacuumRobotScheduleService = new Service.Switch(this.name + " Schedule", "schedule");
 	this.vacuumRobotBatteryService = new Service.BatteryService("Battery", "battery");
 
-	this.updatePersistentMaps(() => {
-		this.vacuumRobotCleanZoneServices = {};
-		this.maps.forEach((map) => {
-			map.boundaries.forEach((boundary) => {
-				if (boundary.type === "polygone") {
-					this.vacuumRobotCleanZoneServices[boundary.id] = new Service.Switch(this.name + " Clean the " + boundary.name, "clean");
-					this.vacuumRobotCleanZoneServices[boundary.id].getCharacteristic(Characteristic.On).on('set', (on, callback) => {
-						if(on){
-							if(that.robot.canStart) {
-								this.robot.startCleaningBoundary(this.eco, this.extraCare, boundary.id, (error, result) => {
-									if (error){
-										debug(error+": "+JSON.stringify(result));
-										return;
-									}
-									callback();
-								})
-							} else {
-								debug("Error, robot is already cleaning");
-								callback();
-							}
-						}
-					})
-				}
-			})
-		})
-	});
-
 	this.updateRobotTimer();
 }
 
@@ -145,7 +118,34 @@ NeatoVacuumRobotAccessory.prototype = {
 			that.log(that.robot);
 			that.robot._serial = _serial;
 			that.robot._secret = _secret;
-			callback();
+
+	    this.updatePersistentMaps(() => {
+	    	this.vacuumRobotCleanZoneServices = {};
+	    	this.maps.forEach((map) => {
+	    		map.boundaries.forEach((boundary) => {
+	    			if (boundary.type === "polygone") {
+	    				this.vacuumRobotCleanZoneServices[boundary.id] = new     Service.Switch(this.name + " Clean the " + boundary.name,     "clean");
+	    				this.vacuumRobotCleanZoneServices[boundary.id].getCharacteristic    (Characteristic.On).on('set', (on, serviceCallback) => {
+	    					if(on){
+	    						if(that.robot.canStart) {
+	    							this.robot.startCleaningBoundary(this.eco, this.extraCare,     boundary.id, (error, result) => {
+	    								if (error){
+	    									debug(error+": "+JSON.stringify(result));
+	    									return;
+	    								}
+	    								serviceCallback();
+	    							})
+	    						} else {
+	    							debug("Error, robot is already cleaning");
+	    							serviceCallback();
+	    						}
+	    					}
+	    				})
+	    			}
+	    		})
+	    	})
+	    	callback();
+	    });
 		});
 	},
 
@@ -194,6 +194,9 @@ NeatoVacuumRobotAccessory.prototype = {
 		if (this.hiddenServices.indexOf('schedule') === -1)
 			this.services.push(this.vacuumRobotScheduleService);
 
+			this.vacuumRobotCleanZoneServices.forEach((service) => {
+				services.push(service);
+			})
 		return this.services;
 	},