From ce38374807e72fadcf4a52002d6d0f8a202a3da7 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 28 Apr 2020 12:39:15 -0700 Subject: [PATCH] Don't flag landuse=farm due to ambiguous upgrade path (re: #7520) --- data/deprecated.json | 4 ---- data/taginfo.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/data/deprecated.json b/data/deprecated.json index 124f974808..de635d72a4 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -622,10 +622,6 @@ "old": {"landuse": "conservation"}, "replace": {"boundary": "protected_area"} }, - { - "old": {"landuse": "farm"}, - "replace": {"landuse": "farmland"} - }, { "old": {"landuse": "field"}, "replace": {"landuse": "farmland"} diff --git a/data/taginfo.json b/data/taginfo.json index 7a076b9ea3..9a4143e0f7 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -586,7 +586,7 @@ {"key": "junction", "value": "yes", "description": "🄿 Junction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junction.svg"}, {"key": "landuse", "value": "basin", "description": "🄿 Basin (unsearchable), 🄳 ➜ natural=water + water=basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, {"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"}, - {"key": "landuse", "value": "farm", "description": "🄿 Farmland (unsearchable), 🄳 ➜ landuse=farmland", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"}, + {"key": "landuse", "value": "farm", "description": "🄿 Farmland (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"}, {"key": "landuse", "value": "pond", "description": "🄿 Pond (unsearchable), 🄳 ➜ natural=water + water=pond", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, {"key": "landuse", "value": "reservoir", "description": "🄿 Reservoir (unsearchable), 🄳 ➜ natural=water + water=reservoir", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, {"key": "landuse", "value": "allotments", "description": "🄿 Garden Allotments", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"},