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

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/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index b9050d8a12a01a95f5678841fc57c31c6aad8d10..a953920f895d8fe62cefafdd3927f90f040ea62d 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -58,7 +58,6 @@ OSM.Export = function (map) {
   }
 
   page.pushstate = page.popstate = function (path) {
-    $("#export_tab").addClass("current");
     OSM.loadSidebarContent(path, page.load);
   };
 
@@ -79,8 +78,6 @@ OSM.Export = function (map) {
     map
       .removeLayer(locationFilter)
       .off("moveend", update);
-
-    $("#export_tab").removeClass("current");
   };
 
   return page;

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index e8d912685f0aae2b73808ed2b339947043838ccf..c6ba0c2edc9831853eedfec9f533531d71d5f341 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -146,7 +146,6 @@ OSM.History = function (map) {
   }
 
   page.pushstate = page.popstate = function (path) {
-    $("#history_tab").addClass("current");
     OSM.loadSidebarContent(path, page.load);
   };
 
@@ -165,8 +164,6 @@ OSM.History = function (map) {
   page.unload = function () {
     map.removeLayer(group);
     map.off("moveend", update);
-
-    $("#history_tab").removeClass("current");
   };
 
   return page;

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 55f37782da4fa8ce6ec8aa9c7b4572b45ae7aa5c..e9ded0f75c7f68cda1aec81000512bbf5e9c4d01 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -9,7 +9,7 @@
   <nav class='primary'>
     <%= content_for :header %>
     <div class="btn-group">
-      <div id="edit_tab" class="btn-group <%= current_page_class(edit_path) %>">
+      <div id="edit_tab" class="btn-group">
         <%= link_to t("layouts.edit"),
                     edit_path,
                     :class => "btn btn-outline-primary geolink editlink",
@@ -27,8 +27,8 @@
           <% end %>
         </ul>
       </div>
-      <%= link_to t("layouts.history"), history_path, :class => "btn btn-outline-primary geolink flex-grow-1 current_page_class(history_path)", :id => "history_tab" %>
-      <%= link_to t("layouts.export"), export_path, :class => "btn btn-outline-primary geolink current_page_class(export_path)", :id => "export_tab" %>
+      <%= link_to t("layouts.history"), history_path, :class => "btn btn-outline-primary geolink flex-grow-1", :id => "history_tab" %>
+      <%= link_to t("layouts.export"), export_path, :class => "btn btn-outline-primary geolink", :id => "export_tab" %>
     </div>
   </nav>
   <nav class='secondary'>

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 }