From f20c39f6a4605130eca4a49750845d09e770a22e Mon Sep 17 00:00:00 2001
From: Benedicte Quimbert <b.quimbert@workadventu.re>
Date: Wed, 3 Nov 2021 16:51:33 +0100
Subject: [PATCH 1/4] wip

---
 maps/tests/TriggerMessageApi/script.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/maps/tests/TriggerMessageApi/script.js b/maps/tests/TriggerMessageApi/script.js
index 9ab02ec2..a09b7653 100644
--- a/maps/tests/TriggerMessageApi/script.js
+++ b/maps/tests/TriggerMessageApi/script.js
@@ -1,16 +1,19 @@
 WA.onInit().then(() => {
-    let message;
+  let message;
+  console.log('the right place!')
 
-    WA.room.onEnterZone("carpet", () => {
-        message = WA.ui.displayActionMessage({
-            message: "This is a test message. Press space to display a chat message. Walk out to hide the message.",
-            callback: () => {
-                WA.chat.sendChatMessage("Hello world!", "The bot");
-            }
-        });
+  WA.room.onEnterLayer("carpet").subscribe(() => {
+    message = WA.ui.displayActionMessage({
+      message:
+        "This is a bis test message. Press space to display a chat message. Walk out to hide the message.",
+      callback: () => {
+        WA.chat.sendChatMessage("Hello world!", "The bot");
+      },
     });
+  });
 
-    WA.room.onLeaveZone("carpet", () => {
-        message && message.remove();
-    });
+
+  WA.room.onLeaveLayer("carpet").subscribe(() => {
+    message && message.remove();
+  });
 });

From 854d8775d5ab12ff839e3ba3a6bc72ab63aa82b3 Mon Sep 17 00:00:00 2001
From: Benedicte Quimbert <b.quimbert@workadventu.re>
Date: Wed, 3 Nov 2021 19:24:24 +0100
Subject: [PATCH 2/4] Edit documentation exemples

---
 docs/maps/api-controls.md |  4 ++--
 docs/maps/api-ui.md       | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/maps/api-controls.md b/docs/maps/api-controls.md
index dcb0f17b..c2b47262 100644
--- a/docs/maps/api-controls.md
+++ b/docs/maps/api-controls.md
@@ -15,7 +15,7 @@ When controls are disabled, the user cannot move anymore using keyboard input. T
 Example:
 
 ```javascript
-WA.room.onEnterZone('myZone', () => {
+WA.room.onEnterLayer('myZone').subscribe(() => {
     WA.controls.disablePlayerControls();
     WA.ui.openPopup("popupRectangle", 'This is an imporant message!', [{
         label: "Got it!",
@@ -25,5 +25,5 @@ WA.room.onEnterZone('myZone', () => {
             popup.close();
         }
     }]);
-});
+})
 ```
diff --git a/docs/maps/api-ui.md b/docs/maps/api-ui.md
index dc701500..8583c061 100644
--- a/docs/maps/api-ui.md
+++ b/docs/maps/api-ui.md
@@ -49,7 +49,7 @@ Example:
 let helloWorldPopup;
 
 // Open the popup when we enter a given zone
-helloWorldPopup = WA.room.onEnterZone('myZone', () => {
+helloWorldPopup = WA.room.onEnterLayer("myZone").subscribe(() => {
     WA.ui.openPopup("popupRectangle", 'Hello world!', [{
         label: "Close",
         className: "primary",
@@ -57,13 +57,13 @@ helloWorldPopup = WA.room.onEnterZone('myZone', () => {
             // Close the popup when the "Close" button is pressed.
             popup.close();
         }
-    });
-}]);
+    }]);
+});
 
 // Close the popup when we leave the zone.
-WA.room.onLeaveZone('myZone', () => {
+WA.room.onLeaveLayer("myZone").subscribe(() => {
     helloWorldPopup.close();
-});
+})
 ```
 
 ### Add custom menu

From 7da975749c025807bfde287c364d34ee73efc428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dicte=20Q?=
 <37311765+HimeShaman@users.noreply.github.com>
Date: Mon, 8 Nov 2021 10:51:08 +0100
Subject: [PATCH 3/4] Update maps/tests/TriggerMessageApi/script.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
---
 maps/tests/TriggerMessageApi/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maps/tests/TriggerMessageApi/script.js b/maps/tests/TriggerMessageApi/script.js
index a09b7653..143f418b 100644
--- a/maps/tests/TriggerMessageApi/script.js
+++ b/maps/tests/TriggerMessageApi/script.js
@@ -5,7 +5,7 @@ WA.onInit().then(() => {
   WA.room.onEnterLayer("carpet").subscribe(() => {
     message = WA.ui.displayActionMessage({
       message:
-        "This is a bis test message. Press space to display a chat message. Walk out to hide the message.",
+        "This is a test message. Press space to display a chat message. Walk out to hide the message.",
       callback: () => {
         WA.chat.sendChatMessage("Hello world!", "The bot");
       },

From b9bf27983f839ccdb49753451d05776e8e6c3bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dicte=20Q?=
 <37311765+HimeShaman@users.noreply.github.com>
Date: Mon, 8 Nov 2021 10:51:18 +0100
Subject: [PATCH 4/4] Update maps/tests/TriggerMessageApi/script.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
---
 maps/tests/TriggerMessageApi/script.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maps/tests/TriggerMessageApi/script.js b/maps/tests/TriggerMessageApi/script.js
index 143f418b..4041d98b 100644
--- a/maps/tests/TriggerMessageApi/script.js
+++ b/maps/tests/TriggerMessageApi/script.js
@@ -1,6 +1,5 @@
 WA.onInit().then(() => {
   let message;
-  console.log('the right place!')
 
   WA.room.onEnterLayer("carpet").subscribe(() => {
     message = WA.ui.displayActionMessage({