Don't flag landuse=farm due to ambiguous upgrade path (re: #7520)

openstreetmap · Apr 28, 2020 · ce38374 · ce38374
1 parent 58fecfb
commit ce38374
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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"},