freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/plumpudding/hopglass into prometheus-charts

Browse source
This commit is contained in:
Milan Pässler 2016-04-01 00:53:19 +02:00
parent e685fe385f 5fce722f24
commit c66aeb2f8a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/map.js
View file

@ -290,6 +290,12 @@ define(["map/clientlayer", "map/labelslayer",
} }
}) })
var maxLayerZoom = Math.max.apply(Math, config.mapLayers.map(
function(d) {
return (typeof d.config !== "undefined" && typeof d.config.maxZoom !== "undefined") ? d.config.maxZoom : 18
}))
layers[0].layer.addTo(map) layers[0].layer.addTo(map)
layers.forEach( function (d) { layers.forEach( function (d) {
@ -320,11 +326,11 @@ define(["map/clientlayer", "map/labelslayer",
d.forEach(addLayer) d.forEach(addLayer)
} }
var clientLayer = new ClientLayer({minZoom: 15}) var clientLayer = new ClientLayer({minZoom: 15, maxZoom: maxLayerZoom})
clientLayer.addTo(map) clientLayer.addTo(map)
clientLayer.setZIndex(5) clientLayer.setZIndex(5)
var labelsLayer = new LabelsLayer() var labelsLayer = new LabelsLayer({maxZoom: maxLayerZoom})
labelsLayer.addTo(map) labelsLayer.addTo(map)
labelsLayer.setZIndex(6) labelsLayer.setZIndex(6)