X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1531b1dad652db402fbf1618d059c8533319e312..90a3375388fe240c52a7d2eff72d78e07f99a52c:/cookbooks/imagery/templates/default/imagery.js.erb

diff --git a/cookbooks/imagery/templates/default/imagery.js.erb b/cookbooks/imagery/templates/default/imagery.js.erb
index a5ac8f42a..713aa03bd 100644
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -1,37 +1,46 @@
 function createMap(divName) {
   // Create a map
-  var map = L.map(divName);
+  var map = L.map(divName, {
+    worldCopyJump: true
+  }).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: "© <a target=\"_parent\" href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"http://www.openstreetmap.org/copyright\">open license</a>",
+  layers.addBaseLayer(L.tileLayer("https://tile.openstreetmap.org/{z}/{x}/{y}.png", {
+    attribution: "© <a target=\"_parent\" href=\"https://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"https://www.openstreetmap.org/copyright\">open license</a>",
     maxZoom: 19
   }), "OpenStreetMap");
+  <% @layers.sort_by { |layer| layer[:name] }.each do |layer| -%>
 
-  <% @layers.each do |layer| -%>
-  // Add <%= layer[:name].to_json %> layer
-  layers.addBaseLayer(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 %>
-  }), <%= layer[:name].to_json %>);
+  });
 
+  // Add <%= layer[:name] %> to layer switcher
+  <% if layer[:overlay] -%>
+  layers.addOverlay(<%= layer[:name] %>, <%= layer[:title].to_json %>);
+  <% else %>
+  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);
   <% end -%>
-  <% @overlays.each do |layer| -%>
-  // Add <%= layer[:name].to_json %> layer
-  layers.addOverlay(L.tileLayer(<%= layer[:url].to_json %>, {
-    attribution: <%= layer[:attribution].to_json %>,
-    maxZoom: <%= layer[:maxZoom].to_json %>
-  }), <%= layer[:name].to_json %>);
 
+  <% if layer[:default] -%>
+  // Add <%= layer[:name] %> to map
+  <%= layer[:name] %>.addTo(map);
   <% end -%>
-  // Add the layer switch to the mao
-  layers.addTo(map);
+  <% end -%>
+
+  // Add the permalink control
+  map.addControl(new L.Control.Permalink());
 
-  // Zoom to specified bounds
-  map.fitBounds(<%= @bbox.to_json %>);
+  var lc = L.control.locate({
+    position: 'topright',
+    icon: '/location-arrow-solid.svg',
+    iconLoading: '/spinner-solid.svg'
+  }).addTo(map);
 
   return map;
 }