Adapt angular: ngeo.filter

contribs/gmf/src/datasource/datasourcesmanager.js

@@ -9,7 +9,8 @@ goog.require('ngeo.map.BackgroundLayerMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.datasource.DataSources');
 goog.require('ngeo.map.LayerHelper');
-goog.require('ngeo.RuleHelper');
+/** @suppress {extraRequire} */
+goog.require('ngeo.filter.RuleHelper');
 goog.require('ngeo.WMSTime');
 goog.require('ol.events');
 goog.require('ol.obj');
@@ -38,7 +39,7 @@ gmf.datasource.DataSourcesManager = class {
    * @param {ngeo.datasource.DataSources} ngeoDataSources Ngeo collection of
    *     data sources objects.
    * @param {!ngeo.map.LayerHelper} ngeoLayerHelper Ngeo Layer Helper.
-   * @param {!ngeo.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
+   * @param {!ngeo.filter.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
    * @param {!ngeo.WMSTime} ngeoWMSTime wms time service.
    * @param {!gmf.WFSAliases} gmfWFSAliases Gmf WFS aliases service.
    * @ngInject
@@ -104,7 +105,7 @@ gmf.datasource.DataSourcesManager = class {
     this.ngeoLayerHelper_ = ngeoLayerHelper;
 
     /**
-     * @type {!ngeo.RuleHelper}
+     * @type {!ngeo.filter.RuleHelper}
      * @private
      */
     this.ngeoRuleHelper_ = ngeoRuleHelper;

contribs/gmf/src/directives/filterselector.js

@@ -8,11 +8,12 @@ goog.require('gmf.datasource.DataSourceBeingFiltered');
 goog.require('gmf.datasource.DataSourcesHelper');
 goog.require('gmf.SavedFilters');
 /** @suppress {extraRequire} */
-goog.require('ngeo.filterComponent');
+goog.require('ngeo.filter.module');
 /** @suppress {extraRequire} */
 goog.require('ngeo.modalDirective');
 goog.require('ngeo.Notification');
-goog.require('ngeo.RuleHelper');
+/** @suppress {extraRequire} */
+goog.require('ngeo.filter.RuleHelper');
 goog.require('ol.events');
 
 goog.require('ngeo.map.FeatureOverlayMgr');
@@ -21,7 +22,6 @@ goog.require('ngeo.map.FeatureOverlayMgr');
 // In the future module declaration, don't forget to require:
 // - ngeo.map.FeatureOverlayMgr.module.name
 
-
 /**
  * @private
  */
@@ -41,7 +41,7 @@ gmf.FilterselectorController = class {
    * @param {ngeo.Notification} ngeoNotification Ngeo notification service.
    * @param {!ngeo.map.FeatureOverlayMgr} ngeoFeatureOverlayMgr Ngeo FeatureOverlay
    *     manager
-   * @param {!ngeo.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
+   * @param {!ngeo.filter.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
    * @private
    * @struct
    * @ngInject
@@ -156,7 +156,7 @@ gmf.FilterselectorController = class {
     );
 
     /**
-     * @type {!ngeo.RuleHelper}
+     * @type {!ngeo.filter.RuleHelper}
      * @private
      */
     this.ngeoRuleHelper_ = ngeoRuleHelper;

options/ngeox.js

@@ -2653,3 +2653,11 @@ ngeox.WfsPermalinkData;
  * @typedef {function(string):!ngeo.print.Service}
  */
 ngeox.CreatePrint;
+
+/**
+ * @typedef {{
+ *     text: (string),
+ *     value: (string)
+ * }}
+ */
+ngeox.FilterCondition;

src/filter/.eslintrc.yaml

@@ -0,0 +1,2 @@
+extends:
+  - ../.eslintrc-googshift.yaml

src/services/rulehelper.js → src/filter/RuleHelper.js

@@ -1,4 +1,7 @@
-goog.provide('ngeo.RuleHelper');
+/**
+ * @module ngeo filter namespace
+ */
+goog.provide('ngeo.filter.RuleHelper');
 
 goog.require('ngeo');
 goog.require('ngeo.FeatureHelper');
@@ -10,9 +13,10 @@ goog.require('ngeo.rule.Select');
 goog.require('ngeo.rule.Text');
 goog.require('ol.format.WFS');
 goog.require('ol.format.filter');
+goog.require('ol.array');
 
 
-ngeo.RuleHelper = class {
+ngeo.filter.RuleHelper = class {
 
   /**
    * A service that provides utility methods to create `ngeo.rule.Rule`
@@ -711,4 +715,9 @@ ngeo.RuleHelper = class {
 };
 
 
-ngeo.module.service('ngeoRuleHelper', ngeo.RuleHelper);
+/**
+ * @type {!angular.Module}
+ */
+ngeo.filter.RuleHelper.module = angular.module('ngeoRuleHelper', []);
+ngeo.filter.RuleHelper.module.service('ngeoRuleHelper', ngeo.filter.RuleHelper);
+ngeo.module.requires.push(ngeo.filter.RuleHelper.module.name);

src/directives/filter.js → src/filter/component.js

@@ -1,30 +1,61 @@
-goog.provide('ngeo.filterComponent');
+/**
+ * @module ngeo filter namespace
+ */
+goog.provide('ngeo.filter.component');
 
 goog.require('ngeo');
 goog.require('ngeo.MapQuerent');
 /** @suppress {extraRequire} */
-goog.require('ngeo.ruleComponent');
-goog.require('ngeo.RuleHelper');
+goog.require('ngeo.filter.ruleComponent');
+/** @suppress {extraRequire} */
+goog.require('ngeo.filter.RuleHelper');
 goog.require('ngeo.rule.Geometry');
-
 goog.require('ngeo.map.FeatureOverlay');
+goog.require('ol');
+goog.require('ol.array');
 
 
 // In futur module declaration, don't forget to require:
 // - ngeo.map.FeatureOverlay.module.name
 
 
+/**
+ * @type {!angular.Module}
+ */
+ngeo.filter.component = angular.module('ngeoFilter', [
+  ngeo.filter.RuleHelper.module.name,
+  ngeo.filter.ruleComponent.name,
+]);
+
+ngeo.module.requires.push(ngeo.filter.component.name);
+
+ngeo.filter.component.component('ngeoFilter', {
+  bindings: {
+    'aRuleIsActive': '=',
+    'customRules': '<',
+    // It's 'datasource' instead of 'dataSource', because that would require
+    // the attribute to be 'data-source', and Angular strips the 'data-'.
+    'datasource': '<',
+    'directedRules': '<',
+    'featureOverlay': '<',
+    'map': '<',
+    'toolGroup': '<'
+  },
+  controller: 'ngeoFilterController',
+  templateUrl: () => `${ngeo.baseTemplateUrl}/filter.html`
+});
+
 /**
  * @private
  */
-ngeo.FilterController = class {
+ngeo.filter.component.FilterController_ = class {
 
   /**
    * @param {!angularGettext.Catalog} gettextCatalog Gettext service.
    * @param {!angular.Scope} $scope Angular scope.
    * @param {!angular.$timeout} $timeout Angular timeout service.
    * @param {!ngeo.MapQuerent} ngeoMapQuerent The ngeo map querent service.
-   * @param {!ngeo.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
+   * @param {!ngeo.filter.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
    * @private
    * @struct
    * @ngInject
@@ -106,7 +137,7 @@ ngeo.FilterController = class {
     this.ngeoMapQuerent_ = ngeoMapQuerent;
 
     /**
-     * @type {!ngeo.RuleHelper}
+     * @type {!ngeo.filter.RuleHelper}
      * @private
      */
     this.ngeoRuleHelper_ = ngeoRuleHelper;
@@ -115,7 +146,7 @@ ngeo.FilterController = class {
     // === Inner properties ===
 
     /**
-     * @type {Array.<!ngeo.FilterController.Condition>}
+     * @type {Array.<!ngeox.FilterCondition>}
      * @export
      */
     this.conditions = [
@@ -294,7 +325,7 @@ ngeo.FilterController = class {
 
 
   /**
-   * @param {!ngeo.FilterController.Condition} condition Condition to set.
+   * @param {!ngeox.FilterCondition} condition Condition to set.
    * @export
    */
   setCondition(condition) {
@@ -387,28 +418,4 @@ ngeo.FilterController = class {
 
 };
 
-
-/**
- * @typedef {{
- *     text: (string),
- *     value: (string)
- * }}
- */
-ngeo.FilterController.Condition;
-
-
-ngeo.module.component('ngeoFilter', {
-  bindings: {
-    'aRuleIsActive': '=',
-    'customRules': '<',
-    // It's 'datasource' instead of 'dataSource', because that would require
-    // the attribute to be 'data-source', and Angular strips the 'data-'.
-    'datasource': '<',
-    'directedRules': '<',
-    'featureOverlay': '<',
-    'map': '<',
-    'toolGroup': '<'
-  },
-  controller: ngeo.FilterController,
-  templateUrl: () => `${ngeo.baseTemplateUrl}/filter.html`
-});
+ngeo.filter.component.controller('ngeoFilterController', ngeo.filter.component.FilterController_);

src/filter/module.js

@@ -0,0 +1,17 @@
+/**
+ * @module ngeo filter namespace
+ */
+goog.provide('ngeo.filter.module');
+
+goog.require('ngeo.filter.component');
+goog.require('ngeo.filter.RuleHelper');
+goog.require('ngeo.filter.ruleComponent');
+
+/**
+ * @type {!angular.Module}
+ */
+ngeo.filter.module = angular.module('ngeoFilterModule', [
+  ngeo.filter.component.name,
+  ngeo.filter.RuleHelper.module.name,
+  ngeo.filter.ruleComponent.name,
+]);

src/directives/rule.js → src/filter/rulecomponent.js

@@ -1,4 +1,7 @@
-goog.provide('ngeo.ruleComponent');
+/**
+ * @module ngeo filter namespace
+ */
+goog.provide('ngeo.filter.ruleComponent');
 
 goog.require('ngeo');
 /** @suppress {extraRequire} */
@@ -7,29 +10,47 @@ goog.require('ngeo.DecorateInteraction');
 /** @suppress {extraRequire} */
 goog.require('ngeo.drawfeatureDirective');
 goog.require('ngeo.Menu');
-goog.require('ngeo.RuleHelper');
+/** @suppress {extraRequire} */
+goog.require('ngeo.filter.RuleHelper');
 goog.require('ngeo.ToolActivate');
 /** @suppress {extraRequire} */
 goog.require('ngeo.ToolActivateMgr');
 goog.require('ngeo.interaction.Modify');
 goog.require('ngeo.interaction.Rotate');
 goog.require('ngeo.interaction.Translate');
+goog.require('ngeo.rule.Rule');
 goog.require('ngeo.rule.Geometry');
 goog.require('ngeo.rule.Select');
+goog.require('ol');
+goog.require('ol.Observable');
+goog.require('ol.Feature');
 goog.require('ol.Collection');
 goog.require('ol.events');
+goog.require('ol.array');
+goog.require('ol.style.Style');
+goog.require('ol.style.Text');
+goog.require('ol.style.Fill');
+goog.require('ol.geom.Geometry');
 
 goog.require('ngeo.map.FeatureOverlay');
 
 
 // In futur module declaration, don't forget to require:
 // - ngeo.map.FeatureOverlay.module.name
 
+/**
+ * @type {angular.Module}
+ */
+ngeo.filter.ruleComponent = angular.module('ngeoRule', [
+  ngeo.filter.RuleHelper.module.name,
+]);
+
+ngeo.module.requires.push(ngeo.filter.ruleComponent.name);
 
 /**
  * @private
  */
-ngeo.RuleController = class {
+ngeo.filter.ruleComponent.RuleController_ = class {
 
   /**
    * @param {!angularGettext.Catalog} gettextCatalog Gettext service.
@@ -38,7 +59,7 @@ ngeo.RuleController = class {
    * @param {!ngeo.DecorateInteraction} ngeoDecorateInteraction Decorate
    *     interaction service.
    * @param {!ngeo.FeatureHelper} ngeoFeatureHelper Ngeo feature helper service.
-   * @param {!ngeo.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
+   * @param {!ngeo.filter.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
    * @param {!ngeo.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate
    *     manager service.
    * @private
@@ -112,7 +133,7 @@ ngeo.RuleController = class {
     this.ngeoFeatureHelper_ = ngeoFeatureHelper;
 
     /**
-     * @type {!ngeo.RuleHelper}
+     * @type {!ngeo.filter.RuleHelper}
      * @private
      */
     this.ngeoRuleHelper_ = ngeoRuleHelper;
@@ -917,13 +938,13 @@ ngeo.RuleController = class {
  * Also, changes are not made on-the-fly. A button must be clicked for the
  * changes to be applied to the rule.
  */
-ngeo.module.component('ngeoRule', {
+ngeo.filter.ruleComponent.component('ngeoRule', {
   bindings: {
     'featureOverlay': '<',
     'map': '<',
     'rule': '<',
     'toolGroup': '<'
   },
-  controller: ngeo.RuleController,
-  templateUrl: () => `${ngeo.baseTemplateUrl}/rule.html`
+  controller: ngeo.filter.ruleComponent.RuleController_,
+  templateUrl: () => `${ngeo.baseModuleTemplateUrl}/filter/rule.html`
 });

src/services/querent.js

@@ -1,7 +1,7 @@
 goog.provide('ngeo.Querent');
 
 goog.require('ngeo');
-goog.require('ngeo.RuleHelper');
+goog.require('ngeo.filter.RuleHelper');
 goog.require('ngeo.WMSTime');
 goog.require('ol.format.WFS');
 goog.require('ol.format.WFSDescribeFeatureType');
@@ -29,7 +29,7 @@ ngeo.Querent = class {
    * @struct
    * @param {angular.$http} $http Angular $http service.
    * @param {angular.$q} $q The Angular $q service.
-   * @param {!ngeo.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
+   * @param {!ngeo.filter.RuleHelper} ngeoRuleHelper Ngeo rule helper service.
    * @param {!ngeo.WMSTime} ngeoWMSTime wms time service.
    * @ngdoc service
    * @ngname ngeoQuerent
@@ -52,7 +52,7 @@ ngeo.Querent = class {
     this.q_ = $q;
 
     /**
-     * @type {!ngeo.RuleHelper}
+     * @type {!ngeo.filter.RuleHelper}
      * @private
      */
     this.ngeoRuleHelper_ = ngeoRuleHelper;