diff --git a/CHANGELOG.md b/CHANGELOG.md index b235a73b7..9fa557254 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -154,6 +154,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, * Add Loading Dock preset ([#6849]) * Add Utility Pole preset ([#6848]) * Add Karting Racetrack and Motocross Racetrack presets ([#6826]) +* Add Noise Barrier preset ([#6949]) * Add presets: Spaceport, Hot Dog Fast Food, Recording Studio, Film Studio, Radio Station, Television Station, Truck Scale, City Hall * Add Type and Material fields to the Stile preset ([#6857], thanks [@ewnh]) * Add Waste field to relevant presets ([#6821]) @@ -174,6 +175,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, * Render Construction landuse preset with a yellow icon * Improve searchability of cycle presets in English ([#6825]) +[#6949]: https://github.com/openstreetmap/iD/issues/6949 [#6863]: https://github.com/openstreetmap/iD/issues/6863 [#6849]: https://github.com/openstreetmap/iD/issues/6849 [#6848]: https://github.com/openstreetmap/iD/issues/6848 diff --git a/data/deprecated.json b/data/deprecated.json index 1a17d8c00..f6c6d23c7 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -184,6 +184,10 @@ "old": {"barrier": "embankment"}, "replace": {"man_made": "embankment"} }, + { + "old": {"barrier": "wall", "type": "noise_barrier"}, + "replace": {"barrier": "wall", "wall": "noise_barrier"} + }, { "old": {"barrier": "wire_fence"}, "replace": {"barrier": "fence", "fence_type": "wire"} @@ -1049,6 +1053,10 @@ "old": {"unnamed": "*"}, "replace": {"noname": "$1"} }, + { + "old": {"wall_type": "noise_barrier"}, + "replace": {"wall": "noise_barrier"} + }, { "old": {"water": "intermittent"}, "replace": {"natural": "water", "intermittent": "yes"} diff --git a/data/presets.yaml b/data/presets.yaml index 81aa076ee..a6e5503a7 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3960,6 +3960,11 @@ en: # barrier=wall name: Wall terms: '' + barrier/wall/noise_barrier: + # 'barrier=wall, wall=noise_barrier' + name: Noise Barrier + # 'terms: acoustical barrier,noise wall,noisewall,sound barrier,sound berm,sound wall,soundberm,soundwall' + terms: '' boundary: # boundary=* name: Boundary diff --git a/data/presets/presets.json b/data/presets/presets.json index 73ffa03cb..4b2b7c5ff 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -313,6 +313,7 @@ "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "email", "fax", "opening_hours", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, "barrier/turnstile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"}, "barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25}, + "barrier/wall/noise_barrier": {"icon": "temaki-wall", "geometry": ["line", "area"], "tags": {"barrier": "wall", "wall": "noise_barrier"}, "terms": ["acoustical barrier", "noise wall", "noisewall", "sound barrier", "sound berm", "sound wall", "soundberm", "soundwall"], "name": "Noise Barrier", "matchScore": 0.27}, "boundary/administrative": {"fields": ["name", "admin_level"], "geometry": ["line"], "tags": {"boundary": "administrative"}, "name": "Administrative Boundary", "matchScore": 0.5}, "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support", "height", "layer", "material"], "moreFields": ["colour", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"}, "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support", "{bridge/support}"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"}, diff --git a/data/presets/presets/barrier/wall/noise_barrier.json b/data/presets/presets/barrier/wall/noise_barrier.json new file mode 100644 index 000000000..5f8b0134a --- /dev/null +++ b/data/presets/presets/barrier/wall/noise_barrier.json @@ -0,0 +1,23 @@ +{ + "icon": "temaki-wall", + "geometry": [ + "line", + "area" + ], + "tags": { + "barrier": "wall", + "wall": "noise_barrier" + }, + "terms": [ + "acoustical barrier", + "noise wall", + "noisewall", + "sound barrier", + "sound berm", + "sound wall", + "soundberm", + "soundwall" + ], + "name": "Noise Barrier", + "matchScore": 0.27 +} diff --git a/data/taginfo.json b/data/taginfo.json index 0921448be..fc4fc82f6 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -309,6 +309,7 @@ {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, {"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"}, + {"key": "wall", "value": "noise_barrier", "description": "🄿 Noise Barrier", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"}, {"key": "boundary", "value": "administrative", "description": "🄿 Administrative Boundary", "object_types": ["way"]}, {"key": "bridge:support", "description": "🄿 Bridge Support, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-archway.svg"}, {"key": "bridge:support", "value": "pier", "description": "🄿 Bridge Pier", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-archway.svg"}, @@ -2088,6 +2089,7 @@ {"key": "type", "value": "conifer", "description": "🄳 ➜ leaf_type=needleleaved"}, {"key": "type", "value": "deciduous", "description": "🄳 ➜ leaf_cycle=deciduous"}, {"key": "unnamed", "description": "🄳 ➜ noname=*"}, + {"key": "wall_type", "value": "noise_barrier", "description": "🄳 ➜ wall=noise_barrier"}, {"key": "water", "value": "intermittent", "description": "🄳 ➜ natural=water + intermittent=yes"}, {"key": "water", "value": "riverbank", "description": "🄳 ➜ natural=water + water=river"}, {"key": "water", "value": "salt", "description": "🄳 ➜ natural=water + salt=yes"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 740fe2640..916c9c353 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6187,6 +6187,10 @@ "name": "Wall", "terms": "" }, + "barrier/wall/noise_barrier": { + "name": "Noise Barrier", + "terms": "acoustical barrier,noise wall,noisewall,sound barrier,sound berm,sound wall,soundberm,soundwall" + }, "boundary/administrative": { "name": "Administrative Boundary", "terms": ""