X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a0858dce1ce11c24de0103a341bc0ea8f75154ea..b1b9d1a24cd4ec5bc9176af4342697a739db64e7:/cookbooks/imagery/templates/default/imagery.js.erb?ds=sidebyside diff --git a/cookbooks/imagery/templates/default/imagery.js.erb b/cookbooks/imagery/templates/default/imagery.js.erb index d3ad65458..0f277444b 100644 --- a/cookbooks/imagery/templates/default/imagery.js.erb +++ b/cookbooks/imagery/templates/default/imagery.js.erb @@ -1,17 +1,17 @@ function createMap(divName) { // Create a map - var map = L.map(divName); + var map = L.map(divName).fitBounds(<%= @bbox.to_json %>); // Create a layer switcher - var layers = L.control.layers(); + var layers = L.control.layers(null, null, {collapsed:false}).addTo(map); // Add OpenStreetMap layer - layers.addBaseLayer(L.tileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", { - attribution: "© OpenStreetMap and contributors, under an open license", + layers.addBaseLayer(L.tileLayer("//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", { + attribution: "© OpenStreetMap and contributors, under an open license", maxZoom: 19 }), "OpenStreetMap"); - <% @layers.sort_by { |layer| layer[:name] }.each do |layer| -%> + // Create <%= layer[:name] %> layer var <%= layer[:name] %> = L.tileLayer(<%= layer[:url].to_json %>, { attribution: <%= layer[:attribution].to_json %>, @@ -19,26 +19,20 @@ function createMap(divName) { }); // Add <%= layer[:name] %> to layer switcher - layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:name].to_json %>); + <% if layer[:overlay] -%> + layers.addOverlay(<%= layer[:name] %>, <%= layer[:title].to_json %>); + <% else %> + layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>); + <% end -%> <% if layer[:default] -%> // Add <%= layer[:name] %> to map <%= layer[:name] %>.addTo(map); <% end -%> <% end -%> - <% @overlays.sort_by { |layer| layer[:name] }.each do |layer| -%> - // Add <%= layer[:name] %> to layer switcher - layers.addOverlay(L.tileLayer(<%= layer[:url].to_json %>, { - attribution: <%= layer[:attribution].to_json %>, - maxZoom: <%= layer[:maxZoom].to_json %> - }), <%= layer[:name].to_json %>); - - <% end -%> - // Add the layer switch to the mao - layers.addTo(map); - // Zoom to specified bounds - map.fitBounds(<%= @bbox.to_json %>); + // Add the permalink control + map.addControl(new L.Control.Permalink()); return map; }