cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2023-12-06 17:47:14 +00:00
commit 77797b21b0
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/key/mapnik/lake.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 112 B

4
app/views/site/key.html.erb
View file

@ -4,7 +4,11 @@
<% data.each do |entry| %> <% data.each do |entry| %>
<tr class="mapkey-table-entry" data-layer="<%= name %>" data-zoom-min="<%= entry["min_zoom"] %>" data-zoom-max="<%= entry["max_zoom"] %>"> <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"> <td class="mapkey-table-key align-middle">
<% 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']}" %> <%= image_tag "key/#{name}/#{entry['image']}" %>
<% end %>
</td> </td>
<td class="mapkey-table-value"> <td class="mapkey-table-value">
<%= Array(t(".table.entry.#{entry['name']}")).to_sentence %> <%= Array(t(".table.entry.#{entry['name']}")).to_sentence %>

2
config/key.yml
View file

@ -25,7 +25,7 @@ mapnik:
- { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png } - { 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: commercial, image: commercial.png }
- { min_zoom: 10, max_zoom: 19, name: heathland, image: heathland.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: farm, image: farm.png }
- { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png } - { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png }
- { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png } - { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png }