Merge pull request #5550 from camptocamp/GSGMF-1217

Deactivate query when routing panel is open
camptocamp · Feb 21, 2020 · 643c7e0 · 643c7e0
2 parents 2c75b50 + f1c3b3a
commit 643c7e0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -101,7 +101,7 @@
               data-toggle="tooltip" data-placement="left" data-original-title="{{'Import Layer'|translate}}">
               <span class="fa fa-upload"></span>
             </button>
-            <button ngeo-btn class="btn btn-default" ng-model="mainCtrl.routingfeatureActive"
+            <button ngeo-btn class="btn btn-default" ng-model="mainCtrl.routingPanelActive"
                     data-toggle="tooltip" data-placement="left" data-original-title="{{'Routing'|translate}}">
               <span class="fa fa-map-signs"></span>
             </button>
@@ -256,11 +256,11 @@
               </gmf-importdatasource>
             </div>
           </div>
-          <div ng-show="mainCtrl.routingfeatureActive" class="row">
+          <div ng-show="mainCtrl.routingPanelActive" class="row">
             <div class="col-sm-12">
               <div class="gmf-app-tools-content-heading">
                 {{'Routing'|translate}}
-                <a class="btn close" ng-click="mainCtrl.routingfeatureActive = false">&times;</a>
+                <a class="btn close" ng-click="mainCtrl.routingPanelActive = false">&times;</a>
               </div>
               <ngeo-routing
                   ngeo-routing-map="mainCtrl.map">

diff --git a/contribs/gmf/src/controllers/AbstractAppController.js b/contribs/gmf/src/controllers/AbstractAppController.js
@@ -425,6 +425,11 @@ export function AbstractAppController(config, map, $scope, $injector) {
    */
   this.drawProfilePanelActive = false;
 
+  /**
+   * @type {boolean}
+   */
+  this.routingPanelActive = false;
+
   /**
    * @type {import('gmf/authentication/Service.js').User}
    */
@@ -514,6 +519,9 @@ export function AbstractAppController(config, map, $scope, $injector) {
   const contextdataActivate = new ngeoMiscToolActivate(this, 'contextdataActive');
   ngeoToolActivateMgr.registerTool(mapTools, contextdataActivate, false);
 
+  const routingPanelActive = new ngeoMiscToolActivate(this, 'routingPanelActive');
+  ngeoToolActivateMgr.registerTool(mapTools, routingPanelActive, false);
+
   $scope.$root.$on(ThemeEventType.THEME_NAME_SET, (event, name) => {
     this.gmfThemes_.getThemeObject(name).then((theme) => {
       this.setDefaultBackground_(theme);

diff --git a/contribs/gmf/src/controllers/AbstractDesktopController.js b/contribs/gmf/src/controllers/AbstractDesktopController.js
@@ -94,11 +94,6 @@ export class AbstractDesktopController extends AbstractAPIController {
      */
     this.queryPanelActive = false;
 
-    /**
-     * @type {boolean}
-     */
-    this.routingfeatureActive = false;
-
     /**
      * @type {boolean}
      */

diff --git a/examples/routing.js b/examples/routing.js
@@ -72,7 +72,7 @@ function MainController() {
   /**
    * @type {boolean}
    */
-  this.routingfeatureActive = true;
+  this.routingPanelActive = true;
 }
 
 module.controller('MainController', MainController);