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

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

diff --git a/app/helpers/browse_tags_helper.rb b/app/helpers/browse_tags_helper.rb
index 014b8262d050b947de09416b15a8020191f0bb26..1bda7dcb7ac8cd08c3f760e132a9faad3c3eb05a 100644 (file)
--- a/app/helpers/browse_tags_helper.rb
+++ b/app/helpers/browse_tags_helper.rb
@@ -36,7 +36,7 @@ module BrowseTagsHelper
     elsif colour_value = colour_preview(key, value)
       tag.span("", :class => "colour-preview-box float-end m-1 border border-dark border-opacity-10", :"data-colour" => colour_value, :title => t("browse.tag_details.colour_preview", :colour_value => colour_value)) + colour_value
     else
-      safe_join(value.split(";").map { |x| linkify(h(x)) }, ";")
+      safe_join(value.split(";", -1).map { |x| linkify(h(x)) }, ";")
     end
   end
 

diff --git a/config/key.yml b/config/key.yml
index 114a623df9d0cf7ceb8ddc0e74d9994b984812b0..c524a9098d042e73c4e66dc48e563e57f7307233 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -21,7 +21,7 @@ mapnik:
   - { min_zoom: 17, name: tram_only, width: 52, height: 2, fill: "#6e6e6e" }
   - { min_zoom: 12, max_zoom: 19, name: cable, image: cable.png }
   - { min_zoom: 11, max_zoom: 19, name: runway, image: runway.png }
-  - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png }
+  - { min_zoom: 11, name: apron_only, width: 26, height: 10, fill: "#dadae0" } # landcover.mss
   # administrative boundaries: admin.mss
   - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
   # landcover z5: landcover.mss, water.mss

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 31563243ad0f209cfa4027c28e6af392ad39ce51..c06ff3cebdfe40c6151e102c99779d6e7e734d77 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2303,9 +2303,7 @@ en:
           runway:
             - Airport Runway
             - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          apron_only: "Airport apron"
           admin: "Administrative boundary"
           orchard:
             - Orchard

diff --git a/test/helpers/browse_tags_helper_test.rb b/test/helpers/browse_tags_helper_test.rb
index 0af0d931018ee7c25928f80ad4ac6f025cb0cb1a..0786af61da03c6952a9b811849934ae371b0edf8 100644 (file)
--- a/test/helpers/browse_tags_helper_test.rb
+++ b/test/helpers/browse_tags_helper_test.rb
@@ -22,6 +22,12 @@ class BrowseTagsHelperTest < ActionView::TestCase
     html = format_value("unknown", "unknown")
     assert_dom_equal "unknown", html
 
+    html = format_value("unknown", "abc;def")
+    assert_dom_equal "abc;def", html
+
+    html = format_value("unknown", "foo;")
+    assert_dom_equal "foo;", html
+
     html = format_value("addr:street", "Rue de l'Amigo")
     assert_dom_equal "Rue de l&#39;Amigo", html