Merge pull request #3110 from camptocamp/feature-GSGMF-140-remove-dou…

…ble-provides Remove double provides from services
camptocamp · Nov 21, 2017 · c0f412e · c0f412e
2 parents bf06102 + 44fa73c
commit c0f412e
Show file tree

Hide file tree

Showing 37 changed files with 252 additions and 268 deletions.
diff --git a/contribs/gmf/apps/oeedit/js/controller.js b/contribs/gmf/apps/oeedit/js/controller.js
@@ -23,7 +23,6 @@ goog.require('gmf.objecteditingComponent');
 goog.require('gmf.ObjectEditingManager');
 goog.require('gmf.Themes');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 goog.require('ol.Collection');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.Vector');
@@ -56,7 +55,7 @@ app.OEEditController = function($scope, $injector, $timeout) {
 
   /**
    * The ngeo ToolActivate manager service.
-   * @type {ngeo.ToolActivateMgr}
+   * @type {ngeo.ToolActivate.Mgr}
    */
   const ngeoToolActivateMgr = $injector.get('ngeoToolActivateMgr');
 

diff --git a/contribs/gmf/examples/drawfeature.js b/contribs/gmf/examples/drawfeature.js
@@ -8,7 +8,6 @@ goog.require('ngeo.FeatureHelper');
 /** @suppress {extraRequire} */
 goog.require('ngeo.Features');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
@@ -29,7 +28,7 @@ gmfapp.module.value('ngeoExportFeatureFormats', [
  * @param {!angular.Scope} $scope Angular scope.
  * @param {ngeo.FeatureHelper} ngeoFeatureHelper Gmf feature helper service.
  * @param {ol.Collection.<ol.Feature>} ngeoFeatures Collection of features.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @param {ngeo.FeatureOverlayMgr} ngeoFeatureOverlayMgr Ngeo FeatureOverlay
  *     manager

diff --git a/contribs/gmf/examples/editfeatureselector.js b/contribs/gmf/examples/editfeatureselector.js
@@ -12,7 +12,6 @@ goog.require('gmf.layertreeComponent');
 goog.require('gmf.mapDirective');
 goog.require('ngeo.FeatureHelper');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.proj.EPSG21781');
 goog.require('ol.Collection');
@@ -51,7 +50,7 @@ gmfapp.module.value('gmfLayersUrl',
  * @param {gmf.TreeManager} gmfTreeManager gmf Tree Manager service.
  * @param {gmfx.User} gmfUser User.
  * @param {ngeo.FeatureHelper} ngeoFeatureHelper Ngeo feature helper service.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @ngInject
  * @constructor

diff --git a/contribs/gmf/examples/filterselector.js b/contribs/gmf/examples/filterselector.js
@@ -19,7 +19,6 @@ goog.require('ngeo.bboxQueryDirective');
 /** @suppress {extraRequire} */
 goog.require('ngeo.mapQueryDirective');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.proj.EPSG21781');
 goog.require('ol.Map');
@@ -59,7 +58,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.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
    *     service.
    * @ngInject
    */

diff --git a/contribs/gmf/examples/objectediting.js b/contribs/gmf/examples/objectediting.js
@@ -10,7 +10,6 @@ goog.require('gmf.mapDirective');
 goog.require('gmf.objecteditingComponent');
 goog.require('gmf.ObjectEditingManager');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.proj.EPSG21781');
 goog.require('ol.Collection');
@@ -31,7 +30,7 @@ gmfapp.module = angular.module('gmfapp', ['gmf']);
  *     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.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @constructor
  * @ngInject

diff --git a/contribs/gmf/src/controllers/abstract.js b/contribs/gmf/src/controllers/abstract.js
@@ -37,7 +37,6 @@ goog.require('ngeo.GetBrowserLanguage');
 goog.require('ngeo.MapQuerent');
 goog.require('ngeo.StateManager');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 goog.require('ol.events');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
@@ -394,7 +393,7 @@ gmf.AbstractController = function(config, $scope, $injector) {
 
   /**
    * The ngeo ToolActivate manager service.
-   * @type {ngeo.ToolActivateMgr}
+   * @type {ngeo.ToolActivate.Mgr}
    */
   const ngeoToolActivateMgr = $injector.get('ngeoToolActivateMgr');
 

diff --git a/contribs/gmf/src/controllers/abstractdesktop.js b/contribs/gmf/src/controllers/abstractdesktop.js
@@ -45,7 +45,6 @@ goog.require('ngeo.FeatureOverlayMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.scaleselectorDirective');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 goog.require('ol.Collection');
 goog.require('ol.Map');
 goog.require('ol.View');
@@ -222,7 +221,7 @@ gmf.AbstractDesktopController = function(config, $scope, $injector) {
 
   /**
    * The ngeo ToolActivate manager service.
-   * @type {ngeo.ToolActivateMgr}
+   * @type {ngeo.ToolActivate.Mgr}
    */
   const ngeoToolActivateMgr = $injector.get('ngeoToolActivateMgr');
 

diff --git a/contribs/gmf/src/directives/disclaimer.js b/contribs/gmf/src/directives/disclaimer.js
@@ -79,7 +79,7 @@ gmf.module.component('gmfDisclaimer', gmf.disclaimerComponent);
  * @param {!angular.Scope} $scope Angular scope.
  * @param {!angular.$sce} $sce Angular sce service.
  * @param {!angular.$timeout} $timeout Angular timeout service.
- * @param {!ngeo.CreatePopup} ngeoCreatePopup Popup service.
+ * @param {!ngeo.Popup.Factory} ngeoCreatePopup Popup service.
  * @param {!ngeo.Disclaimer} ngeoDisclaimer Ngeo Disclaimer service.
  * @param {!ngeo.EventHelper} ngeoEventHelper Ngeo Event Helper.
  * @param {!ngeo.LayerHelper} ngeoLayerHelper Ngeo Layer Helper.
@@ -148,7 +148,7 @@ gmf.DisclaimerController = function($element, $scope, $sce, $timeout,
   this.element_ = $element;
 
   /**
-   * @type {!ngeo.CreatePopup}
+   * @type {!ngeo.Popup.Factory}
    * @private
    */
   this.createPopup_ = ngeoCreatePopup;

diff --git a/contribs/gmf/src/directives/drawfeature.js b/contribs/gmf/src/directives/drawfeature.js
@@ -5,7 +5,6 @@ goog.require('gmf');
 goog.require('gmf.featurestyleDirective');
 goog.require('ngeo.Menu');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.btnDirective');
 /** @suppress {extraRequire} */
@@ -64,7 +63,7 @@ gmf.module.directive('gmfDrawfeature', gmf.drawfeatureDirective);
  *     interaction service.
  * @param {!ngeo.FeatureHelper} ngeoFeatureHelper Ngeo feature helper service.
  * @param {!ol.Collection.<!ol.Feature>} ngeoFeatures Collection of features.
- * @param {!ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {!ngeo.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @constructor
  * @private
@@ -152,7 +151,7 @@ gmf.DrawfeatureController = function($scope, $timeout, gettextCatalog, ngeoDecor
   this.features = ngeoFeatures;
 
   /**
-   * @type {!ngeo.ToolActivateMgr}
+   * @type {!ngeo.ToolActivate.Mgr}
    * @private
    */
   this.ngeoToolActivateMgr_ = ngeoToolActivateMgr;

diff --git a/contribs/gmf/src/directives/editfeature.js b/contribs/gmf/src/directives/editfeature.js
@@ -19,7 +19,6 @@ goog.require('ngeo.FeatureHelper');
 goog.require('ngeo.LayerHelper');
 goog.require('ngeo.Menu');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 goog.require('ngeo.interaction.Rotate');
 goog.require('ngeo.interaction.Translate');
 /** @suppress {extraRequire} */
@@ -109,7 +108,7 @@ gmf.module.directive(
  * @param {ngeo.EventHelper} ngeoEventHelper Ngeo Event Helper.
  * @param {ngeo.FeatureHelper} ngeoFeatureHelper Ngeo feature helper service.
  * @param {ngeo.LayerHelper} ngeoLayerHelper Ngeo Layer Helper.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @constructor
  * @private
@@ -241,7 +240,7 @@ gmf.EditfeatureController = function($element, $q, $scope, $timeout,
   this.ngeoLayerHelper_ = ngeoLayerHelper;
 
   /**
-   * @type {ngeo.ToolActivateMgr}
+   * @type {ngeo.ToolActivate.Mgr}
    * @private
    */
   this.ngeoToolActivateMgr_ = ngeoToolActivateMgr;

diff --git a/contribs/gmf/src/directives/layertree.js b/contribs/gmf/src/directives/layertree.js
@@ -10,7 +10,7 @@ goog.require('gmf.Permalink');
 goog.require('gmf.SyncLayertreeMap');
 goog.require('gmf.TreeManager');
 goog.require('ngeo.WMSTime');
-goog.require('ngeo.CreatePopup');
+goog.require('ngeo.Popup');
 goog.require('ngeo.LayerHelper');
 goog.require('ngeo.LayertreeController');
 /** @suppress {extraRequire} */
@@ -117,7 +117,7 @@ gmf.module.component('gmfLayertree', gmf.layertreeComponent);
  * @param {!angular.$http} $http Angular http service.
  * @param {!angular.$sce} $sce Angular sce service.
  * @param {!angular.Scope} $scope Angular scope.
- * @param {!ngeo.CreatePopup} ngeoCreatePopup Popup service.
+ * @param {!ngeo.Popup.Factory} ngeoCreatePopup Popup service.
  * @param {!ngeo.LayerHelper} ngeoLayerHelper Ngeo Layer Helper.
  * @param {gmf.datasource.DataSourceBeingFiltered} gmfDataSourceBeingFiltered
  *     The Gmf value service that determines the data source currently being

diff --git a/contribs/gmf/src/directives/objectediting.js b/contribs/gmf/src/directives/objectediting.js
@@ -12,7 +12,6 @@ goog.require('ngeo.geom');
 goog.require('ngeo.jstsExports');
 goog.require('ngeo.LayerHelper');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 goog.require('ngeo.utils');
 goog.require('ol.Collection');
 goog.require('ol.events');
@@ -107,7 +106,7 @@ gmf.module.component('gmfObjectediting', gmf.objecteditingComponent);
  * @param {!ngeo.FeatureHelper} ngeoFeatureHelper Ngeo feature helper service.
 goog.require('ngeo.LayerHelper');
  * @param {!ngeo.LayerHelper} ngeoLayerHelper Ngeo Layer Helper.
- * @param {!ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {!ngeo.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @constructor
  * @private
@@ -255,7 +254,7 @@ gmf.ObjecteditingController = function($scope, $timeout, gettextCatalog,
   this.ngeoFeatureHelper_ = ngeoFeatureHelper;
 
   /**
-   * @type {!ngeo.ToolActivateMgr}
+   * @type {!ngeo.ToolActivate.Mgr}
    * @private
    */
   this.ngeoToolActivateMgr_ = ngeoToolActivateMgr;

diff --git a/contribs/gmf/src/directives/objecteditingtools.js b/contribs/gmf/src/directives/objecteditingtools.js
@@ -10,7 +10,6 @@ goog.require('ngeo.createfeatureDirective');
 goog.require('ngeo.createregularpolygonfromclickDirective');
 goog.require('ngeo.DecorateInteraction');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 
 
 /**
@@ -92,7 +91,7 @@ gmf.module.directive('gmfObjecteditingtools', gmf.objecteditingtoolsDirective);
  * @param {!angular.Scope} $scope Scope.
  * @param {ngeo.DecorateInteraction} ngeoDecorateInteraction Decorate
  *     interaction service.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @constructor
  * @private
@@ -181,7 +180,7 @@ gmf.ObjecteditingtoolsController = function($injector, $scope,
   this.ngeoDecorateInteraction_ = ngeoDecorateInteraction;
 
   /**
-   * @type {ngeo.ToolActivateMgr}
+   * @type {ngeo.ToolActivate.Mgr}
    * @private
    */
   this.ngeoToolActivateMgr_ = ngeoToolActivateMgr;

diff --git a/contribs/gmf/src/directives/print.js b/contribs/gmf/src/directives/print.js
@@ -3,7 +3,7 @@ goog.provide('gmf.printDirective');
 goog.require('gmf');
 /** @suppress {extraRequire} */
 goog.require('gmf.authenticationDirective');
-goog.require('ngeo.CreatePrint');
+goog.require('ngeo.Print');
 goog.require('ngeo.FeatureOverlayMgr');
 goog.require('ngeo.LayerHelper');
 goog.require('ngeo.PrintUtils');

diff --git a/contribs/gmf/src/directives/wmscapabilitylayertreenode.js b/contribs/gmf/src/directives/wmscapabilitylayertreenode.js
@@ -4,7 +4,7 @@ goog.require('gmf');
 /** @suppress {extraRequire} */
 goog.require('gmf.datasource.ExternalDataSourcesManager');
 /** @suppress {extraRequire} */
-goog.require('ngeo.CreatePopup');
+goog.require('ngeo.Popup');
 
 
 /**

diff --git a/contribs/gmf/src/directives/wmtscapabilitylayertree.js b/contribs/gmf/src/directives/wmtscapabilitylayertree.js
@@ -4,7 +4,7 @@ goog.require('gmf');
 /** @suppress {extraRequire} */
 goog.require('gmf.datasource.ExternalDataSourcesManager');
 /** @suppress {extraRequire} */
-goog.require('ngeo.CreatePopup');
+goog.require('ngeo.Popup');
 
 
 /**

diff --git a/examples/createfeature.js b/examples/createfeature.js
@@ -1,7 +1,6 @@
 goog.provide('app.createfeature');
 
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.btnDirective');
 /** @suppress {extraRequire} */
@@ -22,7 +21,7 @@ app.module = angular.module('app', ['ngeo']);
 
 
 /**
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @constructor
  * @ngInject

diff --git a/examples/drawfeature.js b/examples/drawfeature.js
@@ -1,7 +1,6 @@
 goog.provide('app.drawfeature');
 
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.Features');
 /** @suppress {extraRequire} */
@@ -23,7 +22,7 @@ app.module = angular.module('app', ['ngeo']);
 /**
  * @param {!angular.Scope} $scope Angular scope.
  * @param {ol.Collection.<ol.Feature>} ngeoFeatures Collection of features.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @ngInject
  * @constructor

diff --git a/examples/googlestreetview.js b/examples/googlestreetview.js
@@ -4,7 +4,6 @@ goog.require('ngeo.FeatureOverlayMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.googlestreetviewComponent');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.mapDirective');
 goog.require('ol.Map');
@@ -24,7 +23,7 @@ app.module = angular.module('app', ['ngeo']);
 /**
  * @param {!ngeo.FeatureOverlayMgr} ngeoFeatureOverlayMgr Ngeo FeatureOverlay
  *     manager.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
+ * @param {ngeo.ToolActivate.Mgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.
  * @constructor
  * @ngInject

diff --git a/examples/layertree.js b/examples/layertree.js
@@ -5,7 +5,7 @@
 
 goog.provide('app.layertree');
 
-goog.require('ngeo.CreatePopup');
+goog.require('ngeo.Popup');
 /** @suppress {extraRequire} */
 goog.require('ngeo.layertreeDirective');
 /** @suppress {extraRequire} */
@@ -57,7 +57,7 @@ app.module.directive('appLayertree', app.layertreeDirective);
  * @param {angular.$http} $http Angular http service.
  * @param {angular.$sce} $sce Angular sce service.
  * @param {function(Object):ol.layer.Layer} appGetLayer Get layer service.
- * @param {ngeo.CreatePopup} ngeoCreatePopup Popup service.
+ * @param {ngeo.Popup.Factory} ngeoCreatePopup Popup service.
  * @ngInject
  * @export
  */

diff --git a/examples/mapfishprint.js b/examples/mapfishprint.js
@@ -2,7 +2,6 @@ goog.provide('app.mapfishprint');
 
 /** @suppress {extraRequire} */
 goog.require('ngeo.proj.EPSG21781');
-goog.require('ngeo.CreatePrint');
 goog.require('ngeo.Print');
 goog.require('ngeo.PrintUtils');
 /** @suppress {extraRequire} */

diff --git a/examples/mapquery.html b/examples/mapquery.html
@@ -27,7 +27,7 @@
 
     <p id="desc">
       This example shows how to use the <code><a href="../apidoc/ngeo.mapQueryDirective.html" title="Read our documentation">ngeo-map-query</a></code>
-      directive. It also shows how the <code><a href="../apidoc/ngeo.ToolActivateMgr.html" title="Read our documentation">ngeo.ToolActivate</a></code> can be
+      directive. It also shows how the <code><a href="../apidoc/ngeo.ToolActivate.Mgr.html" title="Read our documentation">ngeo.ToolActivate</a></code> can be
       used to make the directive inactive when an other tool becomes active.
       The "Dummy" button here does nothing, but when toggled the query
       directive becomes inactive.

diff --git a/examples/mapquery.js b/examples/mapquery.js
@@ -5,7 +5,6 @@ goog.require('ngeo.proj.EPSG21781');
 goog.require('ngeo.datasource.DataSources');
 goog.require('ngeo.datasource.OGC');
 goog.require('ngeo.ToolActivate');
-goog.require('ngeo.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.btnDirective');
 /** @suppress {extraRequire} */
@@ -71,7 +70,7 @@ app.module.controller('AppQueryresultController', app.QueryresultController);
  * @param {angular.Scope} $scope Scope.
  * @param {ngeo.datasource.DataSources} ngeoDataSources Ngeo collection of
  *     data sources objects.
- * @param {ngeo.ToolActivateMgr} ngeoToolActivateMgr The ngeo ToolActivate
+ * @param {ngeo.ToolActivate.Mgr} ngeoToolActivateMgr The ngeo ToolActivate
  *     manager.
  * @constructor
  * @ngInject