From: Tom Hughes Date: Sun, 17 Dec 2023 18:38:52 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/4409' X-Git-Tag: live~1396 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/33de240a7e472dd71e1823e44b43a6797e5b8258?hp=3c7e35ac32ee41b7f0a922d5d66d34350c5bcf50 Merge remote-tracking branch 'upstream/pull/4409' --- diff --git a/app/assets/images/key/cyclemap/pedestrian.svg b/app/assets/images/key/cyclemap/pedestrian.svg new file mode 100644 index 000000000..af8fce170 --- /dev/null +++ b/app/assets/images/key/cyclemap/pedestrian.svg @@ -0,0 +1,3 @@ + + + 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 f64ab8b37..ff19321ac 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 @@ -85,31 +85,32 @@ mapnik: - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png } - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png } cyclemap: - - { min_zoom: 0, max_zoom: 11, name: motorway, image: motorway.png } - - { min_zoom: 12, max_zoom: 19, name: motorway, image: motorway12.png } - - { min_zoom: 0, max_zoom: 11, name: trunk, image: trunk.png } - - { min_zoom: 12, max_zoom: 19, name: trunk, image: trunk12.png } - - { min_zoom: 7, max_zoom: 11, name: primary, image: primary.png } - - { min_zoom: 12, max_zoom: 19, name: primary, image: primary12.png } - - { min_zoom: 9, max_zoom: 11, name: secondary, image: secondary.png } - - { min_zoom: 12, max_zoom: 19, name: secondary, image: secondary12.png } - - { min_zoom: 13, max_zoom: 19, name: track, image: track.png } - - { min_zoom: 8, max_zoom: 19, name: cycleway, image: cycleway.png } - - { min_zoom: 5, max_zoom: 12, name: cycleway_national, image: cycleway_national.png } - - { min_zoom: 13, max_zoom: 19, name: cycleway_national, image: cycleway_national13.png } - - { min_zoom: 5, max_zoom: 12, name: cycleway_regional, image: cycleway_regional.png } - - { min_zoom: 13, max_zoom: 19, name: cycleway_regional, image: cycleway_regional13.png } - - { min_zoom: 8, max_zoom: 12, name: cycleway_local, image: cycleway_local.png } - - { min_zoom: 13, max_zoom: 19, name: cycleway_local, image: cycleway_local13.png } - - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png } - - { min_zoom: 7, max_zoom: 13, name: rail, image: rail.png } - - { min_zoom: 14, max_zoom: 19, name: rail, image: rail14.png } - - { min_zoom: 9, max_zoom: 19, name: forest, image: forest.png } - - { min_zoom: 10, max_zoom: 19, name: common, image: common.png } - - { min_zoom: 7, max_zoom: 19, name: lake, image: lake.png } - - { min_zoom: 14, max_zoom: 19, name: bicycle_shop, image: bicycle_shop.png } - - { min_zoom: 14, max_zoom: 19, name: bicycle_parking, image: bicycle_parking.png } - - { min_zoom: 16, max_zoom: 19, name: toilets, image: toilets.png } + - { min_zoom: 0, name: motorway, image: motorway.png } + - { min_zoom: 12, name: motorway, image: motorway12.png } + - { min_zoom: 0, name: trunk, image: trunk.png } + - { min_zoom: 12, name: trunk, image: trunk12.png } + - { min_zoom: 7, name: primary, image: primary.png } + - { min_zoom: 12, name: primary, image: primary12.png } + - { min_zoom: 9, name: secondary, image: secondary.png } + - { min_zoom: 12, name: secondary, image: secondary12.png } + - { min_zoom: 15, name: pedestrian, image: pedestrian.svg } + - { min_zoom: 13, name: track, image: track.png } + - { min_zoom: 8, name: cycleway, image: cycleway.png } + - { min_zoom: 5, name: cycleway_national, image: cycleway_national.png } + - { min_zoom: 13, name: cycleway_national, image: cycleway_national13.png } + - { min_zoom: 5, name: cycleway_regional, image: cycleway_regional.png } + - { min_zoom: 13, name: cycleway_regional, image: cycleway_regional13.png } + - { min_zoom: 8, name: cycleway_local, image: cycleway_local.png } + - { min_zoom: 13, name: cycleway_local, image: cycleway_local13.png } + - { min_zoom: 13, name: footway, image: footway.png } + - { min_zoom: 7, name: rail, image: rail.png } + - { min_zoom: 14, name: rail, image: rail14.png } + - { min_zoom: 9, name: forest, image: forest.png } + - { min_zoom: 10, name: common, image: common.png } + - { min_zoom: 7, name: lake, image: lake.png } + - { min_zoom: 14, name: bicycle_shop, image: bicycle_shop.png } + - { min_zoom: 14, name: bicycle_parking, image: bicycle_parking.png } + - { min_zoom: 16, name: toilets, image: toilets.png } opnvkarte: - { min_zoom: 6, name: rail, width: 52, height: 1, fill: "#868686" } - { min_zoom: 8, name: rail, width: 52, height: 2, fill: "#868686" } @@ -148,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 31563243a..18beafa13 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2282,6 +2282,7 @@ en: primary: "Primary road" secondary: "Secondary road" unclassified: "Unclassified road" + pedestrian: "Pedestrian way" track: "Track" bridleway: "Bridleway" cycleway: "Cycleway" @@ -2303,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 diff --git a/yarn.lock b/yarn.lock index 2eee9b212..f722b6a1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,10 +34,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.55.0": - version "8.55.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.55.0.tgz#b721d52060f369aa259cf97392403cb9ce892ec6" - integrity sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA== +"@eslint/js@8.56.0": + version "8.56.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" + integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== "@humanwhocodes/config-array@^0.11.13": version "0.11.13" @@ -229,14 +229,14 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint@^8.0.0: - version "8.55.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.55.0.tgz#078cb7b847d66f2c254ea1794fa395bf8e7e03f8" - integrity sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA== + version "8.56.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" + integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.55.0" + "@eslint/js" "8.56.0" "@humanwhocodes/config-array" "^0.11.13" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8"