X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1531b1dad652db402fbf1618d059c8533319e312..fec6863727052589874a8727fb0cfd2f9cd2ef50:/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 a5ac8f42a..58e9b0fea 100644
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -11,20 +11,27 @@ function createMap(divName) {
     maxZoom: 19
   }), "OpenStreetMap");
 
-  <% @layers.each do |layer| -%>
-  // Add <%= layer[:name].to_json %> layer
-  layers.addBaseLayer(L.tileLayer(<%= layer[:url].to_json %>, {
+  <% @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 %>,
     maxZoom: <%= layer[:maxZoom].to_json %>
-  }), <%= layer[:name].to_json %>);
+  });
 
+  // Add <%= layer[:name] %> to layer switcher
+  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);
+
+  <% if layer[:default] -%>
+  // Add <%= layer[:name] %> to map
+  <%= layer[:name] %>.addTo(map);
+  <% end -%>
   <% end -%>
-  <% @overlays.each do |layer| -%>
-  // Add <%= layer[:name].to_json %> layer
+  <% @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 %>);
+  }), <%= layer[:title].to_json %>);
 
   <% end -%>
   // Add the layer switch to the mao