X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c622106f2aae13e82e096dee5512b9ba68311456..864d5dd378e3abaceec0119861696aa99f5d5628:/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 e40950e6e..0f277444b 100644
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -2,50 +2,37 @@ function createMap(divName) {
// Create a map
var map = L.map(divName).fitBounds(<%= @bbox.to_json %>);
- // Create layer and overlays variables
- var leaflet_layers = {}
- var leaflet_overlays = {}
+ // Create a layer switcher
+ var layers = L.control.layers(null, null, {collapsed:false}).addTo(map);
// Add OpenStreetMap layer
- leaflet_layers["OpenStreetMap"] = 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| -%>
- <% if layer[:overlay] -%>
- // Create <%= layer[:name] %> overlay
- leaflet_overlays["<%= layer[:name] %>"] = L.tileLayer(<%= layer[:url].to_json %>, {
+ // Create <%= layer[:name] %> layer
+ var <%= layer[:name] %> = L.tileLayer(<%= layer[:url].to_json %>, {
attribution: <%= layer[:attribution].to_json %>,
maxZoom: <%= layer[:maxZoom].to_json %>
});
- <% if layer[:default] -%>
- // Add <%= layer[:name] %> to map
- leaflet_overlays["<%= layer[:name] %>"].addTo(map);
- <% end -%>
-
+ // Add <%= layer[:name] %> to layer switcher
+ <% if layer[:overlay] -%>
+ layers.addOverlay(<%= layer[:name] %>, <%= layer[:title].to_json %>);
<% else %>
- // Create <%= layer[:name] %> layer
- leaflet_layers["<%= layer[:name] %>"] = L.tileLayer(<%= layer[:url].to_json %>, {
- attribution: <%= layer[:attribution].to_json %>,
- maxZoom: <%= layer[:maxZoom].to_json %>
- });
+ layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);
+ <% end -%>
<% if layer[:default] -%>
// Add <%= layer[:name] %> to map
- leaflet_layers["<%= layer[:name] %>"].addTo(map);
- <% end -%>
-
+ <%= layer[:name] %>.addTo(map);
<% end -%>
<% end -%>
- // Create a layer switcher
- var layers = L.control.layers(leaflet_layers, leaflet_overlays, {collapsed:false});
+ // Add the permalink control
+ map.addControl(new L.Control.Permalink());
- // Add the layer switch to the mao
- layers.addTo(map);
- map.addControl(new L.Control.Permalink({text: 'Permalink', layers: leaflet_layers, overlays: leaflet_overlays}));
return map;
}