From 487130329d76d3382edcc03ce600ba8da77f9aa8 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Tue, 3 Feb 2015 11:12:44 -0500
Subject: [PATCH] Updates to landuse presets (closes #2518)

* Do not support `landuse=*` on nodes anymore
* Add "Area" to description for `residential`, `commercial`, `industrial`, `retail`
---
 data/presets.yaml                             | 24 +++++------
 data/presets/presets.json                     | 41 ++++++-------------
 data/presets/presets/landuse/allotments.json  |  3 +-
 data/presets/presets/landuse/basin.json       |  3 +-
 data/presets/presets/landuse/cemetery.json    |  2 -
 data/presets/presets/landuse/commercial.json  |  5 +--
 .../presets/presets/landuse/construction.json |  3 +-
 data/presets/presets/landuse/farm.json        |  2 +-
 data/presets/presets/landuse/farmland.json    |  5 +--
 data/presets/presets/landuse/farmyard.json    |  5 +--
 data/presets/presets/landuse/forest.json      |  1 -
 data/presets/presets/landuse/garages.json     |  3 +-
 data/presets/presets/landuse/grass.json       |  3 +-
 data/presets/presets/landuse/industrial.json  |  5 +--
 data/presets/presets/landuse/meadow.json      |  3 +-
 data/presets/presets/landuse/military.json    |  4 +-
 data/presets/presets/landuse/orchard.json     |  5 +--
 data/presets/presets/landuse/quarry.json      |  3 +-
 data/presets/presets/landuse/residential.json |  5 +--
 data/presets/presets/landuse/retail.json      |  5 +--
 data/presets/presets/landuse/vineyard.json    |  3 +-
 dist/locales/en.json                          | 12 +++---
 22 files changed, 55 insertions(+), 90 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index dbed94716..390853ba4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1394,8 +1394,8 @@ en:
         name: Churchyard
         terms: "<translate with synonyms or related terms for 'Churchyard', separated by commas>"
       landuse/commercial:
-        name: Commercial
-        terms: "<translate with synonyms or related terms for 'Commercial', separated by commas>"
+        name: Commercial Area
+        terms: "<translate with synonyms or related terms for 'Commercial Area', separated by commas>"
       landuse/construction:
         name: Construction
         terms: "<translate with synonyms or related terms for 'Construction', separated by commas>"
@@ -1403,8 +1403,8 @@ en:
         name: Farm
         terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
       landuse/farmland:
-        name: Farm
-        terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
+        name: Farmland
+        terms: "<translate with synonyms or related terms for 'Farmland', separated by commas>"
       landuse/farmyard:
         name: Farmyard
         terms: "<translate with synonyms or related terms for 'Farmyard', separated by commas>"
@@ -1418,8 +1418,8 @@ en:
         name: Grass
         terms: "<translate with synonyms or related terms for 'Grass', separated by commas>"
       landuse/industrial:
-        name: Industrial
-        terms: "<translate with synonyms or related terms for 'Industrial', separated by commas>"
+        name: Industrial Area
+        terms: "<translate with synonyms or related terms for 'Industrial Area', separated by commas>"
       landuse/landfill:
         name: Landfill
         terms: "<translate with synonyms or related terms for 'Landfill', separated by commas>"
@@ -1427,8 +1427,8 @@ en:
         name: Meadow
         terms: "<translate with synonyms or related terms for 'Meadow', separated by commas>"
       landuse/military:
-        name: Military
-        terms: "<translate with synonyms or related terms for 'Military', separated by commas>"
+        name: Military Area
+        terms: "<translate with synonyms or related terms for 'Military Area', separated by commas>"
       landuse/orchard:
         name: Orchard
         terms: "<translate with synonyms or related terms for 'Orchard', separated by commas>"
@@ -1436,11 +1436,11 @@ en:
         name: Quarry
         terms: "<translate with synonyms or related terms for 'Quarry', separated by commas>"
       landuse/residential:
-        name: Residential
-        terms: "<translate with synonyms or related terms for 'Residential', separated by commas>"
+        name: Residential Area
+        terms: "<translate with synonyms or related terms for 'Residential Area', separated by commas>"
       landuse/retail:
-        name: Retail
-        terms: "<translate with synonyms or related terms for 'Retail', separated by commas>"
+        name: Retail Area
+        terms: "<translate with synonyms or related terms for 'Retail Area', separated by commas>"
       landuse/vineyard:
         name: Vineyard
         terms: "<translate with synonyms or related terms for 'Vineyard', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index f25cd56fd..6b2b6f336 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4621,7 +4621,6 @@
     },
     "landuse/allotments": {
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -4632,7 +4631,6 @@
     },
     "landuse/basin": {
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -4648,8 +4646,6 @@
             "denomination"
         ],
         "geometry": [
-            "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -4675,14 +4671,13 @@
     "landuse/commercial": {
         "icon": "commercial",
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
             "landuse": "commercial"
         },
         "terms": [],
-        "name": "Commercial"
+        "name": "Commercial Area"
     },
     "landuse/construction": {
         "fields": [
@@ -4690,7 +4685,6 @@
             "operator"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -4700,6 +4694,7 @@
         "name": "Construction"
     },
     "landuse/farm": {
+        "icon": "farm",
         "fields": [
             "crop"
         ],
@@ -4712,15 +4707,14 @@
         },
         "terms": [],
         "name": "Farm",
-        "icon": "farm",
         "searchable": false
     },
     "landuse/farmland": {
+        "icon": "farm",
         "fields": [
             "crop"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -4729,23 +4723,21 @@
         "terms": [
             "farmland"
         ],
-        "name": "Farm",
-        "icon": "farm"
+        "name": "Farmland"
     },
     "landuse/farmyard": {
+        "icon": "farm",
         "fields": [
             "crop"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
             "landuse": "farmyard"
         },
         "terms": [],
-        "name": "Farmyard",
-        "icon": "farm"
+        "name": "Farmyard"
     },
     "landuse/forest": {
         "icon": "park2",
@@ -4754,7 +4746,6 @@
             "leaf_cycle"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -4777,7 +4768,6 @@
     },
     "landuse/grass": {
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -4789,14 +4779,13 @@
     "landuse/industrial": {
         "icon": "industrial",
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
             "landuse": "industrial"
         },
         "terms": [],
-        "name": "Industrial"
+        "name": "Industrial Area"
     },
     "landuse/landfill": {
         "geometry": [
@@ -4812,7 +4801,6 @@
     },
     "landuse/meadow": {
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -4829,26 +4817,24 @@
             "landuse": "military"
         },
         "terms": [],
-        "name": "Military"
+        "name": "Military Area"
     },
     "landuse/orchard": {
+        "icon": "park2",
         "fields": [
             "trees"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
             "landuse": "orchard"
         },
         "terms": [],
-        "name": "Orchard",
-        "icon": "park2"
+        "name": "Orchard"
     },
     "landuse/quarry": {
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -4860,29 +4846,26 @@
     "landuse/residential": {
         "icon": "building",
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
             "landuse": "residential"
         },
         "terms": [],
-        "name": "Residential"
+        "name": "Residential Area"
     },
     "landuse/retail": {
         "icon": "shop",
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
             "landuse": "retail"
         },
-        "name": "Retail"
+        "name": "Retail Area"
     },
     "landuse/vineyard": {
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
diff --git a/data/presets/presets/landuse/allotments.json b/data/presets/presets/landuse/allotments.json
index 51e6768db..3fe01c238 100644
--- a/data/presets/presets/landuse/allotments.json
+++ b/data/presets/presets/landuse/allotments.json
@@ -1,6 +1,5 @@
 {
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
@@ -8,4 +7,4 @@
     },
     "terms": [],
     "name": "Allotments"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/landuse/basin.json b/data/presets/presets/landuse/basin.json
index a7602808f..8e1895a33 100644
--- a/data/presets/presets/landuse/basin.json
+++ b/data/presets/presets/landuse/basin.json
@@ -1,6 +1,5 @@
 {
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
@@ -8,4 +7,4 @@
     },
     "terms": [],
     "name": "Basin"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json
index f41808f27..3ac95a358 100644
--- a/data/presets/presets/landuse/cemetery.json
+++ b/data/presets/presets/landuse/cemetery.json
@@ -5,8 +5,6 @@
         "denomination"
     ],
     "geometry": [
-        "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json
index d7610d78e..45592cce2 100644
--- a/data/presets/presets/landuse/commercial.json
+++ b/data/presets/presets/landuse/commercial.json
@@ -1,12 +1,11 @@
 {
     "icon": "commercial",
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "landuse": "commercial"
     },
     "terms": [],
-    "name": "Commercial"
-}
\ No newline at end of file
+    "name": "Commercial Area"
+}
diff --git a/data/presets/presets/landuse/construction.json b/data/presets/presets/landuse/construction.json
index b1cfbaac6..899b70383 100644
--- a/data/presets/presets/landuse/construction.json
+++ b/data/presets/presets/landuse/construction.json
@@ -4,7 +4,6 @@
         "operator"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
@@ -12,4 +11,4 @@
     },
     "terms": [],
     "name": "Construction"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/landuse/farm.json b/data/presets/presets/landuse/farm.json
index c6dcb6c12..59c9362c8 100644
--- a/data/presets/presets/landuse/farm.json
+++ b/data/presets/presets/landuse/farm.json
@@ -1,4 +1,5 @@
 {
+    "icon": "farm",
     "fields": [
         "crop"
     ],
@@ -11,6 +12,5 @@
     },
     "terms": [],
     "name": "Farm",
-    "icon": "farm",
     "searchable": false
 }
diff --git a/data/presets/presets/landuse/farmland.json b/data/presets/presets/landuse/farmland.json
index 7df32a721..0189da4d0 100644
--- a/data/presets/presets/landuse/farmland.json
+++ b/data/presets/presets/landuse/farmland.json
@@ -1,9 +1,9 @@
 {
+    "icon": "farm",
     "fields": [
         "crop"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
@@ -12,6 +12,5 @@
     "terms": [
         "farmland"
     ],
-    "name": "Farm",
-    "icon": "farm"
+    "name": "Farmland"
 }
diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json
index 1d6e93d15..5b2b4b714 100644
--- a/data/presets/presets/landuse/farmyard.json
+++ b/data/presets/presets/landuse/farmyard.json
@@ -1,15 +1,14 @@
 {
+    "icon": "farm",
     "fields": [
         "crop"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "landuse": "farmyard"
     },
     "terms": [],
-    "name": "Farmyard",
-    "icon": "farm"
+    "name": "Farmyard"
 }
diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json
index fb61bcd42..9c0dd25e4 100644
--- a/data/presets/presets/landuse/forest.json
+++ b/data/presets/presets/landuse/forest.json
@@ -5,7 +5,6 @@
         "leaf_cycle"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/landuse/garages.json b/data/presets/presets/landuse/garages.json
index f346b7011..c9328b015 100644
--- a/data/presets/presets/landuse/garages.json
+++ b/data/presets/presets/landuse/garages.json
@@ -5,7 +5,6 @@
     "tags": {
         "landuse": "garages"
     },
-    "terms": [
-    ],
+    "terms": [],
     "name": "Garages"
 }
diff --git a/data/presets/presets/landuse/grass.json b/data/presets/presets/landuse/grass.json
index 35d46fbb2..8d1fdfa80 100644
--- a/data/presets/presets/landuse/grass.json
+++ b/data/presets/presets/landuse/grass.json
@@ -1,6 +1,5 @@
 {
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
@@ -8,4 +7,4 @@
     },
     "terms": [],
     "name": "Grass"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/landuse/industrial.json b/data/presets/presets/landuse/industrial.json
index d55844e3e..b92c3e507 100644
--- a/data/presets/presets/landuse/industrial.json
+++ b/data/presets/presets/landuse/industrial.json
@@ -1,12 +1,11 @@
 {
     "icon": "industrial",
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "landuse": "industrial"
     },
     "terms": [],
-    "name": "Industrial"
-}
\ No newline at end of file
+    "name": "Industrial Area"
+}
diff --git a/data/presets/presets/landuse/meadow.json b/data/presets/presets/landuse/meadow.json
index eba4bfec1..3de68e377 100644
--- a/data/presets/presets/landuse/meadow.json
+++ b/data/presets/presets/landuse/meadow.json
@@ -1,6 +1,5 @@
 {
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
@@ -8,4 +7,4 @@
     },
     "terms": [],
     "name": "Meadow"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/landuse/military.json b/data/presets/presets/landuse/military.json
index e3937f1dc..132ca89c0 100644
--- a/data/presets/presets/landuse/military.json
+++ b/data/presets/presets/landuse/military.json
@@ -6,5 +6,5 @@
         "landuse": "military"
     },
     "terms": [],
-    "name": "Military"
-}
\ No newline at end of file
+    "name": "Military Area"
+}
diff --git a/data/presets/presets/landuse/orchard.json b/data/presets/presets/landuse/orchard.json
index ca6cb0ebd..e2f15af79 100644
--- a/data/presets/presets/landuse/orchard.json
+++ b/data/presets/presets/landuse/orchard.json
@@ -1,15 +1,14 @@
 {
+    "icon": "park2",
     "fields": [
         "trees"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "landuse": "orchard"
     },
     "terms": [],
-    "name": "Orchard",
-    "icon": "park2"
+    "name": "Orchard"
 }
diff --git a/data/presets/presets/landuse/quarry.json b/data/presets/presets/landuse/quarry.json
index aee2bc306..d58c0deda 100644
--- a/data/presets/presets/landuse/quarry.json
+++ b/data/presets/presets/landuse/quarry.json
@@ -1,6 +1,5 @@
 {
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
@@ -8,4 +7,4 @@
     },
     "terms": [],
     "name": "Quarry"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/landuse/residential.json b/data/presets/presets/landuse/residential.json
index ef0b5e31a..4048c3200 100644
--- a/data/presets/presets/landuse/residential.json
+++ b/data/presets/presets/landuse/residential.json
@@ -1,12 +1,11 @@
 {
     "icon": "building",
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "landuse": "residential"
     },
     "terms": [],
-    "name": "Residential"
-}
\ No newline at end of file
+    "name": "Residential Area"
+}
diff --git a/data/presets/presets/landuse/retail.json b/data/presets/presets/landuse/retail.json
index a0e25082b..feb32ca11 100644
--- a/data/presets/presets/landuse/retail.json
+++ b/data/presets/presets/landuse/retail.json
@@ -1,11 +1,10 @@
 {
     "icon": "shop",
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "landuse": "retail"
     },
-    "name": "Retail"
-}
\ No newline at end of file
+    "name": "Retail Area"
+}
diff --git a/data/presets/presets/landuse/vineyard.json b/data/presets/presets/landuse/vineyard.json
index 08f813bca..47bdef728 100644
--- a/data/presets/presets/landuse/vineyard.json
+++ b/data/presets/presets/landuse/vineyard.json
@@ -1,6 +1,5 @@
 {
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
@@ -8,4 +7,4 @@
     },
     "terms": [],
     "name": "Vineyard"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index abc0bfc7f..4a15c7555 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2379,7 +2379,7 @@
                 "terms": ""
             },
             "landuse/commercial": {
-                "name": "Commercial",
+                "name": "Commercial Area",
                 "terms": ""
             },
             "landuse/construction": {
@@ -2391,7 +2391,7 @@
                 "terms": ""
             },
             "landuse/farmland": {
-                "name": "Farm",
+                "name": "Farmland",
                 "terms": "farmland"
             },
             "landuse/farmyard": {
@@ -2411,7 +2411,7 @@
                 "terms": ""
             },
             "landuse/industrial": {
-                "name": "Industrial",
+                "name": "Industrial Area",
                 "terms": ""
             },
             "landuse/landfill": {
@@ -2423,7 +2423,7 @@
                 "terms": ""
             },
             "landuse/military": {
-                "name": "Military",
+                "name": "Military Area",
                 "terms": ""
             },
             "landuse/orchard": {
@@ -2435,11 +2435,11 @@
                 "terms": ""
             },
             "landuse/residential": {
-                "name": "Residential",
+                "name": "Residential Area",
                 "terms": ""
             },
             "landuse/retail": {
-                "name": "Retail",
+                "name": "Retail Area",
                 "terms": ""
             },
             "landuse/vineyard": {