Move ToolActivate and ToolActivateMgr to misc module

camptocamp · Dec 21, 2017 · b1b693e · b1b693e
1 parent aeae7be
commit b1b693e
Show file tree

Hide file tree

Showing 23 changed files with 193 additions and 195 deletions.
diff --git a/contribs/gmf/apps/oeedit/js/controller.js b/contribs/gmf/apps/oeedit/js/controller.js
@@ -17,9 +17,9 @@ goog.require('ngeo.proj.EPSG21781');
 goog.require('gmf.objecteditingComponent');
 goog.require('gmf.ObjectEditingManager');
 goog.require('gmf.Themes');
-goog.require('ngeo.ToolActivate');
+goog.require('ngeo.misc.ToolActivate');
 /** @suppress {extraRequire} */
-goog.require('ngeo.ToolActivateMgr');
+goog.require('ngeo.misc.ToolActivateMgr');
 goog.require('ol');
 goog.require('ol.Collection');
 goog.require('ol.layer.Vector');
@@ -53,16 +53,16 @@ app.oeedit.Controller = function($scope, $injector, $timeout) {
 
   /**
    * The ngeo ToolActivate manager service.
-   * @type {ngeo.ToolActivateMgr}
+   * @type {ngeo.misc.ToolActivateMgr}
    */
   const ngeoToolActivateMgr = $injector.get('ngeoToolActivateMgr');
 
   ngeoToolActivateMgr.unregisterGroup('mapTools');
 
-  const oeEditToolActivate = new ngeo.ToolActivate(this, 'oeEditActive');
+  const oeEditToolActivate = new ngeo.misc.ToolActivate(this, 'oeEditActive');
   ngeoToolActivateMgr.registerTool('mapTools', oeEditToolActivate, true);
 
-  const queryToolActivate = new ngeo.ToolActivate(this, 'queryActive');
+  const queryToolActivate = new ngeo.misc.ToolActivate(this, 'queryActive');
   ngeoToolActivateMgr.registerTool('mapTools', queryToolActivate, false);
 
   // Set edit tool as default active one

diff --git a/contribs/gmf/examples/drawfeature.js b/contribs/gmf/examples/drawfeature.js
@@ -6,8 +6,8 @@ goog.require('gmf.mapDirective');
 goog.require('ngeo.draw.module');
 goog.require('ngeo.map.module');
 goog.require('ngeo.misc.FeatureHelper');
-goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
+goog.require('ngeo.misc.ToolActivate');
+goog.require('ngeo.misc.ToolActivateMgr');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
@@ -20,7 +20,7 @@ gmfapp.module = angular.module('gmfapp', [
   ngeo.draw.module.name,
   ngeo.map.module.name, // for ngeo.map.FeatureOverlay, perhaps remove me
   ngeo.misc.FeatureHelper.module.name,
-  ngeo.ToolActivateMgr.module.name,
+  ngeo.misc.ToolActivateMgr.module.name,
 ]);
 
 
@@ -34,7 +34,7 @@ gmfapp.module.value('ngeoExportFeatureFormats', [
  * @param {!angular.Scope} $scope Angular scope.
  * @param {ngeo.misc.FeatureHelper} ngeoFeatureHelper Gmf feature helper service.
  * @param {ol.Collection.<ol.Feature>} ngeoFeatures Collection of features.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.misc.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @param {ngeo.map.FeatureOverlayMgr} ngeoFeatureOverlayMgr Ngeo FeatureOverlay
  *     manager
@@ -79,7 +79,7 @@ gmfapp.MainController = function($scope, ngeoFeatureHelper, ngeoFeatures,
    */
   this.drawFeatureActive = true;
 
-  const drawFeatureToolActivate = new ngeo.ToolActivate(
+  const drawFeatureToolActivate = new ngeo.misc.ToolActivate(
     this, 'drawFeatureActive');
   ngeoToolActivateMgr.registerTool(
     'mapTools', drawFeatureToolActivate, true);
@@ -90,7 +90,7 @@ gmfapp.MainController = function($scope, ngeoFeatureHelper, ngeoFeatures,
    */
   this.pointerMoveActive = false;
 
-  const pointerMoveToolActivate = new ngeo.ToolActivate(
+  const pointerMoveToolActivate = new ngeo.misc.ToolActivate(
     this, 'pointerMoveActive');
   ngeoToolActivateMgr.registerTool(
     'mapTools', pointerMoveToolActivate, false);

diff --git a/contribs/gmf/examples/editfeatureselector.js b/contribs/gmf/examples/editfeatureselector.js
@@ -1,5 +1,6 @@
 goog.provide('gmfapp.editfeatureselector');
 
+goog.require('gmf');
 goog.require('gmf.Themes');
 goog.require('gmf.TreeManager');
 /** @suppress {extraRequire} */
@@ -11,8 +12,8 @@ goog.require('gmf.layertreeComponent');
 /** @suppress {extraRequire} */
 goog.require('gmf.mapDirective');
 goog.require('ngeo.misc.FeatureHelper');
-goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
+goog.require('ngeo.misc.ToolActivate');
+goog.require('ngeo.misc.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.proj.EPSG21781');
 goog.require('ol.Collection');
@@ -26,8 +27,8 @@ goog.require('ol.source.Vector');
 
 /** @type {!angular.Module} **/
 gmfapp.module = angular.module('gmfapp', [
-  'gmf',
-  ngeo.ToolActivateMgr.module.name,
+  gmf.module.name,
+  ngeo.misc.ToolActivateMgr.module.name,
   gmf.authentication.module.name,
 ]);
 
@@ -55,7 +56,7 @@ gmfapp.module.value('gmfLayersUrl',
  * @param {gmf.TreeManager} gmfTreeManager gmf Tree Manager service.
  * @param {gmfx.User} gmfUser User.
  * @param {ngeo.misc.FeatureHelper} ngeoFeatureHelper Ngeo feature helper service.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.misc.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @ngInject
  * @constructor
@@ -141,7 +142,7 @@ gmfapp.MainController = function($scope, gmfThemes, gmfTreeManager, gmfUser,
    */
   this.editFeatureSelectorActive = true;
 
-  const editFeatureSelectorToolActivate = new ngeo.ToolActivate(
+  const editFeatureSelectorToolActivate = new ngeo.misc.ToolActivate(
     this, 'editFeatureSelectorActive');
   ngeoToolActivateMgr.registerTool(
     'mapTools', editFeatureSelectorToolActivate, true);
@@ -152,7 +153,7 @@ gmfapp.MainController = function($scope, gmfThemes, gmfTreeManager, gmfUser,
    */
   this.dummyActive = false;
 
-  const dummyToolActivate = new ngeo.ToolActivate(
+  const dummyToolActivate = new ngeo.misc.ToolActivate(
     this, 'dummyActive');
   ngeoToolActivateMgr.registerTool(
     'mapTools', dummyToolActivate, false);

diff --git a/contribs/gmf/examples/filterselector.js b/contribs/gmf/examples/filterselector.js
@@ -2,6 +2,7 @@
 
 goog.provide('gmfapp.filterselector');
 
+goog.require('gmf');
 /** @suppress {extraRequire} */
 goog.require('gmf.authentication.module');
 goog.require('gmf.Themes');
@@ -18,8 +19,8 @@ goog.require('gmf.mapDirective');
 goog.require('ngeo.query.bboxQueryComponent');
 /** @suppress {extraRequire} */
 goog.require('ngeo.query.mapQueryComponent');
-goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
+goog.require('ngeo.misc.ToolActivate');
+goog.require('ngeo.misc.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.proj.EPSG21781');
 goog.require('ol.Map');
@@ -30,8 +31,8 @@ goog.require('ol.source.OSM');
 
 /** @type {!angular.Module} **/
 gmfapp.module = angular.module('gmfapp', [
-  'gmf',
-  ngeo.ToolActivateMgr.module.name,
+  gmf.module.name,
+  ngeo.misc.ToolActivateMgr.module.name,
   gmf.authentication.module.name,
 ]);
 
@@ -63,7 +64,7 @@ gmfapp.MainController = class {
    * @param {gmf.TreeManager} gmfTreeManager gmf Tree Manager service.
    * @param {ngeo.datasource.DataSources} ngeoDataSources Ngeo collection of
    *     data sources objects.
-   * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+   * @param {ngeo.misc.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
    *     service.
    * @ngInject
    */
@@ -127,7 +128,7 @@ gmfapp.MainController = class {
      */
     this.filterSelectorActive = true;
 
-    const filterSelectorToolActivate = new ngeo.ToolActivate(
+    const filterSelectorToolActivate = new ngeo.misc.ToolActivate(
       this, 'filterSelectorActive');
     ngeoToolActivateMgr.registerTool(
       'dummyTools', filterSelectorToolActivate, true);
@@ -138,7 +139,7 @@ gmfapp.MainController = class {
      */
     this.dummyActive = false;
 
-    const dummyToolActivate = new ngeo.ToolActivate(
+    const dummyToolActivate = new ngeo.misc.ToolActivate(
       this, 'dummyActive');
     ngeoToolActivateMgr.registerTool(
       'dummyTools', dummyToolActivate, false);
@@ -149,7 +150,7 @@ gmfapp.MainController = class {
      */
     this.queryActive = true;
 
-    const queryToolActivate = new ngeo.ToolActivate(
+    const queryToolActivate = new ngeo.misc.ToolActivate(
       this, 'queryActive');
     ngeoToolActivateMgr.registerTool(
       this.toolGroup, queryToolActivate, true);

diff --git a/contribs/gmf/examples/objectediting.js b/contribs/gmf/examples/objectediting.js
@@ -1,5 +1,6 @@
 goog.provide('gmfapp.objectediting');
 
+goog.require('gmf');
 goog.require('gmf.Themes');
 goog.require('gmf.TreeManager');
 /** @suppress {extraRequire} */
@@ -9,8 +10,8 @@ goog.require('gmf.mapDirective');
 /** @suppress {extraRequire} */
 goog.require('gmf.objecteditingComponent');
 goog.require('gmf.ObjectEditingManager');
-goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
+goog.require('ngeo.misc.ToolActivate');
+goog.require('ngeo.misc.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.proj.EPSG21781');
 goog.require('ol.Collection');
@@ -24,8 +25,8 @@ goog.require('ol.source.Vector');
 
 /** @type {!angular.Module} **/
 gmfapp.module = angular.module('gmfapp', [
-  'gmf',
-  ngeo.ToolActivateMgr.module.name,
+  gmf.module.name,
+  ngeo.misc.ToolActivateMgr.module.name,
 ]);
 
 
@@ -34,7 +35,7 @@ gmfapp.module = angular.module('gmfapp', [
  *     ObjectEditing manager service.
  * @param {gmf.Themes} gmfThemes The gmf themes service.
  * @param {gmf.TreeManager} gmfTreeManager gmf Tree Manager service.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.misc.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @constructor
  * @ngInject
@@ -130,7 +131,7 @@ gmfapp.MainController = function(gmfObjectEditingManager, gmfThemes,
    */
   this.objectEditingActive = true;
 
-  const objectEditingToolActivate = new ngeo.ToolActivate(
+  const objectEditingToolActivate = new ngeo.misc.ToolActivate(
     this, 'objectEditingActive');
   ngeoToolActivateMgr.registerTool(
     'mapTools', objectEditingToolActivate, true);
@@ -141,7 +142,7 @@ gmfapp.MainController = function(gmfObjectEditingManager, gmfThemes,
    */
   this.dummyActive = false;
 
-  const dummyToolActivate = new ngeo.ToolActivate(
+  const dummyToolActivate = new ngeo.misc.ToolActivate(
     this, 'dummyActive');
   ngeoToolActivateMgr.registerTool(
     'mapTools', dummyToolActivate, false);

diff --git a/contribs/gmf/src/controllers/AbstractAppController.js b/contribs/gmf/src/controllers/AbstractAppController.js
@@ -31,9 +31,9 @@ goog.require('ngeo.query.mapQueryComponent');
 goog.require('ngeo.misc.FeatureHelper');
 /** @suppress {extraRequire} */
 goog.require('ngeo.misc.getBrowserLanguage');
-goog.require('ngeo.ToolActivate');
+goog.require('ngeo.misc.ToolActivate');
 /** @suppress {extraRequire} */
-goog.require('ngeo.ToolActivateMgr');
+goog.require('ngeo.misc.ToolActivateMgr');
 goog.require('ol.events');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
@@ -401,26 +401,26 @@ gmf.AbstractAppController = function(config, $scope, $injector) {
 
   /**
    * The ngeo ToolActivate manager service.
-   * @type {ngeo.ToolActivateMgr}
+   * @type {ngeo.misc.ToolActivateMgr}
    */
   const ngeoToolActivateMgr = $injector.get('ngeoToolActivateMgr');
 
-  const queryToolActivate = new ngeo.ToolActivate(this, 'queryActive');
+  const queryToolActivate = new ngeo.misc.ToolActivate(this, 'queryActive');
   ngeoToolActivateMgr.registerTool(mapTools, queryToolActivate, true);
 
-  const measurePointActivate = new ngeo.ToolActivate(this, 'measurePointActive');
+  const measurePointActivate = new ngeo.misc.ToolActivate(this, 'measurePointActive');
   ngeoToolActivateMgr.registerTool(mapTools, measurePointActivate, false);
 
-  const measureLengthActivate = new ngeo.ToolActivate(this, 'measureLengthActive');
+  const measureLengthActivate = new ngeo.misc.ToolActivate(this, 'measureLengthActive');
   ngeoToolActivateMgr.registerTool(mapTools, measureLengthActivate, false);
 
-  const drawFeatureActivate = new ngeo.ToolActivate(this, 'drawFeatureActive');
+  const drawFeatureActivate = new ngeo.misc.ToolActivate(this, 'drawFeatureActive');
   ngeoToolActivateMgr.registerTool(mapTools, drawFeatureActivate, false);
 
-  const drawProfilePanelActivate = new ngeo.ToolActivate(this, 'drawProfilePanelActive');
+  const drawProfilePanelActivate = new ngeo.misc.ToolActivate(this, 'drawProfilePanelActive');
   ngeoToolActivateMgr.registerTool(mapTools, drawProfilePanelActivate, false);
 
-  const printPanelActivate = new ngeo.ToolActivate(this, 'printPanelActive');
+  const printPanelActivate = new ngeo.misc.ToolActivate(this, 'printPanelActive');
   ngeoToolActivateMgr.registerTool(mapTools, printPanelActivate, false);
 
   $scope.$root.$on(gmf.ThemeManager.EventType.THEME_NAME_SET, (event, name) => {

diff --git a/contribs/gmf/src/controllers/AbstractDesktopController.js b/contribs/gmf/src/controllers/AbstractDesktopController.js
@@ -35,7 +35,9 @@ goog.require('ngeo.btnDirective');
 /** @suppress {extraRequire} */
 goog.require('ngeo.draw.features');
 /** @suppress {extraRequire} */
-goog.require('ngeo.ToolActivate');
+goog.require('ngeo.misc.ToolActivate');
+/** @suppress {extraRequire} */
+goog.require('ngeo.misc.ToolActivateMgr');
 goog.require('ol.Collection');
 goog.require('ol.Map');
 goog.require('ol.View');
@@ -212,14 +214,14 @@ gmf.AbstractDesktopController = function(config, $scope, $injector) {
 
   /**
    * The ngeo ToolActivate manager service.
-   * @type {ngeo.ToolActivateMgr}
+   * @type {ngeo.misc.ToolActivateMgr}
    */
   const ngeoToolActivateMgr = $injector.get('ngeoToolActivateMgr');
 
-  const editFeatureActivate = new ngeo.ToolActivate(this, 'editFeatureActive');
+  const editFeatureActivate = new ngeo.misc.ToolActivate(this, 'editFeatureActive');
   ngeoToolActivateMgr.registerTool('mapTools', editFeatureActivate, false);
 
-  const googleStreetViewActivate = new ngeo.ToolActivate(
+  const googleStreetViewActivate = new ngeo.misc.ToolActivate(
     this,
     'googleStreetViewActive'
   );