Refactoring

contribs/gmf/examples/xsdattributes.js

@@ -2,12 +2,15 @@ goog.provide('gmfapp.xsdattributes');
 
 goog.require('gmf.XSDAttributes');
 /** @suppress {extraRequire} */
-goog.require('ngeo.attributesComponent');
+goog.require('ngeo.editing.attributesComponent');
 goog.require('ol.Feature');
 
 
 /** @type {!angular.Module} **/
-gmfapp.module = angular.module('gmfapp', ['gmf']);
+gmfapp.module = angular.module('gmfapp', [
+  gmf.module.name,
+  ngeo.editing.attributesComponent.name,
+]);
 
 
 gmfapp.module.value('gmfTreeUrl',

contribs/gmf/src/directives/editfeature.js

@@ -8,11 +8,11 @@ goog.require('gmf.Snapping');
 goog.require('gmf.SyncLayertreeMap');
 goog.require('gmf.XSDAttributes');
 /** @suppress {extraRequire} */
-goog.require('ngeo.attributesComponent');
+goog.require('ngeo.editing.attributesComponent');
 /** @suppress {extraRequire} */
 goog.require('ngeo.btnDirective');
 /** @suppress {extraRequire} */
-goog.require('ngeo.createfeatureDirective');
+goog.require('ngeo.editing.createfeatureComponent');
 goog.require('ngeo.DecorateInteraction');
 goog.require('ngeo.map.LayerHelper');
 goog.require('ngeo.misc.EventHelper');

contribs/gmf/src/directives/objecteditingtools.js

@@ -5,9 +5,9 @@ goog.require('gmf.objecteditinggetwmsfeatureDirective');
 /** @suppress {extraRequire} */
 goog.require('ngeo.btnDirective');
 /** @suppress {extraRequire} */
-goog.require('ngeo.createfeatureDirective');
+goog.require('ngeo.editing.createfeatureComponent');
 /** @suppress {extraRequire} */
-goog.require('ngeo.createregularpolygonfromclickDirective');
+goog.require('ngeo.editing.createregularpolygonfromclickComponent');
 goog.require('ngeo.DecorateInteraction');
 goog.require('ngeo.ToolActivate');
 /** @suppress {extraRequire} */

examples/attributes.js

@@ -2,7 +2,7 @@ goog.provide('app.attributes');
 
 goog.require('ngeo.format.XSDAttribute');
 /** @suppress {extraRequire} */
-goog.require('ngeo.attributesComponent');
+goog.require('ngeo.editing.attributesComponent');
 goog.require('ol.Feature');
 
 goog.require('ngeo.map.module');
@@ -11,7 +11,8 @@ goog.require('ngeo.map.module');
 /** @type {!angular.Module} */
 app.module = angular.module('app', [
   ngeo.module.name,
-  ngeo.map.module.name
+  ngeo.map.module.name,
+  ngeo.editing.attributesComponent.name,
 ]);
 
 

examples/createfeature.js

@@ -5,7 +5,7 @@ goog.require('ngeo.ToolActivateMgr');
 /** @suppress {extraRequire} */
 goog.require('ngeo.btnDirective');
 /** @suppress {extraRequire} */
-goog.require('ngeo.createfeatureDirective');
+goog.require('ngeo.editing.createfeatureComponent');
 goog.require('ol.Collection');
 goog.require('ol.Map');
 goog.require('ol.View');
@@ -22,6 +22,7 @@ app.module = angular.module('app', [
   ngeo.module.name,
   ngeo.map.module.name,
   ngeo.ToolActivateMgr.module.name,
+  ngeo.editing.createfeatureComponent.name,
 ]);
 
 

src/editing/attributescomponent.js

@@ -1,12 +1,18 @@
-goog.provide('ngeo.attributesComponent');
+goog.provide('ngeo.editing.attributesComponent');
 
+goog.require('ol');
 goog.require('ol.events');
 goog.require('ngeo');
 goog.require('ngeo.misc.EventHelper');
 
 // FIXME Dont' forget to add ngeo.misc.EventHelper to the module
 
 
+ngeo.editing.attributesComponent = angular.module('ngeoAttributes', [
+]);
+
+ngeo.module.requires.push(ngeo.editing.attributesComponent.name);
+
 /**
  * Component used to render the attributes of a feature into a form.
  * Example:
@@ -26,7 +32,7 @@ goog.require('ngeo.misc.EventHelper');
  * @ngdoc component
  * @ngname ngeoAttributes
  */
-ngeo.attributesComponent = {
+ngeo.editing.attributesComponent.component_ = {
   controller: 'ngeoAttributesController as attrCtrl',
   bindings: {
     'attributes': '=ngeoAttributesAttributes',
@@ -36,10 +42,10 @@ ngeo.attributesComponent = {
   require: {
     'form': '^'
   },
-  templateUrl: () => `${ngeo.baseTemplateUrl}/attributes.html`
+  templateUrl: () => `${ngeo.baseModuleTemplateUrl}/editing/attributes.html`
 };
 
-ngeo.module.component('ngeoAttributes', ngeo.attributesComponent);
+ngeo.editing.attributesComponent.component('ngeoAttributes', ngeo.editing.attributesComponent.component_);
 
 
 /**
@@ -53,7 +59,7 @@ ngeo.module.component('ngeoAttributes', ngeo.attributesComponent);
  * @ngdoc controller
  * @ngname ngeoAttributesController
  */
-ngeo.AttributesController = function($scope, ngeoEventHelper, gettextCatalog) {
+ngeo.editing.attributesComponent.Controller_ = function($scope, ngeoEventHelper, gettextCatalog) {
 
   /**
    * The list of attributes to create the form with.
@@ -130,7 +136,7 @@ ngeo.AttributesController = function($scope, ngeoEventHelper, gettextCatalog) {
 /**
  * Initialise the component.
  */
-ngeo.AttributesController.prototype.$onInit = function() {
+ngeo.editing.attributesComponent.Controller_.prototype.$onInit = function() {
   this.properties = this.feature.getProperties();
 
   // Listen to the feature inner properties change and apply them to the form
@@ -150,7 +156,7 @@ ngeo.AttributesController.prototype.$onInit = function() {
  * @param {string} name Attribute name
  * @export
  */
-ngeo.AttributesController.prototype.handleInputChange = function(name) {
+ngeo.editing.attributesComponent.Controller_.prototype.handleInputChange = function(name) {
   this.updating_ = true;
   const value = this.properties[name];
   this.feature.set(name, value);
@@ -161,7 +167,7 @@ ngeo.AttributesController.prototype.handleInputChange = function(name) {
 /**
  * Cleanup event listeners.
  */
-ngeo.AttributesController.prototype.$onDestroy = function() {
+ngeo.editing.attributesComponent.Controller_.prototype.$onDestroy = function() {
   const uid = ol.getUid(this);
   this.ngeoEventHelper_.clearListenerKey(uid);
 };
@@ -171,7 +177,7 @@ ngeo.AttributesController.prototype.$onDestroy = function() {
  * @param {ol.Object.Event} evt Event.
  * @private
  */
-ngeo.AttributesController.prototype.handleFeaturePropertyChange_ = function(evt) {
+ngeo.editing.attributesComponent.Controller_.prototype.handleFeaturePropertyChange_ = function(evt) {
   if (this.updating_) {
     return;
   }
@@ -180,4 +186,4 @@ ngeo.AttributesController.prototype.handleFeaturePropertyChange_ = function(evt)
 };
 
 
-ngeo.module.controller('ngeoAttributesController', ngeo.AttributesController);
+ngeo.editing.attributesComponent.controller('ngeoAttributesController', ngeo.editing.attributesComponent.Controller_);

src/editing/createfeaturecomponent.js

@@ -1,4 +1,4 @@
-goog.provide('ngeo.createfeatureDirective');
+goog.provide('ngeo.editing.createfeatureComponent');
 
 goog.require('ngeo');
 /** @suppress {extraRequire} */
@@ -7,6 +7,7 @@ goog.require('ngeo.interaction.MeasureArea');
 goog.require('ngeo.interaction.MeasureLength');
 goog.require('ngeo.misc.EventHelper');
 goog.require('ngeo.utils');
+goog.require('ol');
 goog.require('ol.events');
 goog.require('ol.Feature');
 goog.require('ol.interaction.Draw');
@@ -15,6 +16,12 @@ goog.require('ol.style.Style');
 // Don't forget to add module dependencies
 
 
+ngeo.editing.createfeatureComponent = angular.module('ngeoCreatefeature', [
+]);
+
+ngeo.module.requires.push(ngeo.editing.createfeatureComponent.name);
+
+
 /**
  * A directive used to draw vector features of a single geometry type using
  * either a 'draw' or 'measure' interaction. Once a feature is finished being
@@ -53,9 +60,9 @@ goog.require('ol.style.Style');
  * @ngdoc directive
  * @ngname ngeoCreatefeature
  */
-ngeo.createfeatureDirective = function() {
+ngeo.editing.createfeatureComponent.directive_ = function() {
   return {
-    controller: ngeo.CreatefeatureController,
+    controller: 'ngeoCreatefeatureController',
     bindToController: true,
     scope: {
       'active': '=ngeoCreatefeatureActive',
@@ -66,7 +73,7 @@ ngeo.createfeatureDirective = function() {
   };
 };
 
-ngeo.module.directive('ngeoCreatefeature', ngeo.createfeatureDirective);
+ngeo.editing.createfeatureComponent.directive('ngeoCreatefeature', ngeo.editing.createfeatureComponent.directive_);
 
 
 /**
@@ -83,7 +90,7 @@ ngeo.module.directive('ngeoCreatefeature', ngeo.createfeatureDirective);
  * @ngdoc controller
  * @ngname ngeoCreatefeatureController
  */
-ngeo.CreatefeatureController = function(gettextCatalog, $compile, $filter, $scope,
+ngeo.editing.createfeatureComponent.Controller_ = function(gettextCatalog, $compile, $filter, $scope,
   $timeout, ngeoEventHelper) {
 
   /**
@@ -168,7 +175,7 @@ ngeo.CreatefeatureController = function(gettextCatalog, $compile, $filter, $scop
 /**
  * Initialize the directive.
  */
-ngeo.CreatefeatureController.prototype.$onInit = function() {
+ngeo.editing.createfeatureComponent.Controller_.prototype.$onInit = function() {
   this.active = this.active === true;
   const gettextCatalog = this.gettextCatalog_;
 
@@ -254,7 +261,7 @@ ngeo.CreatefeatureController.prototype.$onInit = function() {
  * @param {ol.interaction.Draw.Event|ngeox.MeasureEvent} event Event.
  * @export
  */
-ngeo.CreatefeatureController.prototype.handleDrawEnd_ = function(event) {
+ngeo.editing.createfeatureComponent.Controller_.prototype.handleDrawEnd_ = function(event) {
   let sketch;
   if (event.feature) {
     // ol.interaction.Draw.Event
@@ -283,11 +290,13 @@ ngeo.CreatefeatureController.prototype.handleDrawEnd_ = function(event) {
 /**
  * Cleanup event listeners and remove the interaction from the map.
  */
-ngeo.CreatefeatureController.prototype.$onDestroy = function() {
+ngeo.editing.createfeatureComponent.Controller_.prototype.$onDestroy = function() {
   this.timeout_(() => {
     const uid = ol.getUid(this);
     this.ngeoEventHelper_.clearListenerKey(uid);
     this.interaction_.setActive(false);
     this.map.removeInteraction(this.interaction_);
   }, 0);
 };
+
+ngeo.editing.createfeatureComponent.controller('ngeoCreatefeatureController', ngeo.editing.createfeatureComponent.Controller_);

src/editing/createregularpolygonfromclickcomponent.js

@@ -1,11 +1,17 @@
-goog.provide('ngeo.createregularpolygonfromclickDirective');
+goog.provide('ngeo.editing.createregularpolygonfromclickComponent');
 
 goog.require('ngeo');
 goog.require('ngeo.interaction.DrawRegularPolygonFromClick');
 goog.require('ol.events');
 goog.require('ol.Feature');
 
 
+ngeo.editing.createregularpolygonfromclickComponent = angular.module('ngeoCreateregularpolygonfromclick', [
+]);
+
+ngeo.module.requires.push(ngeo.editing.createregularpolygonfromclickComponent.name);
+
+
 /**
  * A directive used to draw vector features of a single geometry type using
  * either a 'draw' or 'measure' interaction. Once a feature is finished being
@@ -51,9 +57,9 @@ goog.require('ol.Feature');
  * @ngdoc directive
  * @ngname ngeoCreateregularpolygonfromclick
  */
-ngeo.createregularpolygonfromclickDirective = function() {
+ngeo.editing.createregularpolygonfromclickComponent.directive_ = function() {
   return {
-    controller: ngeo.CreateregularpolygonfromclickController,
+    controller: 'ngeoCreateregularpolygonfromclickController',
     bindToController: true,
     scope: {
       'active': '=ngeoCreateregularpolygonfromclickActive',
@@ -66,9 +72,10 @@ ngeo.createregularpolygonfromclickDirective = function() {
   };
 };
 
-ngeo.module.directive(
+ngeo.editing.createregularpolygonfromclickComponent.directive(
   'ngeoCreateregularpolygonfromclick',
-  ngeo.createregularpolygonfromclickDirective);
+  ngeo.editing.createregularpolygonfromclickComponent.directive_
+);
 
 
 /**
@@ -80,7 +87,7 @@ ngeo.module.directive(
  * @ngdoc controller
  * @ngname ngeoCreateregularpolygonfromclickController
  */
-ngeo.CreateregularpolygonfromclickController = function($scope) {
+ngeo.editing.createregularpolygonfromclickComponent.Controller_ = function($scope) {
 
   // == Scope properties ==
 
@@ -149,7 +156,7 @@ ngeo.CreateregularpolygonfromclickController = function($scope) {
 /**
  * Initialize the directive.
  */
-ngeo.CreateregularpolygonfromclickController.prototype.$onInit = function() {
+ngeo.editing.createregularpolygonfromclickComponent.Controller_.prototype.$onInit = function() {
 
   this.interaction_ = new ngeo.interaction.DrawRegularPolygonFromClick({
     angle: this.angle,
@@ -175,7 +182,7 @@ ngeo.CreateregularpolygonfromclickController.prototype.$onInit = function() {
  * @param {ol.interaction.Draw.Event} evt Event.
  * @private
  */
-ngeo.CreateregularpolygonfromclickController.prototype.handleDrawEnd_ = function(evt) {
+ngeo.editing.createregularpolygonfromclickComponent.Controller_.prototype.handleDrawEnd_ = function(evt) {
   const feature = new ol.Feature(evt.feature.getGeometry());
   this.features.push(feature);
 };
@@ -185,8 +192,14 @@ ngeo.CreateregularpolygonfromclickController.prototype.handleDrawEnd_ = function
  * Cleanup event listeners and remove the interaction from the map.
  * @private
  */
-ngeo.CreateregularpolygonfromclickController.prototype.handleDestroy_ = function() {
+ngeo.editing.createregularpolygonfromclickComponent.Controller_.prototype.handleDestroy_ = function() {
   ol.events.unlistenByKey(this.interactionListenerKey_);
   this.interaction_.setActive(false);
   this.map.removeInteraction(this.interaction_);
 };
+
+
+ngeo.editing.createregularpolygonfromclickComponent.controller(
+  'ngeoCreateregularpolygonfromclickController',
+  ngeo.editing.createregularpolygonfromclickComponent.Controller_
+);

src/editing/module.js

@@ -1,8 +1,14 @@
 goog.provide('ngeo.editing.module');
 
+goog.require('ngeo.editing.attributesComponent');
+goog.require('ngeo.editing.createfeatureComponent');
+goog.require('ngeo.editing.createregularpolygonfromclickComponent');
 
 /**
  * @type {!angular.Module}
  */
 ngeo.editing.module = angular.module('ngeoEditingModule', [
+  ngeo.editing.attributesComponent.name,
+  ngeo.editing.createfeatureComponent.name,
+  ngeo.editing.createregularpolygonfromclickComponent.name,
 ]);