From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Dec 2023 17:54:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4391'
X-Git-Tag: live~1404
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d303b4f6e94e99546d8c7bb8b7302572d1cbd5c6?hp=367fa44a74c06563b6f0e23c1e9db888769f57f0

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

diff --git a/app/assets/images/key/mapnik/lake.png b/app/assets/images/key/mapnik/lake.png
deleted file mode 100644
index 3f16b54d1..000000000
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 b9050d8a1..a953920f8 100644
--- 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 e8d912685..c6ba0c2ed 100644
--- 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 55f37782d..e9ded0f75 100644
--- 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 949121d96..da7638948 100644
--- 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 c85ec0d4a..2d1cf97a0 100644
--- 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 }
diff --git a/db/structure.sql b/db/structure.sql
index 4297d96f1..ba60918f0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -16,6 +16,13 @@ SET row_security = off;
 CREATE EXTENSION IF NOT EXISTS btree_gist WITH SCHEMA public;
 
 
+--
+-- Name: EXTENSION btree_gist; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION btree_gist IS 'support for indexing common datatypes in GiST';
+
+
 --
 -- Name: format_enum; Type: TYPE; Schema: public; Owner: -
 --
diff --git a/script/normalise-structure b/script/normalise-structure
index 24b8f64e8..18ba81431 100644
--- a/script/normalise-structure
+++ b/script/normalise-structure
@@ -1,13 +1,5 @@
 /^$/d
 /^--/d
-/^CREATE EXTENSION IF NOT EXISTS plpgsql /d
-/^COMMENT ON EXTENSION plpgsql /d
-/^COMMENT ON EXTENSION btree_gist /d
 /^SET default_with_oids /d
 /^SET default_table_access_method /d
 /^SET idle_in_transaction_session_timeout /d
-/^    AS integer$/d
-
-s/ IMMUTABLE / /
-
-s/ timestamp(6) / timestamp /