From: Tom Hughes Date: Fri, 15 Dec 2023 17:35:15 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/4410' X-Git-Tag: live~1381 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/08b44b0f8fc68070f5dd3e891ff800608f79a4df?hp=300b773291d30e2dac2718a89a0b2909675a00db Merge remote-tracking branch 'upstream/pull/4410' --- diff --git a/app/assets/images/key/mapnik/apron.png b/app/assets/images/key/mapnik/apron.png deleted file mode 100644 index bcea5e3fb..000000000 Binary files a/app/assets/images/key/mapnik/apron.png and /dev/null differ diff --git a/app/assets/images/key/opnvkarte/main_road11.svg b/app/assets/images/key/opnvkarte/main_road11.svg new file mode 100644 index 000000000..b03c74414 --- /dev/null +++ b/app/assets/images/key/opnvkarte/main_road11.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/opnvkarte/main_road13.svg b/app/assets/images/key/opnvkarte/main_road13.svg new file mode 100644 index 000000000..2d5902236 --- /dev/null +++ b/app/assets/images/key/opnvkarte/main_road13.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/opnvkarte/main_road15.svg b/app/assets/images/key/opnvkarte/main_road15.svg new file mode 100644 index 000000000..cb5391648 --- /dev/null +++ b/app/assets/images/key/opnvkarte/main_road15.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/opnvkarte/main_road17.svg b/app/assets/images/key/opnvkarte/main_road17.svg new file mode 100644 index 000000000..de7db0f17 --- /dev/null +++ b/app/assets/images/key/opnvkarte/main_road17.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/opnvkarte/motorway13.svg b/app/assets/images/key/opnvkarte/motorway13.svg new file mode 100644 index 000000000..c44e777a2 --- /dev/null +++ b/app/assets/images/key/opnvkarte/motorway13.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/opnvkarte/motorway15.svg b/app/assets/images/key/opnvkarte/motorway15.svg new file mode 100644 index 000000000..c217bb2a7 --- /dev/null +++ b/app/assets/images/key/opnvkarte/motorway15.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/images/key/opnvkarte/motorway17.svg b/app/assets/images/key/opnvkarte/motorway17.svg new file mode 100644 index 000000000..36b37db59 --- /dev/null +++ b/app/assets/images/key/opnvkarte/motorway17.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/images/key/opnvkarte/motorway8.svg b/app/assets/images/key/opnvkarte/motorway8.svg new file mode 100644 index 000000000..21f006cef --- /dev/null +++ b/app/assets/images/key/opnvkarte/motorway8.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/helpers/browse_tags_helper.rb b/app/helpers/browse_tags_helper.rb index 014b8262d..1bda7dcb7 100644 --- 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 42cd40c20..f099a5f47 100644 --- 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 @@ -149,3 +149,12 @@ opnvkarte: - { min_zoom: 15, name: bus_stop, image: bus_stop15.svg } - { min_zoom: 13, name: stop, image: stop13.svg } - { min_zoom: 15, name: stop, image: stop15.svg } + - { min_zoom: 8, name: motorway, image: motorway8.svg } + - { min_zoom: 13, name: motorway, image: motorway13.svg } + - { min_zoom: 15, name: motorway, image: motorway15.svg } + - { min_zoom: 17, name: motorway, image: motorway17.svg } + - { min_zoom: 8, name: main_road, width: 52, height: 1, fill: "#5c6d6d88" } + - { min_zoom: 11, name: main_road, image: main_road11.svg } + - { min_zoom: 13, name: main_road, image: main_road13.svg } + - { min_zoom: 15, name: main_road, image: main_road15.svg } + - { min_zoom: 17, name: main_road, image: main_road17.svg } diff --git a/config/locales/en.yml b/config/locales/en.yml index c074ad8f2..18beafa13 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2304,9 +2304,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 0af0d9310..0786af61d 100644 --- 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'Amigo", html