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

diff --git a/app/assets/images/key/mapnik/lake.png b/app/assets/images/key/mapnik/lake.png
deleted file mode 100644 (file)
index 3f16b54..0000000
Binary files a/app/assets/images/key/mapnik/lake.png and /dev/null differ

diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb
index 949121d96f2f64aae1b325d473bbde2f59baa6db..da76389481088141ae44aa42295c2365270b1034 100644 (file)
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -4,7 +4,11 @@
       <% data.each do |entry| %>
         <tr class="mapkey-table-entry" data-layer="<%= name %>" data-zoom-min="<%= entry["min_zoom"] %>" data-zoom-max="<%= entry["max_zoom"] %>">
           <td class="mapkey-table-key align-middle">
-            <%= image_tag "key/#{name}/#{entry['image']}" %>
+            <% 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>")}" %>
+            <% else %>
+              <%= image_tag "key/#{name}/#{entry['image']}" %>
+            <% end %>
           </td>
           <td class="mapkey-table-value">
             <%= Array(t(".table.entry.#{entry['name']}")).to_sentence %>

diff --git a/config/key.yml b/config/key.yml
index c85ec0d4a1e80ffdcf5708937d957b0300080a1a..2d1cf97a026594f297ff89cf8f16928828359ed4 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -25,7 +25,7 @@ mapnik:
   - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png }
   - { min_zoom: 10, max_zoom: 19, name: commercial, image: commercial.png }
   - { min_zoom: 10, max_zoom: 19, name: heathland, image: heathland.png }
-  - { min_zoom: 0, max_zoom: 19, name: lake, image: lake.png }
+  - { min_zoom: 0, max_zoom: 19, name: lake, width: 26, height: 10, fill: "#aad3df" }
   - { min_zoom: 10, max_zoom: 19, name: farm, image: farm.png }
   - { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png }
   - { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png }