Use inline svg for solid map key images

diff --git a/app/helpers/svg_helper.rb b/app/helpers/svg_helper.rb
index f2e02f7422cc37126900918174c60d51aae5eb93..abb512f0d3c60cba5eae288cf03d1b4a77fce1bc 100644 (file)
--- a/app/helpers/svg_helper.rb
+++ b/app/helpers/svg_helper.rb
@@ -1,8 +1,7 @@
 module SvgHelper
 module SvgHelper

-  def solid_svg_image_tag(width, height, fill, **options)
-    svg = "<svg xmlns='http://www.w3.org/2000/svg' width='#{width}' height='#{height}'>" \
-          "<rect width='100%' height='100%' fill='#{fill}' />" \
-          "</svg>"
-    image_tag "data:image/svg+xml,#{u(svg)}", **options
+  def solid_svg_tag(width, height, fill, **options)
+    tag.svg :width => width, :height => height, **options do
+      tag.rect :width => "100%", :height => "100%", :fill => fill
+    end

   end
 end
   end
 end

diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb
index ddb3cbbefe8cfa8ef69ebaddc291c93a2610b4d3..8b61b92bfa5077d8ab726db9ab361876c261761c 100644 (file)
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -5,7 +5,7 @@
         <%= 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"] %>
         <%= 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"] %>

-              <%= solid_svg_image_tag entry["width"], entry["height"], entry["fill"], :class => "d-block mx-auto" %>
+              <%= solid_svg_tag entry["width"], entry["height"], entry["fill"], :class => "d-block mx-auto" %>

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