Merge pull request #5479 from camptocamp/gsgmf-1204-fix-gmf-draw-move

Fix Translate and Modify interactions
camptocamp · Feb 3, 2020 · 3844521 · 3844521
2 parents cb78de2 + 45beb67
commit 3844521
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/interaction/Modify.js b/src/interaction/Modify.js
@@ -189,13 +189,14 @@ export default class extends olInteractionInteraction {
    */
   setState_() {
     const map = this.getMap();
-    if (!map) {
-      return;
-    }
     const active = this.getActive();
     const interactions = this.interactions_;
     const keys = this.listenerKeys_;
 
+    if (!interactions || !keys) {
+      return;
+    }
+
     interactions.forEach((interaction) => {
       interaction.setActive(active && !!map);
     });

diff --git a/src/interaction/Translate.js b/src/interaction/Translate.js
@@ -160,16 +160,14 @@ export default class extends olInteractionTranslate {
    */
   setState_() {
     const map = this.getMap();
-    if (!map) {
-      return;
-    }
     const active = this.getActive();
     const features = this.myFeatures_;
-    if (!features) {
-      throw new Error('Missing features');
-    }
     const keys = this.listenerKeys_;
 
+    if (!features || !keys) {
+      return;
+    }
+
     if (map && active && features) {
       features.forEach(feature => this.addFeature_(feature));
       keys.push(