fix: avoid js error when map is not set when activate/deactivate is c…

…alled
geops · Aug 22, 2024 · c808a36 · c808a36
1 parent 62a427d
commit c808a36
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/control/buffer.js b/src/control/buffer.js
@@ -93,7 +93,7 @@ class BufferControl extends Control {
    * @inheritdoc
    */
   activate() {
-    this.map.addInteraction(this.selectInteraction);
+    this.map?.addInteraction(this.selectInteraction);
     super.activate();
 
     document.getElementById('buffer-width')?.addEventListener('change', (e) => {
@@ -114,7 +114,7 @@ class BufferControl extends Control {
    * @inheritdoc
    */
   deactivate() {
-    this.map.removeInteraction(this.selectInteraction);
+    this.map?.removeInteraction(this.selectInteraction);
     super.deactivate();
   }
 }

diff --git a/src/control/cad.js b/src/control/cad.js
@@ -790,8 +790,8 @@ class CadControl extends Control {
     super.activate(silent);
     this.snapLayer.setMap(this.map);
     this.linesLayer.setMap(this.map);
-    this.map.addInteraction(this.pointerInteraction);
-    this.map.addInteraction(this.snapInteraction);
+    this.map?.addInteraction(this.pointerInteraction);
+    this.map?.addInteraction(this.snapInteraction);
 
     document.getElementById('aux-cb')?.addEventListener('change', (evt) => {
       this.setProperties({
@@ -822,8 +822,8 @@ class CadControl extends Control {
     super.deactivate(silent);
     this.snapLayer.setMap(null);
     this.linesLayer.setMap(null);
-    this.map.removeInteraction(this.pointerInteraction);
-    this.map.removeInteraction(this.snapInteraction);
+    this.map?.removeInteraction(this.pointerInteraction);
+    this.map?.removeInteraction(this.snapInteraction);
   }
 }
 

diff --git a/src/control/draw.js b/src/control/draw.js
@@ -64,15 +64,15 @@ class DrawControl extends Control {
    * @inheritdoc
    */
   activate() {
-    this.map.addInteraction(this.drawInteraction);
+    this.map?.addInteraction(this.drawInteraction);
     super.activate();
   }
 
   /**
    * @inheritdoc
    */
   deactivate(silent) {
-    this.map.removeInteraction(this.drawInteraction);
+    this.map?.removeInteraction(this.drawInteraction);
     super.deactivate(silent);
   }
 }

diff --git a/src/control/rotate.js b/src/control/rotate.js
@@ -152,7 +152,7 @@ class RotateControl extends Control {
    * @inheritdoc
    */
   activate() {
-    this.map.addInteraction(this.pointerInteraction);
+    this.map?.addInteraction(this.pointerInteraction);
     this.rotateLayer.setMap(this.map);
     super.activate();
   }
@@ -163,7 +163,7 @@ class RotateControl extends Control {
   deactivate(silent) {
     this.rotateLayer.getSource().clear();
     this.rotateLayer.setMap(null);
-    this.map.removeInteraction(this.pointerInteraction);
+    this.map?.removeInteraction(this.pointerInteraction);
     super.deactivate(silent);
   }
 }

diff --git a/src/control/topology.js b/src/control/topology.js
@@ -61,7 +61,7 @@ class TopologyControl extends Control {
    * @inheritdoc
    */
   activate() {
-    this.map.addInteraction(this.selectInteraction);
+    this.map?.addInteraction(this.selectInteraction);
     this.addedFeatures = [];
     super.activate();
   }
@@ -71,7 +71,7 @@ class TopologyControl extends Control {
    */
   deactivate(silent) {
     this.addedFeatures = [];
-    this.map.removeInteraction(this.selectInteraction);
+    this.map?.removeInteraction(this.selectInteraction);
     super.deactivate(silent);
   }
 }