#96: apply for all maps

Grisu-NOE · Aug 27, 2016 · 8cf110a · 8cf110a
1 parent b2d08ac
commit 8cf110a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/www/js/app.js b/www/js/app.js
@@ -143,7 +143,8 @@ angular.module('grisu-noe',
  $urlRouterProvider.otherwise('/tab/overview');
 })
 
-.run(function($ionicPlatform, $window, $rootScope, $timeout, $cordovaSplashscreen, $cordovaDevice, dataService, $screenshotService, util) {
+.run(function($ionicPlatform, $window, $rootScope, $timeout, $cordovaSplashscreen,
+ $cordovaDevice, dataService, $screenshotService, util, leafletData) {
  $ionicPlatform.ready(function() {
 
  /** opens an external link with Cordova's inappbrowser plugin */
@@ -160,6 +161,15 @@ angular.module('grisu-noe',
  });
  };
 
+ /** hack to bring the overlays (e.g. OpenFireMap) in front of the base layer when the base layer changes */
+ $rootScope.$on('leafletDirectiveMap.baselayerchange', function() {
+ leafletData.getLayers().then(function(layer) {
+ angular.forEach(layer.baselayers, function(baseLayer) {
+ baseLayer.setZIndex(-1);
+ });
+ });
+ });
+
  if ($window.cordova) {
  $timeout(function() {
  console.debug('hide splash screen');

diff --git a/www/js/controllers/waterTabController.js b/www/js/controllers/waterTabController.js
@@ -80,17 +80,6 @@ angular.module('grisu-noe').controller('waterTabController',
  updateLayersAndHydrants();
  });
 
- /**
- * hack to bring the overlays (e.g. OpenFireMap) in front of the base layer when the base layer changes
- */
- $scope.$on('leafletDirectiveMap.baselayerchange', function() {
- leafletData.getLayers().then(function(layer) {
- angular.forEach(layer.baselayers, function(baseLayer) {
- baseLayer.setZIndex(-1);
- });
- });
- });
-
  $scope.$on('$ionicView.loaded', function() {
  $ionicLoading.show({
  template: '<ion-spinner class="spinner-light" icon="ripple"></ion-spinner><div>Bestimme aktuelle Position...</div>'