Update various presets to specify the preferred geometry type

Add documentation about the geometry array order
facebook · Aug 15, 2019 · b45dc7e · b45dc7e
1 parent 9c730c4
commit b45dc7e
Show file tree

Hide file tree

Showing 41 changed files with 168 additions and 166 deletions.
diff --git a/data/presets/README.md b/data/presets/README.md
@@ -78,6 +78,8 @@ An array of possible geometry types that a feature must have in order to match t
 
 Closed ways can be treated as both `line` or `area` geometry. If a preset allows both, iD will add an additional `area=yes` tag when choosing the preset for an area feature.
 
+The geometry types should be listed in order of preference. For example, the preset for `leisure=swimming_pool` lists `area` before `point`.
+
 This property is required. There is no default.
 
 ##### `tags`
@@ -203,7 +205,7 @@ When possible, use `deprecated.json` instead to specify upgrade paths for old ta
 
 A key and optionally a value to link to the wiki documentation for this preset. Only necessary if the preset consists of several tags.
 
-For example, 
+For example,
 ```javascript
 "reference": {
     "key": "tower:type",

diff --git a/data/presets/presets.json b/data/presets/presets.json
diff --git a/data/presets/presets/aeroway/aerodrome.json b/data/presets/presets/aeroway/aerodrome.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-airport",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "fields": [
         "name",

diff --git a/data/presets/presets/aeroway/helipad.json b/data/presets/presets/aeroway/helipad.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-heliport",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "fields": [
         "name",

diff --git a/data/presets/presets/leisure/bleachers.json b/data/presets/presets/leisure/bleachers.json
@@ -1,7 +1,7 @@
 {
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "bleachers"

diff --git a/data/presets/presets/leisure/common.json b/data/presets/presets/leisure/common.json
@@ -9,8 +9,8 @@
         "website"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "fields": [
         "name"

diff --git a/data/presets/presets/leisure/disc_golf_course.json b/data/presets/presets/leisure/disc_golf_course.json
@@ -20,8 +20,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "disc_golf_course"

diff --git a/data/presets/presets/leisure/golf_course.json b/data/presets/presets/leisure/golf_course.json
@@ -14,8 +14,8 @@
         "fax"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "links"

diff --git a/data/presets/presets/leisure/ice_rink.json b/data/presets/presets/leisure/ice_rink.json
@@ -17,8 +17,8 @@
         "fax"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "hockey",

diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json
@@ -22,9 +22,9 @@
         "fax"
     ],
     "geometry": [
+        "area",
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "terms": [
         "boat"

diff --git a/data/presets/presets/leisure/miniature_golf.json b/data/presets/presets/leisure/miniature_golf.json
@@ -16,8 +16,8 @@
         "fax"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "crazy golf",

diff --git a/data/presets/presets/leisure/nature_reserve.json b/data/presets/presets/leisure/nature_reserve.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-park",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "fields": [
         "name",

diff --git a/data/presets/presets/leisure/pitch.json b/data/presets/presets/leisure/pitch.json
@@ -15,8 +15,8 @@
         "payment_multi_fee"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch"

diff --git a/data/presets/presets/leisure/pitch/american_football.json b/data/presets/presets/leisure/pitch/american_football.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-american-football",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/australian_football.json b/data/presets/presets/leisure/pitch/australian_football.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-american-football",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/badminton.json b/data/presets/presets/leisure/pitch/badminton.json
@@ -5,8 +5,8 @@
         "access_simple"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/baseball.json b/data/presets/presets/leisure/pitch/baseball.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-baseball",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/basketball.json b/data/presets/presets/leisure/pitch/basketball.json
@@ -8,8 +8,8 @@
         "access_simple"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/beachvolleyball.json b/data/presets/presets/leisure/pitch/beachvolleyball.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-volleyball",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/boules.json b/data/presets/presets/leisure/pitch/boules.json
@@ -6,8 +6,8 @@
         "{leisure/pitch}"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/bowls.json b/data/presets/presets/leisure/pitch/bowls.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-pitch",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/cricket.json b/data/presets/presets/leisure/pitch/cricket.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-cricket",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/equestrian.json b/data/presets/presets/leisure/pitch/equestrian.json
@@ -5,8 +5,8 @@
         "building"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/field_hockey.json b/data/presets/presets/leisure/pitch/field_hockey.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-pitch",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/horseshoes.json b/data/presets/presets/leisure/pitch/horseshoes.json
@@ -1,8 +1,8 @@
 {
     "icon": "temaki-horseshoes",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/netball.json b/data/presets/presets/leisure/pitch/netball.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-volleyball",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/rugby_league.json b/data/presets/presets/leisure/pitch/rugby_league.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-american-football",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/rugby_union.json b/data/presets/presets/leisure/pitch/rugby_union.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-american-football",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/shuffleboard.json b/data/presets/presets/leisure/pitch/shuffleboard.json
@@ -1,8 +1,8 @@
 {
     "icon": "temaki-shuffleboard",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/skateboard.json b/data/presets/presets/leisure/pitch/skateboard.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-skateboard",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/soccer.json b/data/presets/presets/leisure/pitch/soccer.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-soccer",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/softball.json b/data/presets/presets/leisure/pitch/softball.json
@@ -1,20 +1,20 @@
 {
-  "icon": "maki-baseball",
-  "geometry": [
-    "point",
-    "area"
-  ],
-  "tags": {
-    "leisure": "pitch",
-    "sport": "softball"
-  },
-  "reference": {
-    "key": "sport",
-    "value": "softball"
-  },
-  "terms": [
-    "softball",
-    "diamond"
-  ],
-  "name": "Softball Field"
+    "icon": "maki-baseball",
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "tags": {
+        "leisure": "pitch",
+        "sport": "softball"
+    },
+    "reference": {
+        "key": "sport",
+        "value": "softball"
+    },
+    "terms": [
+        "softball",
+        "diamond"
+    ],
+    "name": "Softball Field"
 }
diff --git a/data/presets/presets/leisure/pitch/table_tennis.json b/data/presets/presets/leisure/pitch/table_tennis.json
@@ -6,8 +6,8 @@
         "access_simple"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",

diff --git a/data/presets/presets/leisure/pitch/tennis.json b/data/presets/presets/leisure/pitch/tennis.json
@@ -5,8 +5,8 @@
         "access_simple"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "leisure": "pitch",
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,8 +14,8 @@ @@
             "fax"
         ],
         "geometry": [
-            "point",
-            "area"
+            "area",
+            "point"
         ],
         "terms": [
             "links"
@@ Expand Down @@