Merge pull request #4407 from camptocamp/cleanup

Add missing angular import, simplify export

contribs/gmf/src/authentication/module.js

@@ -1,6 +1,7 @@
 /**
  * @module gmf.authentication.module
  */
+import * as angular from 'angular';
 import gmfAuthenticationComponent from 'gmf/authentication/component.js';
 
 /** @suppress {extraRequire} */
@@ -9,10 +10,7 @@ import gmfAuthenticationService from 'gmf/authentication/Service.js';
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfAuthenticationModule', [
+export default angular.module('gmfAuthenticationModule', [
   gmfAuthenticationComponent.name,
   gmfAuthenticationService.module.name
 ]);
-
-
-export default exports;

contribs/gmf/src/datasource/module.js

@@ -1,6 +1,7 @@
 /**
  * @module gmf.datasource.module
  */
+import * as angular from 'angular';
 import gmfDatasourceDataSourceBeingFiltered from 'gmf/datasource/DataSourceBeingFiltered.js';
 import gmfDatasourceExternalDataSourcesManager from 'gmf/datasource/ExternalDataSourcesManager.js';
 import gmfDatasourceHelper from 'gmf/datasource/Helper.js';
@@ -10,13 +11,10 @@ import gmfDatasourceWFSAliases from 'gmf/datasource/WFSAliases.js';
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfDatasourceModule', [
+export default angular.module('gmfDatasourceModule', [
   gmfDatasourceDataSourceBeingFiltered.module.name,
   gmfDatasourceExternalDataSourcesManager.module.name,
   gmfDatasourceHelper.module.name,
   gmfDatasourceManager.module.name,
   gmfDatasourceWFSAliases.module.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/disclaimer/module.js

@@ -1,14 +1,12 @@
 /**
  * @module gmf.disclaimer.module
  */
+import * as angular from 'angular';
 import gmfDisclaimerComponent from 'gmf/disclaimer/component.js';
 
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfDisclaimerModule', [
+export default angular.module('gmfDisclaimerModule', [
   gmfDisclaimerComponent.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/drawing/module.js

@@ -1,16 +1,14 @@
 /**
  * @module gmf.drawing.module
  */
+import * as angular from 'angular';
 import gmfDrawingDrawFeatureComponent from 'gmf/drawing/drawFeatureComponent.js';
 import gmfDrawingFeatureStyleComponent from 'gmf/drawing/featureStyleComponent.js';
 
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfDrawingModule', [
+export default angular.module('gmfDrawingModule', [
   gmfDrawingDrawFeatureComponent.name,
   gmfDrawingFeatureStyleComponent.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/editing/module.js

@@ -1,6 +1,7 @@
 /**
  * @module gmf.editing.module
  */
+import * as angular from 'angular';
 import gmfEditingEditFeature from 'gmf/editing/EditFeature.js';
 import gmfEditingEditFeatureComponent from 'gmf/editing/editFeatureComponent.js';
 import gmfEditingEditFeatureSelectorComponent from 'gmf/editing/editFeatureSelectorComponent.js';
@@ -11,14 +12,11 @@ import gmfEditingXSDAttributes from 'gmf/editing/XSDAttributes.js';
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfEditingModule', [
+export default angular.module('gmfEditingModule', [
   gmfEditingEditFeature.module.name,
   gmfEditingEditFeatureComponent.name,
   gmfEditingEditFeatureSelectorComponent.name,
   gmfEditingEnumerateAttribute.module.name,
   gmfEditingSnapping.module.name,
   gmfEditingXSDAttributes.module.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/filters/module.js

@@ -1,16 +1,14 @@
 /**
  * @module gmf.filters.module
  */
+import * as angular from 'angular';
 import gmfFiltersFilterselectorComponent from 'gmf/filters/filterselectorComponent.js';
 import gmfFiltersSavedFilters from 'gmf/filters/SavedFilters.js';
 
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfFiltersModule', [
+export default angular.module('gmfFiltersModule', [
   gmfFiltersFilterselectorComponent.name,
   gmfFiltersSavedFilters.module.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/import/module.js

@@ -1,6 +1,7 @@
 /**
  * @module gmf.import.module
  */
+import * as angular from 'angular';
 import gmfImportImportdatasourceComponent from 'gmf/import/importdatasourceComponent.js';
 import gmfImportWmsCapabilityLayertreeComponent from 'gmf/import/wmsCapabilityLayertreeComponent.js';
 import gmfImportWmtsCapabilityLayertreeComponent from 'gmf/import/wmtsCapabilityLayertreeComponent.js';
@@ -10,11 +11,8 @@ import './import.scss';
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfImportModule', [
+export default angular.module('gmfImportModule', [
   gmfImportImportdatasourceComponent.name,
   gmfImportWmsCapabilityLayertreeComponent.name,
   gmfImportWmtsCapabilityLayertreeComponent.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/layertree/module.js

@@ -1,6 +1,7 @@
 /**
  * @module gmf.layertree.module
  */
+import * as angular from 'angular';
 import gmfLayertreeComponent from 'gmf/layertree/component.js';
 import gmfLayertreeDatasourceGroupTreeComponent from 'gmf/layertree/datasourceGroupTreeComponent.js';
 import gmfLayertreeSyncLayertreeMap from 'gmf/layertree/SyncLayertreeMap.js';
@@ -12,13 +13,10 @@ import './common.scss';
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfLayertreeModule', [
+export default angular.module('gmfLayertreeModule', [
   gmfLayertreeComponent.name,
   gmfLayertreeDatasourceGroupTreeComponent.name,
   gmfLayertreeSyncLayertreeMap.module.name,
   gmfLayertreeTimeSliderComponent.name,
   gmfLayertreeTreeManager.module.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/mobile/measure/module.js

@@ -1,16 +1,14 @@
 /**
  * @module gmf.mobile.measure.module
  */
+import * as angular from 'angular';
 import gmfMobileMeasureLengthComponent from 'gmf/mobile/measure/lengthComponent.js';
 import gmfMobileMeasurePointComponent from 'gmf/mobile/measure/pointComponent.js';
 
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfMobileMeasureModule', [
+export default angular.module('gmfMobileMeasureModule', [
   gmfMobileMeasureLengthComponent.name,
   gmfMobileMeasurePointComponent.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/mobile/navigation/module.js

@@ -1,14 +1,12 @@
 /**
  * @module gmf.mobile.navigation.module
  */
+import * as angular from 'angular';
 import gmfMobileNavigationComponent from 'gmf/mobile/navigation/component.js';
 
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfMobileNavigationModule', [
+export default angular.module('gmfMobileNavigationModule', [
   gmfMobileNavigationComponent.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/profile/module.js

@@ -1,6 +1,7 @@
 /**
  * @module gmf.profile.module
  */
+import * as angular from 'angular';
 import gmfProfileComponent from 'gmf/profile/component.js';
 import gmfProfileDrawLineComponent from 'gmf/profile/drawLineComponent.js';
 
@@ -9,10 +10,7 @@ import './profile.scss';
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfProfileModule', [
+export default angular.module('gmfProfileModule', [
   gmfProfileComponent.name,
   gmfProfileDrawLineComponent.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/query/extraModule.js

@@ -1,6 +1,7 @@
 /**
  * @module gmf.query.extraModule
  */
+import * as angular from 'angular';
 import gmfQueryGridComponent from 'gmf/query/gridComponent.js';
 import gmfQueryWindowComponent from 'gmf/query/windowComponent.js';
 
@@ -10,10 +11,7 @@ import './window.scss';
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfQueryExtraModule', [
+export default angular.module('gmfQueryExtraModule', [
   gmfQueryGridComponent.name,
   gmfQueryWindowComponent.name,
 ]);
-
-
-export default exports;

contribs/gmf/src/search/module.js

@@ -1,6 +1,7 @@
 /**
  * @module gmf.search.module
  */
+import * as angular from 'angular';
 import gmfSearchComponent from 'gmf/search/component.js';
 import gmfSearchFulltextSearch from 'gmf/search/FulltextSearch.js';
 
@@ -9,10 +10,7 @@ import './search.scss';
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('gmfSearchModule', [
+export default angular.module('gmfSearchModule', [
   gmfSearchComponent.name,
   gmfSearchFulltextSearch.module.name
 ]);
-
-
-export default exports;

src/GeometryType.js

@@ -1,11 +1,12 @@
 /**
  * @module ngeo.GeometryType
  */
+
 /**
  * @enum {string}
  * @export
  */
-const exports = {
+export default {
   /**
    * @type {string}
    * @export
@@ -52,6 +53,3 @@ const exports = {
    */
   TEXT: 'Text'
 };
-
-
-export default exports;

src/datasource/module.js

@@ -1,16 +1,14 @@
 /**
  * @module ngeo.datasource.module
  */
+import * as angular from 'angular';
 import ngeoDatasourceDataSources from 'ngeo/datasource/DataSources.js';
 import ngeoDatasourceHelper from 'ngeo/datasource/Helper.js';
 
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('ngeoDatasourceModule', [
+export default angular.module('ngeoDatasourceModule', [
   ngeoDatasourceDataSources.module.name,
   ngeoDatasourceHelper.module.name,
 ]);
-
-
-export default exports;

src/download/module.js

@@ -1,16 +1,14 @@
 /**
  * @module ngeo.download.module
  */
+import * as angular from 'angular';
 import ngeoDownloadCsv from 'ngeo/download/Csv.js';
 import ngeoDownloadService from 'ngeo/download/service.js';
 
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('ngeoDownloadModule', [
+export default angular.module('ngeoDownloadModule', [
   ngeoDownloadCsv.module.name,
   ngeoDownloadService.name,
 ]);
-
-
-export default exports;

src/draw/module.js

@@ -1,6 +1,7 @@
 /**
  * @module ngeo.draw.module
  */
+import * as angular from 'angular';
 import ngeoDrawComponent from 'ngeo/draw/component.js';
 import ngeoDrawController from 'ngeo/draw/Controller.js';
 import ngeoDrawFeatures from 'ngeo/draw/features.js';
@@ -11,14 +12,11 @@ import ngeoDrawText from 'ngeo/draw/text.js';
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('ngeoDrawModule', [
+export default angular.module('ngeoDrawModule', [
   ngeoDrawController.module.name,
   ngeoDrawComponent.name,
   ngeoDrawFeatures.name,
   ngeoDrawPoint.name,
   ngeoDrawRectangle.name,
   ngeoDrawText.name,
 ]);
-
-
-export default exports;

src/editing/extraModule.js

@@ -1,14 +1,12 @@
 /**
  * @module ngeo.editing.extraModule
  */
+import * as angular from 'angular';
 import ngeoEditingExportfeaturesComponent from 'ngeo/editing/exportfeaturesComponent.js';
 
 /**
  * @type {angular.IModule}
  */
-const exports = angular.module('ngeoEditingExtraModule', [
+export default angular.module('ngeoEditingExtraModule', [
   ngeoEditingExportfeaturesComponent.name,
 ]);
-
-
-export default exports;

src/editing/module.js

@@ -1,18 +1,16 @@
 /**
  * @module ngeo.editing.module
  */
+import * as angular from 'angular';
 import ngeoEditingAttributesComponent from 'ngeo/editing/attributesComponent.js';
 import ngeoEditingCreatefeatureComponent from 'ngeo/editing/createfeatureComponent.js';
 import ngeoEditingCreateregularpolygonfromclickComponent from 'ngeo/editing/createregularpolygonfromclickComponent.js';
 
 /**
  * @type {!angular.IModule}
  */
-const exports = angular.module('ngeoEditingModule', [
+export default angular.module('ngeoEditingModule', [
   ngeoEditingAttributesComponent.name,
   ngeoEditingCreatefeatureComponent.name,
   ngeoEditingCreateregularpolygonfromclickComponent.name,
 ]);
-
-
-export default exports;