Merge remote-tracking branch 'upstream/pull/5560'

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 99d5a60503328074457a0921e2000428e57907a3..0f4272a65a31c034d551e5c9a9a07d6c5a24e801 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -115,8 +115,7 @@ L.OSM.Map = L.Map.extend({
   },
 
   updateLayers: function (layerParam) {
-    var layers = layerParam || "M",
-        layersAdded = "";
+    var layers = layerParam || "M";
 
     for (let i = this.baseLayers.length - 1; i >= 0; i--) {
       if (layers.indexOf(this.baseLayers[i].options.code) === -1) {
@@ -125,11 +124,9 @@ L.OSM.Map = L.Map.extend({
     }
 
     for (let i = this.baseLayers.length - 1; i >= 0; i--) {
-      if (layers.indexOf(this.baseLayers[i].options.code) >= 0) {
-        this.addLayer(this.baseLayers[i]);
-        layersAdded = layersAdded + this.baseLayers[i].options.code;
-      } else if (i === 0 && layersAdded === "") {
+      if (layers.indexOf(this.baseLayers[i].options.code) >= 0 || i === 0) {
         this.addLayer(this.baseLayers[i]);
+        return;
       }
     }
   },