From e4c6b4cc73570b4d9b4ea2ad9ef9b0747fab6b2b Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 15 Aug 2019 09:17:46 -0500 Subject: [PATCH] Deprecate landuse=garden (close #6758) Add landuse=flowerbed preset --- data/deprecated.json | 4 ++++ data/presets.yaml | 5 +++++ data/presets/presets.json | 1 + data/presets/presets/landuse/flowerbed.json | 21 +++++++++++++++++++++ data/taginfo.json | 2 ++ dist/locales/en.json | 4 ++++ 6 files changed, 37 insertions(+) create mode 100644 data/presets/presets/landuse/flowerbed.json diff --git a/data/deprecated.json b/data/deprecated.json index 67fa8a94d..9fa624847 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -451,6 +451,10 @@ "old": {"landuse": "field"}, "replace": {"landuse": "farmland"} }, + { + "old": {"landuse": "garden"}, + "replace": {"leisure": "garden"} + }, { "old": {"landuse": "pond"}, "replace": {"natural": "water", "water": "pond"} diff --git a/data/presets.yaml b/data/presets.yaml index a21f5aae4..bfbc0e0a6 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5036,6 +5036,11 @@ en: name: Farmyard # 'terms: crop,grow,plant' terms: '' + landuse/flowerbed: + # landuse=flowerbed + name: Flowerbed + # 'terms: floral garden,flower garden' + terms: '' landuse/forest: # landuse=forest name: Managed Forest diff --git a/data/presets/presets.json b/data/presets/presets.json index 34f2e3381..94540acbb 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -573,6 +573,7 @@ "landuse/construction": {"icon": "temaki-tools", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"}, "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"}, "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"}, + "landuse/flowerbed": {"icon": "maki-garden", "fields": ["operator"], "moreFields": ["address", "name"], "geometry": ["area"], "tags": {"landuse": "flowerbed"}, "terms": ["floral garden", "flower garden"], "name": "Flowerbed"}, "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree"], "name": "Managed Forest"}, "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"}, "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": [], "name": "Grass"}, diff --git a/data/presets/presets/landuse/flowerbed.json b/data/presets/presets/landuse/flowerbed.json new file mode 100644 index 000000000..304b4433c --- /dev/null +++ b/data/presets/presets/landuse/flowerbed.json @@ -0,0 +1,21 @@ +{ + "icon": "maki-garden", + "fields": [ + "operator" + ], + "moreFields": [ + "address", + "name" + ], + "geometry": [ + "area" + ], + "tags": { + "landuse": "flowerbed" + }, + "terms": [ + "floral garden", + "flower garden" + ], + "name": "Flowerbed" +} diff --git a/data/taginfo.json b/data/taginfo.json index 7cbff93a8..b46beebea 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -552,6 +552,7 @@ {"key": "landuse", "value": "construction", "description": "🄿 Construction", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"}, {"key": "landuse", "value": "farmland", "description": "🄿 Farmland", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-tractor.svg"}, {"key": "landuse", "value": "farmyard", "description": "🄿 Farmyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"}, + {"key": "landuse", "value": "flowerbed", "description": "🄿 Flowerbed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"}, {"key": "landuse", "value": "forest", "description": "🄿 Managed Forest", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"}, {"key": "landuse", "value": "garages", "description": "🄿 Garage Landuse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"}, {"key": "landuse", "value": "greenfield", "description": "🄿 Greenfield", "object_types": ["area"]}, @@ -1915,6 +1916,7 @@ {"key": "kerb", "value": "flat", "description": "🄳 ➜ kerb=flush"}, {"key": "landuse", "value": "conservation", "description": "🄳 ➜ boundary=protected_area"}, {"key": "landuse", "value": "field", "description": "🄳 ➜ landuse=farmland"}, + {"key": "landuse", "value": "garden", "description": "🄳 ➜ leisure=garden"}, {"key": "landuse", "value": "port", "description": "🄳 ➜ landuse=industrial + industrial=port"}, {"key": "landuse", "value": "wood", "description": "🄳 ➜ natural=wood"}, {"key": "leisure", "value": "beach", "description": "🄳 ➜ natural=beach"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index ba293c22b..581a6a824 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7100,6 +7100,10 @@ "name": "Farmyard", "terms": "crop,grow,plant" }, + "landuse/flowerbed": { + "name": "Flowerbed", + "terms": "floral garden,flower garden" + }, "landuse/forest": { "name": "Managed Forest", "terms": "cut,forest,forestry,lumber,silviculture,tree"