Upgrade leaflet to 0.7.7

In preparation of the upgrade to leaflet 1.0 (not yet available) we upgrade to the latest stable release 0.7.7. We also upgrade the leaflet-provider plugin and remove obsolete base layers from the layer selection. fixes #111
clld · Sep 9, 2016 · 34830bc · 34830bc
1 parent 51a155e
commit 34830bc
Show file tree

Hide file tree

Showing 4 changed files with 521 additions and 263 deletions.
diff --git a/clld/web/static/css/leaflet.css b/clld/web/static/css/leaflet.css
@@ -21,6 +21,7 @@
 .leaflet-container {
 	overflow: hidden;
 	-ms-touch-action: none;
+	touch-action: none;
 	}
 .leaflet-tile,
 .leaflet-marker-icon,

diff --git a/clld/web/static/js/clld.js b/clld/web/static/js/clld.js
@@ -394,21 +394,25 @@ CLLD.Map = function(eid, layers, options) {
 
     var i, hash, opts, name,
         local_data = false,
+        baseLayersMap = {},
         baseLayers = [
-        "Thunderforest.Landscape",
-        "Thunderforest.Transport",
-        "OpenStreetMap.Mapnik",
-        "OpenStreetMap.BlackAndWhite",
-        "MapQuestOpen.OSM",
-        "MapQuestOpen.Aerial",
-        "Stamen.Watercolor",
-        "Esri.WorldStreetMap",
-        "Esri.DeLorme",
-        "Esri.WorldTopoMap",
-        "Esri.WorldImagery",
-        "Esri.WorldTerrain",
-        "Esri.WorldShadedRelief",
-        "Esri.WorldPhysical"];
+            "Thunderforest.Landscape",
+            "Thunderforest.Transport",
+            "OpenStreetMap.Mapnik",
+            "OpenStreetMap.BlackAndWhite",
+            "OpenTopoMap",
+            "OpenMapSurfer.Roads",
+            "Stamen.Watercolor",
+            "Stamen.Terrain",
+            "Stamen.TerrainBackground",
+            "Esri.WorldStreetMap",
+            "Esri.DeLorme",
+            "Esri.WorldTopoMap",
+            "Esri.WorldImagery",
+            "Esri.WorldTerrain",
+            "Esri.WorldShadedRelief",
+            "Esri.WorldPhysical"
+        ];
 
     if (this.options.base_layer) {
         baseLayers = [this.options.base_layer].concat(baseLayers);
@@ -539,7 +543,13 @@ CLLD.Map = function(eid, layers, options) {
     if (this.options.tile_layer != undefined) {
         L.tileLayer(this.options.tile_layer.url_pattern, this.options.tile_layer.options).addTo(this.map);
     } else {
-        L.control.layers.provided(baseLayers, []).addTo(this.map);
+        for (i = 0; i < baseLayers.length; ++i) {
+            baseLayersMap[baseLayers[i]] = L.tileLayer.provider(baseLayers[i]);
+            if (i == 0) {
+                baseLayersMap[baseLayers[i]].addTo(this.map)
+            }
+        }
+        L.control.layers(baseLayersMap).addTo(this.map);
     }
 
     this.marker_map = {};