Merge 8b7820e into 52475a1

camptocamp · Jan 22, 2016 · 32f0b76 · 32f0b76
2 parents 52475a1 + 8b7820e
commit 32f0b76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/contribs/gmf/apps/mobile/js/mobile.js b/contribs/gmf/apps/mobile/js/mobile.js
@@ -16,12 +16,8 @@ goog.require('gmf.Themes');
 /** @suppress {extraRequire} */
 goog.require('gmf.authenticationDirective');
 /** @suppress {extraRequire} */
-goog.require('gmf.layertreeDirective');
-/** @suppress {extraRequire} */
 goog.require('gmf.proj.EPSG21781');
 /** @suppress {extraRequire} */
-goog.require('gmf.searchDirective');
-/** @suppress {extraRequire} */
 goog.require('ngeo.mobileGeolocationDirective');
 
 
@@ -48,7 +44,7 @@ app.MobileController = function(
     gmfThemes, fulltextsearchUrl) {
   goog.base(
       this, defaultLang, langUrls, gettextCatalog, ngeoGetBrowserLanguage,
-      $scope, ngeoStateManager, ngeoFeatureOverlayMgr,
+      $scope, ngeoStateManager, ngeoFeatureOverlayMgr, 21781,
       gmfThemes, fulltextsearchUrl);
 };
 goog.inherits(app.MobileController, gmf.AbstractMobileController);

diff --git a/contribs/gmf/src/controllers/abstractmobile.js b/contribs/gmf/src/controllers/abstractmobile.js
@@ -12,8 +12,6 @@ goog.require('gmf.mobileBackgroundLayerSelectorDirective');
 /** @suppress {extraRequire} */
 goog.require('gmf.mobileNavDirective');
 /** @suppress {extraRequire} */
-goog.require('gmf.proj.EPSG21781');
-/** @suppress {extraRequire} */
 goog.require('gmf.searchDirective');
 /** @suppress {extraRequire} */
 goog.require('gmf.themeselectorDirective');
@@ -50,6 +48,7 @@ gmfModule.constant('isMobile', true);
  * @param {ngeo.StateManager} ngeoStateManager the state manager.
  * @param {ngeo.FeatureOverlayMgr} ngeoFeatureOverlayMgr The ngeo feature
  *     overlay manager service.
+ * @param {number} srid The used EPSG code.
  * @param {gmf.Themes} gmfThemes Themes service.
  * @param {string} fulltextsearchUrl url to a gmf fulltextsearch service.
  * @constructor
@@ -58,7 +57,7 @@ gmfModule.constant('isMobile', true);
  */
 gmf.AbstractMobileController = function(
     defaultLang, langUrls, gettextCatalog, ngeoGetBrowserLanguage,
-    $scope, ngeoStateManager, ngeoFeatureOverlayMgr,
+    $scope, ngeoStateManager, ngeoFeatureOverlayMgr, srid,
     gmfThemes, fulltextsearchUrl) {
 
   /**
@@ -79,7 +78,7 @@ gmf.AbstractMobileController = function(
     labelKey: 'label',
     groupsKey: 'layer_name',
     groupValues: ['osm'],
-    projection: 'EPSG:21781',
+    projection: 'EPSG:' + srid,
     url: fulltextsearchUrl
   }];
 
@@ -126,7 +125,7 @@ gmf.AbstractMobileController = function(
     layers: [],
     view: new ol.View({
       center: [632464, 185457],
-      projection: ol.proj.get('epsg:21781'),
+      projection: ol.proj.get('epsg:' + 21781),
       minZoom: 3,
       zoom: 3
     }),