Merge branch 'master' of github.com:GeotrekCE/Geotrek-mobile

Author: bastien

app/scripts/map/mapFileSystemService.js

@@ -7,10 +7,7 @@ geotrekMap.service('mapFileSystemService',
     function ($q, $cordovaFile, logging, utils, settings) {
 
     this.getGlobalTileLayerURL = function() {
-        return [
-            settings.remote.LEAFLET_BACKGROUND_URL,
-            settings.device.LEAFLET_BACKGROUND_URL
-        ];
+        return settings.remote.LEAFLET_BACKGROUND_URL.concat(settings.device.LEAFLET_BACKGROUND_URL);
     };
 
     this.downloadGlobalBackground = function(url, progress, forceDownload) {

app/scripts/map/mapRemoteService.js

@@ -12,7 +12,7 @@ geotrekMap.service('mapRemoteService', ['$q', '$localStorage', 'settings', funct
     }
 
     this.getGlobalTileLayerURL = function() {
-        return [settings.remote.LEAFLET_BACKGROUND_URL];
+        return settings.remote.LEAFLET_BACKGROUND_URL;
     };
 
     // We don't have to download Map Background in Remote version, only for device offline mode

app/scripts/settings.js

@@ -39,7 +39,7 @@ geotrekAppSettings.constant('globalSettings', {
         GLOBAL_MAP_DL_TILES_ZOOM: 12,
         GLOBAL_MAP_DEFAULT_MIN_ZOOM: 8,
         GLOBAL_MAP_DEFAULT_MAX_ZOOM: 16,
-        BACKGROUND_URL: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+        BACKGROUND_URL: ['http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'],
         GLOBAL_MAP_ATTRIBUTION: '(c) osm',
         TREK_COLOR: '#aec900',
         HIGHLIGHT_DETAIL_LINEAR: false,
@@ -198,7 +198,7 @@ geotrekAppSettings.constant('globalSettings', {
             LOG_POOL_TIME: LOG_POOL_TIME,
             LOGS: LOGS,
             POI_ALERT_RADIUS : POI_ALERT_RADIUS,
-            LEAFLET_BACKGROUND_URL: CDV_ROOT + '/' + RELATIVE_TILES_ROOT + '/{z}/{x}/{y}.png'
+            LEAFLET_BACKGROUND_URL: [CDV_ROOT + '/' + RELATIVE_TILES_ROOT + '/{z}/{x}/{y}.png']
         },
         leaflet: leaflet_conf,
         filters: {
@@ -265,4 +265,4 @@ geotrekAppSettings.constant('globalSettings', {
 
         return deferred.promise;
     }
-}]);
+}]);