From 6d126e1243f26e5070333f4bc7b7bd98783872b3 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 27 Mar 2024 17:25:09 +0000 Subject: [PATCH] imagery: escape layer name in js --- cookbooks/imagery/templates/default/imagery.js.erb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cookbooks/imagery/templates/default/imagery.js.erb b/cookbooks/imagery/templates/default/imagery.js.erb index e29d86342..e5c289cfd 100644 --- a/cookbooks/imagery/templates/default/imagery.js.erb +++ b/cookbooks/imagery/templates/default/imagery.js.erb @@ -1,3 +1,4 @@ +<% require 'uri' %> function createMap(divName) { // Create a map var map = L.map(divName, { @@ -15,21 +16,21 @@ function createMap(divName) { <% @layers.sort_by { |layer| layer[:name] }.each do |layer| -%> // Create <%= layer[:name] %> layer - var <%= layer[:name] %> = L.tileLayer(<%= layer[:url].to_json %>, { + var <%= layer[:name].gsub("-", "_") %> = L.tileLayer(<%= layer[:url].to_json %>, { attribution: <%= layer[:attribution].to_json %>, maxZoom: <%= layer[:maxZoom].to_json %> }); // Add <%= layer[:name] %> to layer switcher <% if layer[:overlay] -%> - layers.addOverlay(<%= layer[:name] %>, <%= layer[:title].to_json %>); + layers.addOverlay(<%= layer[:name].gsub("-", "_") %>, <%= layer[:title].to_json %>); <% else %> - layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>); + layers.addBaseLayer(<%= layer[:name].gsub("-", "_") %>, <%= layer[:title].to_json %>); <% end -%> <% if layer[:default] -%> // Add <%= layer[:name] %> to map - <%= layer[:name] %>.addTo(map); + <%= layer[:name].gsub("-", "_") %>.addTo(map); <% end -%> <% end -%> -- 2.45.1