From 7080661fd415a55cdfd24aff2d5d281e96838c1d Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 31 Oct 2017 16:21:39 -0400
Subject: [PATCH] Add preset for "Pedestrian Area" (highway=pedestrian +
 area=yes) (closes #4488)

---
 data/presets.yaml                             |  8 +++-
 data/presets/categories.json                  |  2 +-
 data/presets/categories/path.json             |  2 +-
 data/presets/presets.json                     | 41 +++++++++++++++++--
 .../presets/highway/pedestrian_area.json      | 27 ++++++++++++
 .../{pedestrian.json => pedestrian_line.json} | 12 ++++--
 data/taginfo.json                             |  4 ++
 dist/locales/en.json                          |  8 +++-
 8 files changed, 92 insertions(+), 12 deletions(-)
 create mode 100644 data/presets/presets/highway/pedestrian_area.json
 rename data/presets/presets/highway/{pedestrian.json => pedestrian_line.json} (67%)

diff --git a/data/presets.yaml b/data/presets.yaml
index ef85ea3244..d873c1eaae 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3055,9 +3055,15 @@ en:
         name: Path
         # 'terms: hike,hiking,trackway,trail,walk'
         terms: '<translate with synonyms or related terms for ''Path'', separated by commas>'
-      highway/pedestrian:
+      highway/pedestrian_area:
+        # 'highway=pedestrian, area=yes'
+        name: Pedestrian Area
+        # 'terms: center,centre,plaza,quad,square,walkway'
+        terms: '<translate with synonyms or related terms for ''Pedestrian Area'', separated by commas>'
+      highway/pedestrian_line:
         # highway=pedestrian
         name: Pedestrian Street
+        # 'terms: center,centre,plaza,quad,square,walkway'
         terms: '<translate with synonyms or related terms for ''Pedestrian Street'', separated by commas>'
       highway/primary:
         # highway=primary
diff --git a/data/presets/categories.json b/data/presets/categories.json
index 25e7f40726..70122732ea 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -108,7 +108,7 @@
                 "highway/footway",
                 "highway/cycleway",
                 "highway/bridleway",
-                "highway/pedestrian"
+                "highway/pedestrian_line"
             ]
         },
         "category-rail": {
diff --git a/data/presets/categories/path.json b/data/presets/categories/path.json
index 5b15546dd8..b675a430ee 100644
--- a/data/presets/categories/path.json
+++ b/data/presets/categories/path.json
@@ -10,6 +10,6 @@
         "highway/footway",
         "highway/cycleway",
         "highway/bridleway",
-        "highway/pedestrian"
+        "highway/pedestrian_line"
     ]
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 58a3ff9c9c..758d3c0a64 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6993,7 +6993,34 @@
             },
             "name": "Path"
         },
-        "highway/pedestrian": {
+        "highway/pedestrian_area": {
+            "icon": "poi-foot",
+            "fields": [
+                "name",
+                "surface",
+                "lit",
+                "width",
+                "structure",
+                "access"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "highway": "pedestrian",
+                "area": "yes"
+            },
+            "terms": [
+                "center",
+                "centre",
+                "plaza",
+                "quad",
+                "square",
+                "walkway"
+            ],
+            "name": "Pedestrian Area"
+        },
+        "highway/pedestrian_line": {
             "icon": "highway-footway",
             "fields": [
                 "name",
@@ -7005,13 +7032,19 @@
                 "access"
             ],
             "geometry": [
-                "line",
-                "area"
+                "line"
             ],
             "tags": {
                 "highway": "pedestrian"
             },
-            "terms": [],
+            "terms": [
+                "center",
+                "centre",
+                "plaza",
+                "quad",
+                "square",
+                "walkway"
+            ],
             "name": "Pedestrian Street"
         },
         "highway/primary_link": {
diff --git a/data/presets/presets/highway/pedestrian_area.json b/data/presets/presets/highway/pedestrian_area.json
new file mode 100644
index 0000000000..1f305b3b62
--- /dev/null
+++ b/data/presets/presets/highway/pedestrian_area.json
@@ -0,0 +1,27 @@
+{
+    "icon": "poi-foot",
+    "fields": [
+        "name",
+        "surface",
+        "lit",
+        "width",
+        "structure",
+        "access"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "highway": "pedestrian",
+        "area": "yes"
+    },
+    "terms": [
+        "center",
+        "centre",
+        "plaza",
+        "quad",
+        "square",
+        "walkway"
+    ],
+    "name": "Pedestrian Area"
+}
diff --git a/data/presets/presets/highway/pedestrian.json b/data/presets/presets/highway/pedestrian_line.json
similarity index 67%
rename from data/presets/presets/highway/pedestrian.json
rename to data/presets/presets/highway/pedestrian_line.json
index fece5f82b7..1f98db37ff 100644
--- a/data/presets/presets/highway/pedestrian.json
+++ b/data/presets/presets/highway/pedestrian_line.json
@@ -10,12 +10,18 @@
         "access"
     ],
     "geometry": [
-        "line",
-        "area"
+        "line"
     ],
     "tags": {
         "highway": "pedestrian"
     },
-    "terms": [],
+    "terms": [
+        "center",
+        "centre",
+        "plaza",
+        "quad",
+        "square",
+        "walkway"
+    ],
     "name": "Pedestrian Street"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 6e7f1651ee..69fc49d1a5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1336,6 +1336,10 @@
             "key": "highway",
             "value": "path"
         },
+        {
+            "key": "area",
+            "value": "yes"
+        },
         {
             "key": "highway",
             "value": "pedestrian"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2d188096bd..e479887b7b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3758,9 +3758,13 @@
                     "name": "Path",
                     "terms": "hike,hiking,trackway,trail,walk"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Pedestrian Area",
+                    "terms": "center,centre,plaza,quad,square,walkway"
+                },
+                "highway/pedestrian_line": {
                     "name": "Pedestrian Street",
-                    "terms": ""
+                    "terms": "center,centre,plaza,quad,square,walkway"
                 },
                 "highway/primary_link": {
                     "name": "Primary Link",