From ad010e5c8d60a49f81e31279bd647d099e28afd5 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Mon, 2 Oct 2023 09:55:25 +0200
Subject: [PATCH] concenrment history bug fix #2295

---
 src/components/ConcernementMapItem.vue   | 13 +++++++++----
 src/components/contents/TerrainDeVie.vue |  4 ++--
 src/stores/concernements.js              |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue
index ca507da..e0aa6fb 100644
--- a/src/components/ConcernementMapItem.vue
+++ b/src/components/ConcernementMapItem.vue
@@ -196,10 +196,12 @@ export default {
       },
       deep: true
     },
-    active_revision: {
-      handler (n, o) {
-        // console.log(`concernementMapItem watch active_revision o:${o}, n:${n}`);
-        if(o & n){ // do not trigger on first variable filling (if o is null)
+    concernement: {
+      handler (n, o){
+        // check for active_revision changes
+        // do not trigger on first variable filling (if o is null)
+        if(o && o.active_revision && n.active_revision){
+          // console.log(`concernementMapItem watch concernement o.active_revision:${o.active_revision}, n.active_revision:${n.active_revision}`);
           this.resetPaperActiveRevision();
         }
       },
@@ -559,16 +561,19 @@ export default {
       }
     },
     resetPaperActiveRevision(){
+      console.log('resetPaperActiveRevision');
       this.getJarvisEnvelopeConvexe();
       // remove contours if already exists
       if (this.paper_main_object.children.contours) {
         this.paper_main_object.children.contours.remove();
       }
+      // redraw contours
       this.paper_main_object.addChild(this.setPaperContour());
       // remove entites if already exists
       if (this.paper_main_object.children.entites) {
         this.paper_main_object.children.entites.remove();
       }
+      // redraw entites
       this.paper_main_object.addChild(this.setPaperEntites());
     },
     clearPaperContents(){
diff --git a/src/components/contents/TerrainDeVie.vue b/src/components/contents/TerrainDeVie.vue
index d555c5b..2dad85a 100644
--- a/src/components/contents/TerrainDeVie.vue
+++ b/src/components/contents/TerrainDeVie.vue
@@ -94,8 +94,8 @@ export default {
   watch: {
     history_value: {
       handler (n, o) {
-        console.log(`TerrainDeVie watch history_value o:${o}, n:${n}`);
-        this.setActiveRevision(this.concernement.id, n);
+        // console.log(`TerrainDeVie watch history_value o:${o}, n:${n}`);
+        this.setActiveRevision(this.cid, n);
       },
       deep: true
     },
diff --git a/src/stores/concernements.js b/src/stores/concernements.js
index c318b56..329dcca 100644
--- a/src/stores/concernements.js
+++ b/src/stores/concernements.js
@@ -421,6 +421,7 @@ export const ConcernementsStore = defineStore({
       this.recit_plyr_player = player;
     },
     setActiveRevision (cid, rid) {
+      // console.log(`setActiveRevision, cid:${cid}, rid:${rid}`);
       this.concernementsByID[cid].active_revision = rid;
     }