Merge branch 'master' of https://github.com/plumpudding/hopglass into prometheus-charts
This commit is contained in:
commit
c66aeb2f8a
10
lib/map.js
10
lib/map.js
|
@ -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.forEach( function (d) {
|
||||
|
@ -320,11 +326,11 @@ define(["map/clientlayer", "map/labelslayer",
|
|||
d.forEach(addLayer)
|
||||
}
|
||||
|
||||
var clientLayer = new ClientLayer({minZoom: 15})
|
||||
var clientLayer = new ClientLayer({minZoom: 15, maxZoom: maxLayerZoom})
|
||||
clientLayer.addTo(map)
|
||||
clientLayer.setZIndex(5)
|
||||
|
||||
var labelsLayer = new LabelsLayer()
|
||||
var labelsLayer = new LabelsLayer({maxZoom: maxLayerZoom})
|
||||
labelsLayer.addTo(map)
|
||||
labelsLayer.setZIndex(6)
|
||||
|
||||
|
|
Loading…
Reference in a new issue