From a880bd899caedd8dac6866bafdf6e4e463b33615 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 28 Feb 2018 11:49:25 +0100 Subject: [PATCH 1/3] Load the common libs before the gmf main module --- buildtools/webpack.gmfexamples.js | 6 +++++- contribs/gmf/examples/authentication.js | 1 - contribs/gmf/examples/backgroundlayerselector.js | 1 - contribs/gmf/examples/contextualdata.js | 1 - contribs/gmf/examples/datepicker.js | 1 - contribs/gmf/examples/displayquerygrid.js | 1 - contribs/gmf/examples/displayquerywindow.js | 1 - contribs/gmf/examples/drawfeature.js | 1 - contribs/gmf/examples/editfeature.js | 1 - contribs/gmf/examples/editfeatureselector.js | 1 - contribs/gmf/examples/elevation.js | 1 - contribs/gmf/examples/featurestyle.js | 1 - contribs/gmf/examples/filterselector.js | 1 - contribs/gmf/examples/importdatasource.js | 1 - contribs/gmf/examples/layertree.js | 1 - contribs/gmf/examples/layertreeadd.js | 1 - contribs/gmf/examples/mobilemeasure.js | 1 - contribs/gmf/examples/mouseposition.js | 1 - contribs/gmf/examples/objectediting.js | 1 - contribs/gmf/examples/objecteditinghub.js | 1 - contribs/gmf/examples/permalink.js | 1 - contribs/gmf/examples/print.js | 1 - contribs/gmf/examples/profile.js | 1 - contribs/gmf/examples/search.js | 1 - contribs/gmf/examples/share.js | 1 - contribs/gmf/examples/simple.js | 1 - contribs/gmf/examples/themeselector.js | 1 - contribs/gmf/examples/timeslider.js | 1 - contribs/gmf/examples/wfspermalink.js | 1 - contribs/gmf/examples/xsdattributes.js | 1 - 30 files changed, 5 insertions(+), 30 deletions(-) diff --git a/buildtools/webpack.gmfexamples.js b/buildtools/webpack.gmfexamples.js index 544017a0d656..c2e970b50010 100644 --- a/buildtools/webpack.gmfexamples.js +++ b/buildtools/webpack.gmfexamples.js @@ -8,7 +8,11 @@ const entry = {}; for (const filename of ls('contribs/gmf/examples/*.html')) { const name = filename.name; - entry[name] = ['./contribs/gmf/src/mainmodule.js', `./contribs/gmf/examples/${name}.js`]; + entry[name] = [ + './contribs/gmf/examples/common_dependencies.js', + './contribs/gmf/src/mainmodule.js', + `./contribs/gmf/examples/${name}.js` + ]; plugins.push( new HtmlWebpackPlugin({ template: `contribs/gmf/examples/${name}.html`, diff --git a/contribs/gmf/examples/authentication.js b/contribs/gmf/examples/authentication.js index 664218365aa5..3df85339854e 100644 --- a/contribs/gmf/examples/authentication.js +++ b/contribs/gmf/examples/authentication.js @@ -2,7 +2,6 @@ goog.provide('gmfapp.authentication'); // webpack: import './authentication.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.authentication.module'); diff --git a/contribs/gmf/examples/backgroundlayerselector.js b/contribs/gmf/examples/backgroundlayerselector.js index 31a2d8ea6924..8a0bd36a0d5b 100644 --- a/contribs/gmf/examples/backgroundlayerselector.js +++ b/contribs/gmf/examples/backgroundlayerselector.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.backgroundlayerselector'); // webpack: import './backgroundlayerselector.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.backgroundlayerselector.module'); /** @suppress {extraRequire} */ goog.require('gmf.map.component'); diff --git a/contribs/gmf/examples/contextualdata.js b/contribs/gmf/examples/contextualdata.js index 819a4b0373ef..b1fd23fd814d 100644 --- a/contribs/gmf/examples/contextualdata.js +++ b/contribs/gmf/examples/contextualdata.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.contextualdata'); // webpack: import './contextualdata.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.contextualdata.module'); goog.require('gmf.map.component'); diff --git a/contribs/gmf/examples/datepicker.js b/contribs/gmf/examples/datepicker.js index 166de5fee5f3..02ca123324a5 100644 --- a/contribs/gmf/examples/datepicker.js +++ b/contribs/gmf/examples/datepicker.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.datepicker'); // webpack: import './datepicker.css'; -// webpack: import './common_dependencies.js'; goog.require('ngeo.misc.datepickerComponent'); goog.require('ngeo.misc.WMSTime'); diff --git a/contribs/gmf/examples/displayquerygrid.js b/contribs/gmf/examples/displayquerygrid.js index ecf020b3f461..0acb4c6bc419 100644 --- a/contribs/gmf/examples/displayquerygrid.js +++ b/contribs/gmf/examples/displayquerygrid.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.displayquerygrid'); // webpack: import './displayquerygrid.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.datasource.Manager'); goog.require('gmf.layertree.component'); /** @suppress {extraRequire} */ diff --git a/contribs/gmf/examples/displayquerywindow.js b/contribs/gmf/examples/displayquerywindow.js index 1f50254cf4ca..d42cef144548 100644 --- a/contribs/gmf/examples/displayquerywindow.js +++ b/contribs/gmf/examples/displayquerywindow.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.displayquerywindow'); // webpack: import './displayquerywindow.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.datasource.Manager'); goog.require('gmf.layertree.component'); /** @suppress {extraRequire} */ diff --git a/contribs/gmf/examples/drawfeature.js b/contribs/gmf/examples/drawfeature.js index 13ee8b73d605..65e5683a95bf 100644 --- a/contribs/gmf/examples/drawfeature.js +++ b/contribs/gmf/examples/drawfeature.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.drawfeature'); // webpack: import './drawfeature.css'; -// webpack: import './common_dependencies.js'; // webpack: import 'jquery-ui/ui/widgets/tooltip.js'; /** @suppress {extraRequire} */ goog.require('gmf.map.component'); diff --git a/contribs/gmf/examples/editfeature.js b/contribs/gmf/examples/editfeature.js index 671d9da884f3..d40c34341c1b 100644 --- a/contribs/gmf/examples/editfeature.js +++ b/contribs/gmf/examples/editfeature.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.editfeature'); // webpack: import './editfeature.css'; -// webpack: import './common_dependencies.js'; // webpack: import 'jquery-ui/ui/widgets/tooltip.js'; const EPSG21781 = goog.require('ngeo.proj.EPSG21781'); goog.require('gmf.authentication.module'); diff --git a/contribs/gmf/examples/editfeatureselector.js b/contribs/gmf/examples/editfeatureselector.js index 2177abae4c9e..38e18680f88b 100644 --- a/contribs/gmf/examples/editfeatureselector.js +++ b/contribs/gmf/examples/editfeatureselector.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.editfeatureselector'); // webpack: import './editfeatureselector.css'; -// webpack: import './common_dependencies.js'; // webpack: import 'jquery-ui/ui/widgets/tooltip.js'; goog.require('gmf.authentication.module'); /** @suppress {extraRequire} */ diff --git a/contribs/gmf/examples/elevation.js b/contribs/gmf/examples/elevation.js index 53292f75028d..31bc0cbe708b 100644 --- a/contribs/gmf/examples/elevation.js +++ b/contribs/gmf/examples/elevation.js @@ -2,7 +2,6 @@ goog.provide('gmfapp.elevation'); // webpack: import './elevation.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.map.component'); goog.require('gmf.raster.module'); diff --git a/contribs/gmf/examples/featurestyle.js b/contribs/gmf/examples/featurestyle.js index 632ceb1aea0b..254b3250202b 100644 --- a/contribs/gmf/examples/featurestyle.js +++ b/contribs/gmf/examples/featurestyle.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.featurestyle'); // webpack: import './featurestyle.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.drawing.featureStyleComponent'); /** @suppress {extraRequire} */ goog.require('gmf.map.component'); diff --git a/contribs/gmf/examples/filterselector.js b/contribs/gmf/examples/filterselector.js index ad855c30ce6e..eb015332903d 100644 --- a/contribs/gmf/examples/filterselector.js +++ b/contribs/gmf/examples/filterselector.js @@ -3,7 +3,6 @@ goog.provide('gmfapp.filterselector'); // webpack: import './filterselector.css'; -// webpack: import './common_dependencies.js'; // webpack: import 'jquery-ui/ui/widgets/tooltip.js'; goog.require('gmf.authentication.module'); /** @suppress {extraRequire} */ diff --git a/contribs/gmf/examples/importdatasource.js b/contribs/gmf/examples/importdatasource.js index 554eb0dbdcdc..82dd81c6927b 100644 --- a/contribs/gmf/examples/importdatasource.js +++ b/contribs/gmf/examples/importdatasource.js @@ -3,7 +3,6 @@ goog.provide('gmfapp.importdatasource'); // webpack: import './importdatasource.css'; -// webpack: import './common_dependencies.js'; // webpack: import 'jquery-ui/ui/widgets/tooltip.js'; /** @suppress {extraRequire} */ goog.require('gmf.datasource.Manager'); diff --git a/contribs/gmf/examples/layertree.js b/contribs/gmf/examples/layertree.js index e8248b8b2082..922f378a1306 100644 --- a/contribs/gmf/examples/layertree.js +++ b/contribs/gmf/examples/layertree.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.layertree'); // webpack: import './layertree.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.disclaimer.module'); goog.require('gmf.layertree.component'); goog.require('gmf.layertree.TreeManager'); diff --git a/contribs/gmf/examples/layertreeadd.js b/contribs/gmf/examples/layertreeadd.js index 02700264dc08..0f193af0ba60 100644 --- a/contribs/gmf/examples/layertreeadd.js +++ b/contribs/gmf/examples/layertreeadd.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.layertreeadd'); // webpack: import './layertreeadd.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.disclaimer.module'); goog.require('gmf.layertree.component'); goog.require('gmf.layertree.TreeManager'); diff --git a/contribs/gmf/examples/mobilemeasure.js b/contribs/gmf/examples/mobilemeasure.js index c742ffe9d25b..29e066943bf0 100644 --- a/contribs/gmf/examples/mobilemeasure.js +++ b/contribs/gmf/examples/mobilemeasure.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.mobilemeasure'); // webpack: import './mobilemeasure.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.map.component'); /** @suppress {extraRequire} */ diff --git a/contribs/gmf/examples/mouseposition.js b/contribs/gmf/examples/mouseposition.js index 23b733130bdf..430a241d8f6b 100644 --- a/contribs/gmf/examples/mouseposition.js +++ b/contribs/gmf/examples/mouseposition.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.mouseposition'); // webpack: import './mouseposition.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.map.module'); const EPSG2056 = goog.require('ngeo.proj.EPSG2056'); diff --git a/contribs/gmf/examples/objectediting.js b/contribs/gmf/examples/objectediting.js index 480519f03a1e..1d5caa3932ca 100644 --- a/contribs/gmf/examples/objectediting.js +++ b/contribs/gmf/examples/objectediting.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.objectediting'); // webpack: import './objectediting.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.layertree.component'); goog.require('gmf.layertree.TreeManager'); /** @suppress {extraRequire} */ diff --git a/contribs/gmf/examples/objecteditinghub.js b/contribs/gmf/examples/objecteditinghub.js index 6d18c747632c..d3f6f4e6ec7f 100644 --- a/contribs/gmf/examples/objecteditinghub.js +++ b/contribs/gmf/examples/objecteditinghub.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.objecteditinghub'); // webpack: import './objecteditinghub.css'; -// webpack: import './common_dependencies.js'; goog.require('goog.asserts'); goog.require('gmf.editing.XSDAttributes'); goog.require('gmf.objectediting.Manager'); diff --git a/contribs/gmf/examples/permalink.js b/contribs/gmf/examples/permalink.js index c555fa66a62a..6e736b3a1883 100644 --- a/contribs/gmf/examples/permalink.js +++ b/contribs/gmf/examples/permalink.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.permalink'); // webpack: import './permalink.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.map.component'); const EPSG21781 = goog.require('ngeo.proj.EPSG21781'); diff --git a/contribs/gmf/examples/print.js b/contribs/gmf/examples/print.js index b36715b9d2cb..2eba3d4d54a6 100644 --- a/contribs/gmf/examples/print.js +++ b/contribs/gmf/examples/print.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.print'); // webpack: import './print.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.layertree.component'); /** @suppress {extraRequire} */ goog.require('gmf.map.component'); diff --git a/contribs/gmf/examples/profile.js b/contribs/gmf/examples/profile.js index 285cb66cebc6..c89f9c50b0f3 100644 --- a/contribs/gmf/examples/profile.js +++ b/contribs/gmf/examples/profile.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.profile'); // webpack: import './profile.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.permalink.Permalink'); /** @suppress {extraRequire} */ diff --git a/contribs/gmf/examples/search.js b/contribs/gmf/examples/search.js index ef42a536e167..7b508728f1b1 100644 --- a/contribs/gmf/examples/search.js +++ b/contribs/gmf/examples/search.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.search'); // webpack: import './search.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.map.component'); goog.require('gmf.search.module'); diff --git a/contribs/gmf/examples/share.js b/contribs/gmf/examples/share.js index 83b7d8dce5f4..4725a810aee7 100644 --- a/contribs/gmf/examples/share.js +++ b/contribs/gmf/examples/share.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.share'); // webpack: import './share.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.permalink.shareComponent'); /** @suppress {extraRequire} */ diff --git a/contribs/gmf/examples/simple.js b/contribs/gmf/examples/simple.js index 00debbe0559c..f5e573f26b51 100644 --- a/contribs/gmf/examples/simple.js +++ b/contribs/gmf/examples/simple.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.simple'); // webpack: import './simple.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.map.component'); goog.require('ol.Map'); diff --git a/contribs/gmf/examples/themeselector.js b/contribs/gmf/examples/themeselector.js index a6bf057339a7..ca74bf5d5745 100644 --- a/contribs/gmf/examples/themeselector.js +++ b/contribs/gmf/examples/themeselector.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.themeselector'); // webpack: import './themeselector.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.theme.module'); goog.require('gmf.layertree.TreeManager'); diff --git a/contribs/gmf/examples/timeslider.js b/contribs/gmf/examples/timeslider.js index 3572ddfa710b..b830a36371c6 100644 --- a/contribs/gmf/examples/timeslider.js +++ b/contribs/gmf/examples/timeslider.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.timeslider'); // webpack: import './timeslider.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.layertree.timeSliderComponent'); goog.require('ngeo.misc.WMSTime'); diff --git a/contribs/gmf/examples/wfspermalink.js b/contribs/gmf/examples/wfspermalink.js index 3122f03727ee..eae87630a5d9 100644 --- a/contribs/gmf/examples/wfspermalink.js +++ b/contribs/gmf/examples/wfspermalink.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.wfspermalink'); // webpack: import './wfspermalink.css'; -// webpack: import './common_dependencies.js'; /** @suppress {extraRequire} */ goog.require('gmf.map.component'); /** @suppress {extraRequire} */ diff --git a/contribs/gmf/examples/xsdattributes.js b/contribs/gmf/examples/xsdattributes.js index bdf7290bbc68..e50192b7c8ff 100644 --- a/contribs/gmf/examples/xsdattributes.js +++ b/contribs/gmf/examples/xsdattributes.js @@ -1,7 +1,6 @@ goog.provide('gmfapp.xsdattributes'); // webpack: import './xsdattributes.css'; -// webpack: import './common_dependencies.js'; goog.require('gmf.theme.Themes'); goog.require('gmf.editing.XSDAttributes'); goog.require('ngeo.editing.attributesComponent'); From de89d81365462d8cfbd7c384b54cfd61233021cf Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 28 Feb 2018 12:04:42 +0100 Subject: [PATCH 2/3] Fix the constant call in gmf examples --- contribs/gmf/examples/contextualdata.js | 4 ++-- contribs/gmf/examples/datepicker.js | 2 +- contribs/gmf/examples/displayquerygrid.js | 4 ++-- contribs/gmf/examples/displayquerywindow.js | 4 ++-- contribs/gmf/examples/drawfeature.js | 4 ++-- contribs/gmf/examples/editfeature.js | 4 ++-- contribs/gmf/examples/editfeatureselector.js | 4 ++-- contribs/gmf/examples/elevation.js | 4 ++-- contribs/gmf/examples/featurestyle.js | 4 ++-- contribs/gmf/examples/filterselector.js | 4 ++-- contribs/gmf/examples/importdatasource.js | 4 ++-- contribs/gmf/examples/layertree.js | 4 ++-- contribs/gmf/examples/layertreeadd.js | 6 +++--- contribs/gmf/examples/mobilemeasure.js | 4 ++-- contribs/gmf/examples/mouseposition.js | 4 ++-- contribs/gmf/examples/objectediting.js | 10 +++++----- contribs/gmf/examples/objecteditinghub.js | 4 ++-- contribs/gmf/examples/permalink.js | 4 ++-- contribs/gmf/examples/print.js | 4 ++-- contribs/gmf/examples/profile.js | 4 ++-- contribs/gmf/examples/search.js | 4 ++-- contribs/gmf/examples/share.js | 4 ++-- contribs/gmf/examples/simple.js | 4 ++-- contribs/gmf/examples/themeselector.js | 2 +- contribs/gmf/examples/timeslider.js | 2 +- contribs/gmf/examples/wfspermalink.js | 4 ++-- contribs/gmf/examples/xsdattributes.js | 2 +- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/contribs/gmf/examples/contextualdata.js b/contribs/gmf/examples/contextualdata.js index b1fd23fd814d..420328af32e0 100644 --- a/contribs/gmf/examples/contextualdata.js +++ b/contribs/gmf/examples/contextualdata.js @@ -28,8 +28,8 @@ gmfapp.contextualdata.module.value( 'gmfContextualdatacontentTemplateUrl', 'partials/contextualdata.html'); -gmfapp.contextualdata.constant('defaultTheme', 'Demo'); -gmfapp.contextualdata.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.contextualdata.module.constant('defaultTheme', 'Demo'); +gmfapp.contextualdata.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/datepicker.js b/contribs/gmf/examples/datepicker.js index 02ca123324a5..4e42673201f2 100644 --- a/contribs/gmf/examples/datepicker.js +++ b/contribs/gmf/examples/datepicker.js @@ -11,7 +11,7 @@ gmfapp.datepicker.module = angular.module('gmfapp', [ ngeo.misc.WMSTime.module.name, ]); -gmfapp.datepicker.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.datepicker.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/displayquerygrid.js b/contribs/gmf/examples/displayquerygrid.js index 0acb4c6bc419..cb8947f03ff7 100644 --- a/contribs/gmf/examples/displayquerygrid.js +++ b/contribs/gmf/examples/displayquerygrid.js @@ -50,8 +50,8 @@ gmfapp.displayquerygrid.module.constant( 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/themes?' + 'version=2&background=background'); -gmfapp.displayquerygrid.constant('defaultTheme', 'Demo'); -gmfapp.displayquerygrid.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.displayquerygrid.module.constant('defaultTheme', 'Demo'); +gmfapp.displayquerygrid.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/displayquerywindow.js b/contribs/gmf/examples/displayquerywindow.js index d42cef144548..d13bbf273cec 100644 --- a/contribs/gmf/examples/displayquerywindow.js +++ b/contribs/gmf/examples/displayquerywindow.js @@ -48,8 +48,8 @@ gmfapp.displayquerywindow.module.value( 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/themes?' + 'version=2&background=background'); -gmfapp.displayquerywindow.constant('defaultTheme', 'Demo'); -gmfapp.displayquerywindow.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.displayquerywindow.module.constant('defaultTheme', 'Demo'); +gmfapp.displayquerywindow.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/drawfeature.js b/contribs/gmf/examples/drawfeature.js index 65e5683a95bf..6e0a9a1efc68 100644 --- a/contribs/gmf/examples/drawfeature.js +++ b/contribs/gmf/examples/drawfeature.js @@ -32,8 +32,8 @@ gmfapp.drawfeature.module.value('ngeoExportFeatureFormats', [ ngeo.misc.FeatureHelper.FormatType.GPX ]); -gmfapp.drawfeature.constant('defaultTheme', 'Demo'); -gmfapp.drawfeature.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.drawfeature.module.constant('defaultTheme', 'Demo'); +gmfapp.drawfeature.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/editfeature.js b/contribs/gmf/examples/editfeature.js index d40c34341c1b..d3a16a112d38 100644 --- a/contribs/gmf/examples/editfeature.js +++ b/contribs/gmf/examples/editfeature.js @@ -34,8 +34,8 @@ gmfapp.editfeature.module.value( gmfapp.editfeature.module.value('gmfLayersUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/layers/'); -gmfapp.editfeature.constant('defaultTheme', 'Demo'); -gmfapp.editfeature.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.editfeature.module.constant('defaultTheme', 'Demo'); +gmfapp.editfeature.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/editfeatureselector.js b/contribs/gmf/examples/editfeatureselector.js index 38e18680f88b..87ca187de694 100644 --- a/contribs/gmf/examples/editfeatureselector.js +++ b/contribs/gmf/examples/editfeatureselector.js @@ -52,8 +52,8 @@ gmfapp.editfeatureselector.module.value('gmfTreeUrl', gmfapp.editfeatureselector.module.value('gmfLayersUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/layers/'); -gmfapp.editfeatureselector.constant('defaultTheme', 'Edit'); -gmfapp.editfeatureselector.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.editfeatureselector.module.constant('defaultTheme', 'Edit'); +gmfapp.editfeatureselector.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/elevation.js b/contribs/gmf/examples/elevation.js index 31bc0cbe708b..a798b521f740 100644 --- a/contribs/gmf/examples/elevation.js +++ b/contribs/gmf/examples/elevation.js @@ -23,8 +23,8 @@ gmfapp.elevation.module.value( 'gmfRasterUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/raster'); -gmfapp.elevation.constant('defaultTheme', 'Demo'); -gmfapp.elevation.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.elevation.module.constant('defaultTheme', 'Demo'); +gmfapp.elevation.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/featurestyle.js b/contribs/gmf/examples/featurestyle.js index 254b3250202b..20ae230cf839 100644 --- a/contribs/gmf/examples/featurestyle.js +++ b/contribs/gmf/examples/featurestyle.js @@ -30,8 +30,8 @@ gmfapp.featurestyle.module = angular.module('gmfapp', [ gmfapp.featurestyle.module.value('ngeoMeasureDecimals', 2); -gmfapp.featurestyle.constant('defaultTheme', 'Demo'); -gmfapp.featurestyle.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.featurestyle.module.constant('defaultTheme', 'Demo'); +gmfapp.featurestyle.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/filterselector.js b/contribs/gmf/examples/filterselector.js index eb015332903d..542c02962581 100644 --- a/contribs/gmf/examples/filterselector.js +++ b/contribs/gmf/examples/filterselector.js @@ -57,8 +57,8 @@ gmfapp.filterselector.module.value('gmfTreeUrl', gmfapp.filterselector.module.value('gmfLayersUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/layers/'); -gmfapp.filterselector.constant('defaultTheme', 'Filters'); -gmfapp.filterselector.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.filterselector.module.constant('defaultTheme', 'Filters'); +gmfapp.filterselector.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); gmfapp.filterselector.MainController = class { diff --git a/contribs/gmf/examples/importdatasource.js b/contribs/gmf/examples/importdatasource.js index 82dd81c6927b..b5d21bda1a6e 100644 --- a/contribs/gmf/examples/importdatasource.js +++ b/contribs/gmf/examples/importdatasource.js @@ -61,8 +61,8 @@ gmfapp.importdatasource.module.value('gmfExternalOGCServers', [{ 'url': 'https://wmts.geo.admin.ch/1.0.0/WMTSCapabilities.xml?lang=fr' }]); -gmfapp.importdatasource.constant('defaultTheme', 'Filters'); -gmfapp.importdatasource.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.importdatasource.module.constant('defaultTheme', 'Filters'); +gmfapp.importdatasource.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); gmfapp.importdatasource.MainController = class { diff --git a/contribs/gmf/examples/layertree.js b/contribs/gmf/examples/layertree.js index 922f378a1306..d690b9125e1c 100644 --- a/contribs/gmf/examples/layertree.js +++ b/contribs/gmf/examples/layertree.js @@ -33,8 +33,8 @@ gmfapp.layertree.module = angular.module('gmfapp', [ gmfapp.layertree.module.value('gmfTreeUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/themes?version=2&background=background&interface=desktop'); -gmfapp.layertree.constant('defaultTheme', 'Demo'); -gmfapp.layertree.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.layertree.module.constant('defaultTheme', 'Demo'); +gmfapp.layertree.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/layertreeadd.js b/contribs/gmf/examples/layertreeadd.js index 0f193af0ba60..85a7e5941a96 100644 --- a/contribs/gmf/examples/layertreeadd.js +++ b/contribs/gmf/examples/layertreeadd.js @@ -31,9 +31,9 @@ gmfapp.layertreeadd.module = angular.module('gmfapp', [ gmfapp.layertreeadd.module.value('gmfTreeUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/themes?version=2&background=background&interface=desktop'); -gmfapp.layertreeadd.constant('defaultTheme', 'Demo'); -gmfapp.layertreeadd.constant('gmfTreeManagerModeFlush', false); -gmfapp.layertreeadd.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.layertreeadd.module.constant('defaultTheme', 'Demo'); +gmfapp.layertreeadd.module.constant('gmfTreeManagerModeFlush', false); +gmfapp.layertreeadd.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/mobilemeasure.js b/contribs/gmf/examples/mobilemeasure.js index 29e066943bf0..5f9d9cf2395c 100644 --- a/contribs/gmf/examples/mobilemeasure.js +++ b/contribs/gmf/examples/mobilemeasure.js @@ -30,8 +30,8 @@ gmfapp.mobilemeasure.module.value( 'gmfRasterUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/raster'); -gmfapp.mobilemeasure.constant('defaultTheme', 'Demo'); -gmfapp.mobilemeasure.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.mobilemeasure.module.constant('defaultTheme', 'Demo'); +gmfapp.mobilemeasure.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/mouseposition.js b/contribs/gmf/examples/mouseposition.js index 430a241d8f6b..9e73caf68fb2 100644 --- a/contribs/gmf/examples/mouseposition.js +++ b/contribs/gmf/examples/mouseposition.js @@ -16,8 +16,8 @@ gmfapp.mouseposition.module = angular.module('gmfapp', [ gmf.map.module.name, ]); -gmfapp.mouseposition.constant('defaultTheme', 'Demo'); -gmfapp.mouseposition.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.mouseposition.module.constant('defaultTheme', 'Demo'); +gmfapp.mouseposition.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/objectediting.js b/contribs/gmf/examples/objectediting.js index 1d5caa3932ca..420cf8ef86fd 100644 --- a/contribs/gmf/examples/objectediting.js +++ b/contribs/gmf/examples/objectediting.js @@ -33,13 +33,13 @@ gmfapp.objectediting.module = angular.module('gmfapp', [ ngeo.misc.ToolActivateMgr.module.name, ]); -gmfapp.objectediting.constant('defaultTheme', 'ObjectEditing'); -gmfapp.objectediting.constant('gmfLayersUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/layers/'); -gmfapp.objectediting.constant('gmfTreeUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/themes?version=2&background=background'); -gmfapp.objectediting.constant('gmfObjectEditingToolsOptions', { +gmfapp.objectediting.module.constant('defaultTheme', 'ObjectEditing'); +gmfapp.objectediting.module.constant('gmfLayersUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/layers/'); +gmfapp.objectediting.module.constant('gmfTreeUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/themes?version=2&background=background'); +gmfapp.objectediting.module.constant('gmfObjectEditingToolsOptions', { regularPolygonRadius: 150 }); -gmfapp.objectediting.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.objectediting.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/objecteditinghub.js b/contribs/gmf/examples/objecteditinghub.js index d3f6f4e6ec7f..6605070fe220 100644 --- a/contribs/gmf/examples/objecteditinghub.js +++ b/contribs/gmf/examples/objecteditinghub.js @@ -24,8 +24,8 @@ gmfapp.objecteditinghub.module.value('gmfTreeUrl', gmfapp.objecteditinghub.module.value('gmfLayersUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/layers/'); -gmfapp.objecteditinghub.constant('defaultTheme', 'Demo'); -gmfapp.objecteditinghub.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.objecteditinghub.module.constant('defaultTheme', 'Demo'); +gmfapp.objecteditinghub.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/permalink.js b/contribs/gmf/examples/permalink.js index 6e736b3a1883..09d9ec7d4947 100644 --- a/contribs/gmf/examples/permalink.js +++ b/contribs/gmf/examples/permalink.js @@ -18,8 +18,8 @@ gmfapp.permalink.module = angular.module('gmfapp', [ gmf.map.component.name, ]); -gmfapp.permalink.constant('defaultTheme', 'Demo'); -gmfapp.permalink.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.permalink.module.constant('defaultTheme', 'Demo'); +gmfapp.permalink.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); gmfapp.permalink.module.value('gmfPermalinkOptions', diff --git a/contribs/gmf/examples/print.js b/contribs/gmf/examples/print.js index 2eba3d4d54a6..53e718c0ae81 100644 --- a/contribs/gmf/examples/print.js +++ b/contribs/gmf/examples/print.js @@ -44,8 +44,8 @@ gmfapp.print.module.value( gmfapp.print.module.value('gmfLayersUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/layers/'); -gmfapp.print.constant('defaultTheme', 'Demo'); -gmfapp.print.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.print.module.constant('defaultTheme', 'Demo'); +gmfapp.print.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/profile.js b/contribs/gmf/examples/profile.js index c89f9c50b0f3..f22980a98843 100644 --- a/contribs/gmf/examples/profile.js +++ b/contribs/gmf/examples/profile.js @@ -31,8 +31,8 @@ gmfapp.profile.module.value( 'gmfProfileJsonUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/profile.json'); -gmfapp.profile.constant('defaultTheme', 'Demo'); -gmfapp.profile.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.profile.module.constant('defaultTheme', 'Demo'); +gmfapp.profile.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/search.js b/contribs/gmf/examples/search.js index 7b508728f1b1..17c41b7cd7e8 100644 --- a/contribs/gmf/examples/search.js +++ b/contribs/gmf/examples/search.js @@ -37,8 +37,8 @@ gmfapp.search.module.value('fulltextsearchUrl', gmfapp.search.module.value('gmfLayersUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/layers/'); -gmfapp.search.constant('defaultTheme', 'Demo'); -gmfapp.search.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.search.module.constant('defaultTheme', 'Demo'); +gmfapp.search.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/share.js b/contribs/gmf/examples/share.js index 4725a810aee7..bf780d640c69 100644 --- a/contribs/gmf/examples/share.js +++ b/contribs/gmf/examples/share.js @@ -13,8 +13,8 @@ gmfapp.share.module = angular.module('gmfapp', [ gmf.permalink.shareComponent.name, ]); -gmfapp.share.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); -gmfapp.share.constant('gmfShortenerCreateUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/short/create'); +gmfapp.share.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.share.module.constant('gmfShortenerCreateUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/short/create'); /** diff --git a/contribs/gmf/examples/simple.js b/contribs/gmf/examples/simple.js index f5e573f26b51..46fd6459acc4 100644 --- a/contribs/gmf/examples/simple.js +++ b/contribs/gmf/examples/simple.js @@ -14,8 +14,8 @@ gmfapp.simple.module = angular.module('gmfapp', [ gmf.map.component.name, ]); -gmfapp.simple.constant('defaultTheme', 'Demo'); -gmfapp.simple.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.simple.module.constant('defaultTheme', 'Demo'); +gmfapp.simple.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/themeselector.js b/contribs/gmf/examples/themeselector.js index ca74bf5d5745..e2d9ebf16e45 100644 --- a/contribs/gmf/examples/themeselector.js +++ b/contribs/gmf/examples/themeselector.js @@ -14,7 +14,7 @@ gmfapp.themeselector.module = angular.module('gmfapp', [ gmfapp.themeselector.module.value('gmfTreeUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/themes?version=2&background=background'); -gmfapp.themeselector.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.themeselector.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/timeslider.js b/contribs/gmf/examples/timeslider.js index b830a36371c6..ed1c2ea4244e 100644 --- a/contribs/gmf/examples/timeslider.js +++ b/contribs/gmf/examples/timeslider.js @@ -11,7 +11,7 @@ gmfapp.timeslider.module = angular.module('gmfapp', [ ngeo.misc.WMSTime.module.name, ]); -gmfapp.timeslider.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.timeslider.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/wfspermalink.js b/contribs/gmf/examples/wfspermalink.js index eae87630a5d9..03f0ae8822f2 100644 --- a/contribs/gmf/examples/wfspermalink.js +++ b/contribs/gmf/examples/wfspermalink.js @@ -33,8 +33,8 @@ gmfapp.wfspermalink.module.value('ngeoWfsPermalinkOptions', defaultFeaturePrefix: 'feature' })); -gmfapp.wfspermalink.constant('defaultTheme', 'Demo'); -gmfapp.wfspermalink.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.wfspermalink.module.constant('defaultTheme', 'Demo'); +gmfapp.wfspermalink.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** diff --git a/contribs/gmf/examples/xsdattributes.js b/contribs/gmf/examples/xsdattributes.js index e50192b7c8ff..327f2d795657 100644 --- a/contribs/gmf/examples/xsdattributes.js +++ b/contribs/gmf/examples/xsdattributes.js @@ -22,7 +22,7 @@ gmfapp.xsdattributes.module.value('gmfTreeUrl', gmfapp.xsdattributes.module.value('gmfLayersUrl', 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/layers/'); -gmfapp.xsdattributes.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); +gmfapp.xsdattributes.module.constant('angularLocaleScript', '../build/angular-locale_{{locale}}.js'); /** From b268fc3ca1441de2da725ab6a00db79a57d4dd75 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 28 Feb 2018 12:26:46 +0100 Subject: [PATCH 3/3] Add gettext dependency in gmf examples --- contribs/gmf/examples/authentication.js | 1 + contribs/gmf/examples/backgroundlayerselector.js | 1 + contribs/gmf/examples/contextualdata.js | 1 + contribs/gmf/examples/datepicker.js | 1 + contribs/gmf/examples/displayquerygrid.js | 1 + contribs/gmf/examples/displayquerywindow.js | 1 + contribs/gmf/examples/drawfeature.js | 1 + contribs/gmf/examples/editfeature.js | 1 + contribs/gmf/examples/editfeatureselector.js | 1 + contribs/gmf/examples/elevation.js | 1 + contribs/gmf/examples/featurestyle.js | 1 + contribs/gmf/examples/filterselector.js | 1 + contribs/gmf/examples/importdatasource.js | 1 + contribs/gmf/examples/layertree.js | 1 + contribs/gmf/examples/layertreeadd.js | 1 + contribs/gmf/examples/mobilemeasure.js | 1 + contribs/gmf/examples/mouseposition.js | 1 + contribs/gmf/examples/objectediting.js | 1 + contribs/gmf/examples/objecteditinghub.js | 1 + contribs/gmf/examples/permalink.js | 1 + contribs/gmf/examples/print.js | 1 + contribs/gmf/examples/profile.js | 1 + contribs/gmf/examples/search.js | 1 + contribs/gmf/examples/share.js | 1 + contribs/gmf/examples/simple.js | 1 + contribs/gmf/examples/themeselector.js | 1 + contribs/gmf/examples/timeslider.js | 1 + contribs/gmf/examples/wfspermalink.js | 1 + contribs/gmf/examples/xsdattributes.js | 1 + 29 files changed, 29 insertions(+) diff --git a/contribs/gmf/examples/authentication.js b/contribs/gmf/examples/authentication.js index 3df85339854e..c9b2394e04c7 100644 --- a/contribs/gmf/examples/authentication.js +++ b/contribs/gmf/examples/authentication.js @@ -7,6 +7,7 @@ goog.require('gmf.authentication.module'); /** @type {!angular.Module} **/ gmfapp.authentication.module = angular.module('gmfapp', [ + 'gettext', gmf.authentication.module.name ]); diff --git a/contribs/gmf/examples/backgroundlayerselector.js b/contribs/gmf/examples/backgroundlayerselector.js index 8a0bd36a0d5b..c10c43f5a424 100644 --- a/contribs/gmf/examples/backgroundlayerselector.js +++ b/contribs/gmf/examples/backgroundlayerselector.js @@ -12,6 +12,7 @@ goog.require('ol.View'); /** @type {!angular.Module} **/ gmfapp.backgroundlayerselector.module = angular.module('gmfapp', [ + 'gettext', gmf.backgroundlayerselector.module.name, gmf.map.component.name, gmf.theme.Themes.module.name, diff --git a/contribs/gmf/examples/contextualdata.js b/contribs/gmf/examples/contextualdata.js index 420328af32e0..d402ad51528c 100644 --- a/contribs/gmf/examples/contextualdata.js +++ b/contribs/gmf/examples/contextualdata.js @@ -14,6 +14,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.contextualdata.module = angular.module('gmfapp', [ + 'gettext', gmf.contextualdata.module.name, gmf.map.component.name, ngeo.misc.filters.name, diff --git a/contribs/gmf/examples/datepicker.js b/contribs/gmf/examples/datepicker.js index 4e42673201f2..261850746b50 100644 --- a/contribs/gmf/examples/datepicker.js +++ b/contribs/gmf/examples/datepicker.js @@ -7,6 +7,7 @@ goog.require('ngeo.misc.WMSTime'); /** @type {!angular.Module} **/ gmfapp.datepicker.module = angular.module('gmfapp', [ + 'gettext', ngeo.misc.datepickerComponent.name, ngeo.misc.WMSTime.module.name, ]); diff --git a/contribs/gmf/examples/displayquerygrid.js b/contribs/gmf/examples/displayquerygrid.js index cb8947f03ff7..a574fc4f0f0e 100644 --- a/contribs/gmf/examples/displayquerygrid.js +++ b/contribs/gmf/examples/displayquerygrid.js @@ -26,6 +26,7 @@ goog.require('ol.style.Style'); /** @type {!angular.Module} **/ gmfapp.displayquerygrid.module = angular.module('gmfapp', [ + 'gettext', gmf.datasource.Manager.module.name, gmf.layertree.component.name, gmf.map.component.name, diff --git a/contribs/gmf/examples/displayquerywindow.js b/contribs/gmf/examples/displayquerywindow.js index d13bbf273cec..51598869fb51 100644 --- a/contribs/gmf/examples/displayquerywindow.js +++ b/contribs/gmf/examples/displayquerywindow.js @@ -26,6 +26,7 @@ goog.require('ngeo.map.module'); /** @type {!angular.Module} **/ gmfapp.displayquerywindow.module = angular.module('gmfapp', [ + 'gettext', gmf.datasource.Manager.module.name, gmf.layertree.component.name, gmf.map.component.name, diff --git a/contribs/gmf/examples/drawfeature.js b/contribs/gmf/examples/drawfeature.js index 6e0a9a1efc68..e4193086314d 100644 --- a/contribs/gmf/examples/drawfeature.js +++ b/contribs/gmf/examples/drawfeature.js @@ -19,6 +19,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.drawfeature.module = angular.module('gmfapp', [ + 'gettext', gmf.drawing.module.name, gmf.map.component.name, ngeo.map.module.name, // for ngeo.map.FeatureOverlay, perhaps remove me diff --git a/contribs/gmf/examples/editfeature.js b/contribs/gmf/examples/editfeature.js index d3a16a112d38..6d6b436df144 100644 --- a/contribs/gmf/examples/editfeature.js +++ b/contribs/gmf/examples/editfeature.js @@ -20,6 +20,7 @@ goog.require('ol.source.ImageWMS'); /** @type {!angular.Module} **/ gmfapp.editfeature.module = angular.module('gmfapp', [ + 'gettext', gmf.authentication.module.name, gmf.editing.EditFeature.module.name, gmf.map.component.name, diff --git a/contribs/gmf/examples/editfeatureselector.js b/contribs/gmf/examples/editfeatureselector.js index 87ca187de694..172b7dcb7d37 100644 --- a/contribs/gmf/examples/editfeatureselector.js +++ b/contribs/gmf/examples/editfeatureselector.js @@ -25,6 +25,7 @@ goog.require('ol.source.Vector'); /** @type {!angular.Module} **/ gmfapp.editfeatureselector.module = angular.module('gmfapp', [ + 'gettext', gmf.authentication.module.name, gmf.editing.editFeatureSelectorComponent.name, gmf.layertree.component.name, diff --git a/contribs/gmf/examples/elevation.js b/contribs/gmf/examples/elevation.js index a798b521f740..a70f372a6381 100644 --- a/contribs/gmf/examples/elevation.js +++ b/contribs/gmf/examples/elevation.js @@ -14,6 +14,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.elevation.module = angular.module('gmfapp', [ + 'gettext', gmf.map.component.name, gmf.raster.module.name, ]); diff --git a/contribs/gmf/examples/featurestyle.js b/contribs/gmf/examples/featurestyle.js index 20ae230cf839..1166e2f3812f 100644 --- a/contribs/gmf/examples/featurestyle.js +++ b/contribs/gmf/examples/featurestyle.js @@ -22,6 +22,7 @@ goog.require('ol.source.Vector'); /** @type {!angular.Module} **/ gmfapp.featurestyle.module = angular.module('gmfapp', [ + 'gettext', gmf.drawing.featureStyleComponent.name, gmf.map.component.name, ngeo.misc.FeatureHelper.module.name, diff --git a/contribs/gmf/examples/filterselector.js b/contribs/gmf/examples/filterselector.js index 542c02962581..5512a81e95ba 100644 --- a/contribs/gmf/examples/filterselector.js +++ b/contribs/gmf/examples/filterselector.js @@ -27,6 +27,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.filterselector.module = angular.module('gmfapp', [ + 'gettext', gmf.authentication.module.name, gmf.datasource.Manager.module.name, gmf.layertree.component.name, diff --git a/contribs/gmf/examples/importdatasource.js b/contribs/gmf/examples/importdatasource.js index b5d21bda1a6e..94190283df4c 100644 --- a/contribs/gmf/examples/importdatasource.js +++ b/contribs/gmf/examples/importdatasource.js @@ -25,6 +25,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.importdatasource.module = angular.module('gmfapp', [ + 'gettext', gmf.datasource.Manager.module.name, gmf.import.importdatasourceComponent.name, gmf.layertree.component.name, diff --git a/contribs/gmf/examples/layertree.js b/contribs/gmf/examples/layertree.js index d690b9125e1c..c21a6303f774 100644 --- a/contribs/gmf/examples/layertree.js +++ b/contribs/gmf/examples/layertree.js @@ -19,6 +19,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.layertree.module = angular.module('gmfapp', [ + 'gettext', gmf.layertree.component.name, gmf.layertree.TreeManager.module.name, gmf.map.component.name, diff --git a/contribs/gmf/examples/layertreeadd.js b/contribs/gmf/examples/layertreeadd.js index 85a7e5941a96..dd6be4f3c56b 100644 --- a/contribs/gmf/examples/layertreeadd.js +++ b/contribs/gmf/examples/layertreeadd.js @@ -18,6 +18,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.layertreeadd.module = angular.module('gmfapp', [ + 'gettext', gmf.layertree.component.name, gmf.layertree.TreeManager.module.name, gmf.map.component.name, diff --git a/contribs/gmf/examples/mobilemeasure.js b/contribs/gmf/examples/mobilemeasure.js index 5f9d9cf2395c..a12f8b9af01b 100644 --- a/contribs/gmf/examples/mobilemeasure.js +++ b/contribs/gmf/examples/mobilemeasure.js @@ -18,6 +18,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.mobilemeasure.module = angular.module('gmfapp', [ + 'gettext', gmf.map.component.name, gmf.permalink.Permalink.module.name, gmf.mobile.measure.lengthComponent.name, diff --git a/contribs/gmf/examples/mouseposition.js b/contribs/gmf/examples/mouseposition.js index 9e73caf68fb2..f2d8eaed9e18 100644 --- a/contribs/gmf/examples/mouseposition.js +++ b/contribs/gmf/examples/mouseposition.js @@ -13,6 +13,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.mouseposition.module = angular.module('gmfapp', [ + 'gettext', gmf.map.module.name, ]); diff --git a/contribs/gmf/examples/objectediting.js b/contribs/gmf/examples/objectediting.js index 420cf8ef86fd..89b617396172 100644 --- a/contribs/gmf/examples/objectediting.js +++ b/contribs/gmf/examples/objectediting.js @@ -24,6 +24,7 @@ goog.require('ol.source.Vector'); /** @type {!angular.Module} **/ gmfapp.objectediting.module = angular.module('gmfapp', [ + 'gettext', gmf.layertree.component.name, gmf.layertree.TreeManager.module.name, gmf.map.component.name, diff --git a/contribs/gmf/examples/objecteditinghub.js b/contribs/gmf/examples/objecteditinghub.js index 6605070fe220..974b9abfc410 100644 --- a/contribs/gmf/examples/objecteditinghub.js +++ b/contribs/gmf/examples/objecteditinghub.js @@ -11,6 +11,7 @@ goog.require('ngeo.format.XSDAttribute'); /** @type {!angular.Module} **/ gmfapp.objecteditinghub.module = angular.module('gmfapp', [ + 'gettext', gmf.editing.XSDAttributes.module.name, gmf.objectediting.Manager.module.name, gmf.theme.Themes.module.name, diff --git a/contribs/gmf/examples/permalink.js b/contribs/gmf/examples/permalink.js index 09d9ec7d4947..6cce739f93b3 100644 --- a/contribs/gmf/examples/permalink.js +++ b/contribs/gmf/examples/permalink.js @@ -15,6 +15,7 @@ goog.require('ol.style.Style'); /** @type {!angular.Module} **/ gmfapp.permalink.module = angular.module('gmfapp', [ + 'gettext', gmf.map.component.name, ]); diff --git a/contribs/gmf/examples/print.js b/contribs/gmf/examples/print.js index 53e718c0ae81..44eada8caa89 100644 --- a/contribs/gmf/examples/print.js +++ b/contribs/gmf/examples/print.js @@ -17,6 +17,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.print.module = angular.module('gmfapp', [ + 'gettext', gmf.layertree.component.name, gmf.map.component.name, gmf.print.component.name, diff --git a/contribs/gmf/examples/profile.js b/contribs/gmf/examples/profile.js index f22980a98843..a0ed614b9416 100644 --- a/contribs/gmf/examples/profile.js +++ b/contribs/gmf/examples/profile.js @@ -20,6 +20,7 @@ goog.require('ol.style.Style'); /** @type {!angular.Module} **/ gmfapp.profile.module = angular.module('gmfapp', [ + 'gettext', gmf.permalink.Permalink.module.name, gmf.map.component.name, gmf.profile.module.name, diff --git a/contribs/gmf/examples/search.js b/contribs/gmf/examples/search.js index 17c41b7cd7e8..b026922eb61e 100644 --- a/contribs/gmf/examples/search.js +++ b/contribs/gmf/examples/search.js @@ -21,6 +21,7 @@ goog.require('ol.style.Style'); /** @type {!angular.Module} **/ gmfapp.search.module = angular.module('gmfapp', [ + 'gettext', gmf.map.component.name, gmf.search.module.name, gmf.theme.Themes.module.name, diff --git a/contribs/gmf/examples/share.js b/contribs/gmf/examples/share.js index bf780d640c69..e3b4cbf9e04d 100644 --- a/contribs/gmf/examples/share.js +++ b/contribs/gmf/examples/share.js @@ -9,6 +9,7 @@ goog.require('ngeo.message.modalComponent'); /** @type {!angular.Module} **/ gmfapp.share.module = angular.module('gmfapp', [ + 'gettext', ngeo.message.modalComponent.name, gmf.permalink.shareComponent.name, ]); diff --git a/contribs/gmf/examples/simple.js b/contribs/gmf/examples/simple.js index 46fd6459acc4..b05c3a80b543 100644 --- a/contribs/gmf/examples/simple.js +++ b/contribs/gmf/examples/simple.js @@ -11,6 +11,7 @@ goog.require('ol.source.OSM'); /** @type {!angular.Module} **/ gmfapp.simple.module = angular.module('gmfapp', [ + 'gettext', gmf.map.component.name, ]); diff --git a/contribs/gmf/examples/themeselector.js b/contribs/gmf/examples/themeselector.js index e2d9ebf16e45..f563b217841c 100644 --- a/contribs/gmf/examples/themeselector.js +++ b/contribs/gmf/examples/themeselector.js @@ -7,6 +7,7 @@ goog.require('gmf.layertree.TreeManager'); /** @type {!angular.Module} **/ gmfapp.themeselector.module = angular.module('gmfapp', [ + 'gettext', gmf.layertree.TreeManager.module.name, gmf.theme.module.name, ]); diff --git a/contribs/gmf/examples/timeslider.js b/contribs/gmf/examples/timeslider.js index ed1c2ea4244e..78c518387e81 100644 --- a/contribs/gmf/examples/timeslider.js +++ b/contribs/gmf/examples/timeslider.js @@ -7,6 +7,7 @@ goog.require('ngeo.misc.WMSTime'); /** @type {!angular.Module} **/ gmfapp.timeslider.module = angular.module('gmfapp', [ + 'gettext', gmf.layertree.timeSliderComponent.name, ngeo.misc.WMSTime.module.name, ]); diff --git a/contribs/gmf/examples/wfspermalink.js b/contribs/gmf/examples/wfspermalink.js index 03f0ae8822f2..08cf07622942 100644 --- a/contribs/gmf/examples/wfspermalink.js +++ b/contribs/gmf/examples/wfspermalink.js @@ -18,6 +18,7 @@ goog.require('ol.style.Circle'); /** @type {!angular.Module} **/ gmfapp.wfspermalink.module = angular.module('gmfapp', [ + 'gettext', gmf.map.component.name, gmf.query.windowComponent.name, ]); diff --git a/contribs/gmf/examples/xsdattributes.js b/contribs/gmf/examples/xsdattributes.js index 327f2d795657..9af835c1390c 100644 --- a/contribs/gmf/examples/xsdattributes.js +++ b/contribs/gmf/examples/xsdattributes.js @@ -10,6 +10,7 @@ goog.require('ol.Feature'); /** @type {!angular.Module} **/ gmfapp.xsdattributes.module = angular.module('gmfapp', [ + 'gettext', gmf.editing.XSDAttributes.module.name, gmf.theme.Themes.module.name, ngeo.editing.attributesComponent.name,