Deactivate objectediting and objecteditingTool if 'active' property i…

…s false

GEO-1652

contribs/gmf/src/directives/objectediting.js

@@ -393,6 +393,15 @@ gmf.ObjecteditingController.prototype.$onInit = function() {
     this.handleGetQueryableLayersInfo_.bind(this)
   );
 
+  this.scope_.$watch(
+    () => this.active,
+    (newVal, oldVal) => {
+      if (newVal != oldVal) {
+        this.toggle_(newVal);
+      }
+    }
+  );
+
   this.scope_.$watchCollection(
     () => {
       if (this.gmfTreeManager_.rootCtrl) {
@@ -448,7 +457,6 @@ gmf.ObjecteditingController.prototype.$onInit = function() {
 
   // Toggle on
   this.initializeInteractions_();
-  this.registerInteractions_();
   this.toggle_(true);
   this.resetGeometryChanges_();
 
@@ -545,7 +553,6 @@ gmf.ObjecteditingController.prototype.undo = function() {
 
 
 /**
- * Undo the latest modifications.
  * @return {boolean} Whether the state is INSERT or not.
  * @export
  */
@@ -693,9 +700,11 @@ gmf.ObjecteditingController.prototype.toggle_ = function(active) {
     toolMgr.registerTool(uid, this.modifyToolActivate_, true);
     toolMgr.registerTool(uid, this.toolsToolActivate_, false);
 
+    this.registerInteractions_();
+
   } else {
 
-    this.undoAllChanges_();
+    this.unregisterInteractions_();
 
     keys.forEach((key) => {
       ol.events.unlistenByKey(key);
@@ -706,6 +715,7 @@ gmf.ObjecteditingController.prototype.toggle_ = function(active) {
 
   }
 
+  this.toolsActive = active;
   this.modify_.setActive(active);
 };
 
@@ -1069,7 +1079,7 @@ gmf.ObjecteditingController.prototype.handleGetQueryableLayersInfo_ = function(
 gmf.ObjecteditingController.prototype.handleDestroy_ = function() {
   this.features_.clear();
   this.toggle_(false);
-  this.unregisterInteractions_();
+  this.undoAllChanges_();
 };