fix(contextManager): default tool after context change

infra-geo-ouverte · May 11, 2020 · 79a1239 · 79a1239
1 parent b85c688
commit 79a1239
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/app/pages/portal/portal.component.ts b/src/app/pages/portal/portal.component.ts
@@ -442,15 +442,13 @@ export class PortalComponent implements OnInit, OnDestroy {
       const contextManagerOptions = contextManager
         ? contextManager.options
         : {};
-      let toolToOpen = contextManagerOptions.toolToOpenOnContextChange
-        ? contextManagerOptions.toolToOpenOnContextChange
-        : undefined;
+      let toolToOpen = contextManagerOptions.toolToOpenOnContextChange;
 
       if (!toolToOpen) {
         const toolOrderToOpen = ['mapTools', 'map', 'mapDetails', 'mapLegend'];
         for (const toolName of toolOrderToOpen) {
-          toolToOpen = this.toolbox.getTool(toolName);
-          if (toolToOpen) {
+          if (this.toolbox.getTool(toolName)) {
+            toolToOpen = toolName;
             break;
           }
         }

diff --git a/src/contexts/_base.json b/src/contexts/_base.json
@@ -90,17 +90,11 @@
       }
     },
     {
-      "name": "contextManager",
-      "options": {
-        "toolToOpenOnContextChange": "mapTools"
-      }
+      "name": "contextManager"
     },
     {
       "name": "about"
     },
-    {
-      "name": "map"
-    },
     {
       "name": "mapTools",
       "options": {