Merge remote-tracking branch 'upstream/pull/4581'

[rails.git] / app / views / site / key.html.erb

diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb
index 608932b3e4b20bd282692e66baf8500afc48a184..82105097e7b409eaffc16f7e1a9bb8f5e25f2784 100644 (file)
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -4,14 +4,14 @@
       <% layer_data.each do |entry| %>
         <%= tag.tr :class => "mapkey-table-entry", :data => { :layer => layer_name, :zoom_min => entry["min_zoom"], :zoom_max => entry["max_zoom"] } do %>
           <td>
       <% layer_data.each do |entry| %>
         <%= tag.tr :class => "mapkey-table-entry", :data => { :layer => layer_name, :zoom_min => entry["min_zoom"], :zoom_max => entry["max_zoom"] } do %>
           <td>

-            <% if entry["width"] && entry["height"] && entry["fill"] %>
-              <%= image_tag "data:image/svg+xml,#{u("<svg xmlns='http://www.w3.org/2000/svg' width='#{entry['width']}' height='#{entry['height']}'><rect width='100%' height='100%' fill='#{entry['fill']}' /></svg>")}", :class => "d-block mx-auto" %>
-            <% else %>
+            <% if entry["image"] %>

               <%= image_tag "key/#{layer_name}/#{entry['image']}", :class => "d-block mx-auto" %>
               <%= image_tag "key/#{layer_name}/#{entry['image']}", :class => "d-block mx-auto" %>

+            <% else %>
+              <%= key_svg_tag :class => "d-block mx-auto", **entry %>

             <% end %>
           </td>
           <td>
             <% end %>
           </td>
           <td>

-            <%= Array(t(".table.entry.#{entry['name']}")).to_sentence %>
+            <%= entry["name"].map { |feature_name| t ".table.entry.#{feature_name}" }.join(" · ") %>

           </td>
         <% end %>
       <% end %>
           </td>
         <% end %>
       <% end %>