Fix permalink

camptocamp · Aug 23, 2019 · e8cfbc7 · e8cfbc7
1 parent 847ade4
commit e8cfbc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/contribs/gmf/src/editing/editFeatureSelectorComponent.js b/contribs/gmf/src/editing/editFeatureSelectorComponent.js
@@ -168,15 +168,14 @@ function Controller($scope, $timeout, gmfThemes, gmfTreeManager) {
         const editables = this.editableTreeCtrls;
 
         editables.length = 0;
-        if (!this.gmfTreeManager_.rootCtrl) {
-          throw new Error('Missing gmfTreeManager_.rootCtrl');
+        if (this.gmfTreeManager_.rootCtrl) {
+          this.gmfTreeManager_.rootCtrl.traverseDepthFirst((treeCtrl) => {
+            const gmfLayer = /** @type {import('gmf/themes.js').GmfLayer} */(treeCtrl.node);
+            if (gmfLayer.editable) {
+              editables.push(treeCtrl);
+            }
+          });
         }
-        this.gmfTreeManager_.rootCtrl.traverseDepthFirst((treeCtrl) => {
-          const gmfLayer = /** @type {import('gmf/themes.js').GmfLayer} */(treeCtrl.node);
-          if (gmfLayer.editable) {
-            editables.push(treeCtrl);
-          }
-        });
       }
     }, 0);
   };

diff --git a/contribs/gmf/src/permalink/Permalink.js b/contribs/gmf/src/permalink/Permalink.js
@@ -555,10 +555,7 @@ export function PermalinkService(
          * @param {import('ngeo/layertree/Controller.js').LayertreeController} ctrl
          */
         (ctrl) => {
-          /**
-           * @type {import('gmf/themes.js').GmfGroup}
-           */
-          const groupNode = treeCtrl.node;
+          const groupNode = /** @type {import('gmf/themes.js').GmfGroup} */(ctrl.node);
           if (groupNode.children === undefined) {
             const param = ParamPrefix.TREE_ENABLE + ctrl.node.name;
             newState[param] = `${visible}`;