resolved conflict

2026-02-14 09:42:56 +00:00 · 2013-03-12 20:51:13 -04:00
parent 3228e1fcda c0e1245623
commit 983f69e461
156 changed files with 423 additions and 220 deletions
--- a/build.js
+++ b/build.js
@@ -28,7 +28,6 @@ fs.writeFileSync('data/presets/presets.json', JSON.stringify(
 fs.writeFileSync('data/data.js', 'iD.data = ' + JSON.stringify({
    deprecated: r('deprecated.json'),
    discarded: r('discarded.json'),
-    imagery: r('imagery.json'),
    keys: r('keys.json'),
    imagery: r('imagery.json'),
    presets: {
--- a/css/app.css
+++ b/css/app.css
@@ -672,7 +672,8 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 }

 .preset-section h4 + input,
-h4 + .input-wrap-position input {
+h4 + .input-wrap-position input,
+h4 + .preset-input input:first-child {
    padding-top: 35px;
    height: 60px;
 }
@@ -691,6 +692,12 @@ input[type=number] {
    right: 50%;
 }

+button.preset-add-form {
+    width: 40px;
+    height: 40px;
+    margin-right: 10px;
+}
+
 .preset-fav button.fav {
    height: 30px;
    margin: 5px;
--- a/css/map.css
+++ b/css/map.css
@@ -331,6 +331,7 @@ path.fill.tag-natural-beach,
 path.fill.tag-natural-scrub,
 path.fill.tag-landuse-cemetery,
 path.fill.tag-landuse-meadow,
+path.fill.tag-landuse-farm,
 path.fill.tag-landuse-farmland,
 path.fill.tag-landuse-construction,
 path.fill.tag-landuse-orchard {
@@ -343,6 +344,7 @@ path.fill.tag-landuse-orchard {
 .pattern-color-meadow,
 .pattern-color-wetland,
 .pattern-color-cemetery,
+.pattern-color-farm,
 .pattern-color-farmland,
 .pattern-color-construction,
 .pattern-color-orchard {
@@ -362,10 +364,12 @@ path.fill.tag-landuse-residential {
    fill: #e06e5f;
 }

+path.fill.tag-landuse-farm,
 path.fill.tag-landuse-farmland {
    fill: url(#pattern-farmland) #8cd05f;
 }

+.pattern-color-farm,
 .pattern-color-farmland {
    fill: url(#pattern-farmland) #8cd05f;
 }
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -1,7 +1,7 @@
 [
 {
    "match": {
-        "type": "line"
+        "geometry": "line"
    },
    "icon": "highway",
    "name": "roads",
--- a/data/presets/forms.json
+++ b/data/presets/forms.json
@@ -1 +1 @@
-{"access":{"key":"access","type":"combo"},"address":{"type":"address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"]},"atm":{"key":"atm","type":"check"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"elevation":{"key":"ele","type":"number"},"emergency":{"key":"emergency","type":"check"},"fax":{"key":"fax","type":"tel"},"fee":{"key":"fee","type":"check"},"internet_access":{"key":"internet_access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"layer":{"key":"layer","type":"combo"},"levels":{"key":"building:levels","type":"number"},"maxspeed":{"key":"maxspeed","type":"combo"},"network":{"key":"network","type":"text"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"phone":{"key":"phone","type":"tel"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"title":" ","type":"radio","options":["bridge","tunnel","embankment","cutting"]},"shelter":{"key":"shelter","type":"check"},"surface":{"key":"surface","type":"combo"}}
+{"access":{"key":"access","type":"combo"},"address":{"type":"address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"],"universal":true},"atm":{"key":"atm","type":"check"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"elevation":{"key":"ele","type":"number","universal":true},"emergency":{"key":"emergency","type":"check"},"fax":{"key":"fax","type":"tel"},"fee":{"key":"fee","type":"check"},"internet_access":{"key":"internet_access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"layer":{"key":"layer","type":"combo"},"levels":{"key":"building:levels","type":"number"},"maxspeed":{"key":"maxspeed","type":"combo"},"network":{"key":"network","type":"text"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"phone":{"key":"phone","type":"tel"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"title":" ","type":"radio","options":["bridge","tunnel","embankment","cutting"]},"shelter":{"key":"shelter","type":"check"},"source":{"key":"source","type":"text","universal":true},"surface":{"key":"surface","type":"combo"},"telephone":{"key":"phone","type":"tel","universal":true},"website":{"key":"website","type":"url","universal":true},"wikipedia":{"key":"wikipedia","type":"text","universal":true}}
--- a/data/presets/forms/address.json
+++ b/data/presets/forms/address.json
@@ -5,5 +5,6 @@
        "addr:housenumber",
        "addr:street",
        "addr:city"
-    ]
+    ],
+    "universal": true
 }
--- a/data/presets/forms/elevation.json
+++ b/data/presets/forms/elevation.json
@@ -1,4 +1,5 @@
 {
    "key": "ele",
-    "type": "number"
-}
+    "type": "number",
+    "universal": true
+}
--- a/data/presets/forms/source.json
+++ b/data/presets/forms/source.json
@@ -0,0 +1,5 @@
+{
+    "key": "source",
+    "type": "text",
+    "universal": true
+}
--- a/data/presets/forms/telephone.json
+++ b/data/presets/forms/telephone.json
@@ -0,0 +1,5 @@
+{
+    "key": "phone",
+    "type": "tel",
+    "universal": true
+}
--- a/data/presets/forms/website.json
+++ b/data/presets/forms/website.json
@@ -0,0 +1,5 @@
+{
+    "key": "website",
+    "type": "url",
+    "universal": true
+}
--- a/data/presets/forms/wikipedia.json
+++ b/data/presets/forms/wikipedia.json
@@ -0,0 +1,5 @@
+{
+    "key": "wikipedia",
+    "type": "text",
+    "universal": true
+}
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
--- a/data/presets/presets/aeroway.json
+++ b/data/presets/presets/aeroway.json
@@ -1,7 +1,7 @@
 {
    "name": "aeroway",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "vertex",
            "line",
--- a/data/presets/presets/aeroway/aerodrome.json
+++ b/data/presets/presets/aeroway/aerodrome.json
@@ -1,7 +1,7 @@
 {
    "name": "airport",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/aeroway/helipad.json
+++ b/data/presets/presets/aeroway/helipad.json
@@ -1,7 +1,7 @@
 {
    "name": "helipad",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity.json
+++ b/data/presets/presets/amenity.json
@@ -1,7 +1,7 @@
 {
    "name": "amenity",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/bank.json
+++ b/data/presets/presets/amenity/bank.json
@@ -1,7 +1,7 @@
 {
    "name": "bank",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -1,7 +1,7 @@
 {
    "name": "bar",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/bicycle_rental.json
+++ b/data/presets/presets/amenity/bicycle_rental.json
@@ -1,7 +1,7 @@
 {
    "name": "bicycle rental",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -1,7 +1,7 @@
 {
    "name": "cafe",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/cinema.json
+++ b/data/presets/presets/amenity/cinema.json
@@ -1,7 +1,7 @@
 {
    "name": "cinema",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/fast_food.json
+++ b/data/presets/presets/amenity/fast_food.json
@@ -1,7 +1,7 @@
 {
    "name": "fast food",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/fire_station.json
+++ b/data/presets/presets/amenity/fire_station.json
@@ -1,7 +1,7 @@
 {
    "name": "fire station",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/grave_yard.json
+++ b/data/presets/presets/amenity/grave_yard.json
@@ -1,7 +1,7 @@
 {
    "name": "grave yard",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/hospital.json
+++ b/data/presets/presets/amenity/hospital.json
@@ -1,7 +1,7 @@
 {
    "name": "hospital",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -1,7 +1,7 @@
 {
    "name": "library",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -1,7 +1,7 @@
 {
    "name": "parking",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -1,7 +1,7 @@
 {
    "name": "pharmacy",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -1,7 +1,7 @@
 {
    "name": "place of worship",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/place_of_worship/christian.json
+++ b/data/presets/presets/amenity/place_of_worship/christian.json
@@ -1,7 +1,7 @@
 {
    "name": "church",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/place_of_worship/jewish.json
+++ b/data/presets/presets/amenity/place_of_worship/jewish.json
@@ -1,7 +1,7 @@
 {
    "name": "synagogue",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/place_of_worship/muslim.json
+++ b/data/presets/presets/amenity/place_of_worship/muslim.json
@@ -1,7 +1,7 @@
 {
    "name": "mosque",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/police.json
+++ b/data/presets/presets/amenity/police.json
@@ -1,7 +1,7 @@
 {
    "name": "police",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/post_box.json
+++ b/data/presets/presets/amenity/post_box.json
@@ -1,7 +1,7 @@
 {
    "name": "post box",
    "match": {
-        "type": [
+        "geometry": [
            "point"
        ],
        "tags": {
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -1,7 +1,7 @@
 {
    "name": "pub",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/restaurant.json
+++ b/data/presets/presets/amenity/restaurant.json
@@ -1,7 +1,7 @@
 {
    "name": "restaurant",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -1,7 +1,7 @@
 {
    "name": "school",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -1,7 +1,7 @@
 {
    "name": "toilets",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/amenity/townhall.json
+++ b/data/presets/presets/amenity/townhall.json
@@ -1,7 +1,7 @@
 {
    "name": "town hall",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "areea"
        ],
--- a/data/presets/presets/amenity/university.json
+++ b/data/presets/presets/amenity/university.json
@@ -1,7 +1,7 @@
 {
    "name": "university",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -1,7 +1,7 @@
 {
    "name": "building",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/highway.json
+++ b/data/presets/presets/highway.json
@@ -1,7 +1,7 @@
 {
    "name": "highway",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "vertex",
            "line",
--- a/data/presets/presets/highway/bus_stop.json
+++ b/data/presets/presets/highway/bus_stop.json
@@ -1,7 +1,7 @@
 {
    "name": "bus stop",
    "match": {
-        "type": [
+        "geometry": [
            "point"
        ],
        "tags": {
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -1,7 +1,7 @@
 {
    "name": "crossing",
    "match": {
-        "type": [
+        "geometry": [
            "vertex"
        ],
        "tags": {
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -1,7 +1,7 @@
 {
    "name": "cycle path",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -1,7 +1,7 @@
 {
    "name": "foot path",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "terms": [
--- a/data/presets/presets/highway/motorway.json
+++ b/data/presets/presets/highway/motorway.json
@@ -1,7 +1,7 @@
 {
    "name": "motorway",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -1,7 +1,7 @@
 {
    "name": "path",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/primary.json
+++ b/data/presets/presets/highway/primary.json
@@ -1,7 +1,7 @@
 {
    "name": "primary road",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/residential.json
+++ b/data/presets/presets/highway/residential.json
@@ -1,7 +1,7 @@
 {
    "name": "residential road",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/secondary.json
+++ b/data/presets/presets/highway/secondary.json
@@ -1,7 +1,7 @@
 {
    "name": "secondary road",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/service.json
+++ b/data/presets/presets/highway/service.json
@@ -1,7 +1,7 @@
 {
    "name": "service road",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/steps.json
+++ b/data/presets/presets/highway/steps.json
@@ -1,7 +1,7 @@
 {
    "name": "steps",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/tertiary.json
+++ b/data/presets/presets/highway/tertiary.json
@@ -1,7 +1,7 @@
 {
    "name": "tertiary road",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -1,7 +1,7 @@
 {
    "name": "track",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -1,7 +1,7 @@
 {
    "name": "trunk highway",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/highway/turning_circle.json
+++ b/data/presets/presets/highway/turning_circle.json
@@ -1,7 +1,7 @@
 {
    "name": "turning circle",
    "match": {
-        "type": [
+        "geometry": [
            "vertex"
        ],
        "tags": {
--- a/data/presets/presets/highway/unclassified.json
+++ b/data/presets/presets/highway/unclassified.json
@@ -1,7 +1,7 @@
 {
    "name": "unclassified",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "tags": {
--- a/data/presets/presets/landuse.json
+++ b/data/presets/presets/landuse.json
@@ -1,7 +1,7 @@
 {
    "name": "landuse",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/allotments.json
+++ b/data/presets/presets/landuse/allotments.json
@@ -1,7 +1,7 @@
 {
    "name": "allotments",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/cemetery.json
+++ b/data/presets/presets/landuse/cemetery.json
@@ -1,7 +1,7 @@
 {
    "name": "cemetery",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/commercial.json
+++ b/data/presets/presets/landuse/commercial.json
@@ -1,7 +1,7 @@
 {
    "name": "commercial",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/construction.json
+++ b/data/presets/presets/landuse/construction.json
@@ -1,7 +1,7 @@
 {
    "name": "construction",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/farm.json
+++ b/data/presets/presets/landuse/farm.json
@@ -1,7 +1,7 @@
 {
    "name": "farm",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/farmyard.json
+++ b/data/presets/presets/landuse/farmyard.json
@@ -1,7 +1,7 @@
 {
    "name": "farmyard",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/forest.json
+++ b/data/presets/presets/landuse/forest.json
@@ -1,7 +1,7 @@
 {
    "name": "forest",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/grass.json
+++ b/data/presets/presets/landuse/grass.json
@@ -1,7 +1,7 @@
 {
    "name": "grass",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/industrial.json
+++ b/data/presets/presets/landuse/industrial.json
@@ -1,7 +1,7 @@
 {
    "name": "industrial",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/meadow.json
+++ b/data/presets/presets/landuse/meadow.json
@@ -1,7 +1,7 @@
 {
    "name": "meadow",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/orchard.json
+++ b/data/presets/presets/landuse/orchard.json
@@ -1,7 +1,7 @@
 {
    "name": "orchard",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/quarry.json
+++ b/data/presets/presets/landuse/quarry.json
@@ -1,7 +1,7 @@
 {
    "name": "quarry",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/residential.json
+++ b/data/presets/presets/landuse/residential.json
@@ -1,7 +1,7 @@
 {
    "name": "residential",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/landuse/vineyard.json
+++ b/data/presets/presets/landuse/vineyard.json
@@ -1,7 +1,7 @@
 {
    "name": "vineyard",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/leisure.json
+++ b/data/presets/presets/leisure.json
@@ -1,7 +1,7 @@
 {
    "name": "leisure",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/leisure/golf_course.json
+++ b/data/presets/presets/leisure/golf_course.json
@@ -1,7 +1,7 @@
 {
    "name": "golf course",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/leisure/park.json
+++ b/data/presets/presets/leisure/park.json
@@ -1,7 +1,7 @@
 {
    "name": "park",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/leisure/pitch.json
+++ b/data/presets/presets/leisure/pitch.json
@@ -1,7 +1,7 @@
 {
    "name": "sport pitch",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/leisure/pitch/baseball.json
+++ b/data/presets/presets/leisure/pitch/baseball.json
@@ -1,7 +1,7 @@
 {
    "name": "baseball diamond",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
@@ -11,8 +11,5 @@
        },
        "terms": []
    },
-    "icon": "baseball",
-    "form": [
-        "surface"
-    ]
+    "icon": "baseball"
 }
--- a/data/presets/presets/leisure/pitch/basketball.json
+++ b/data/presets/presets/leisure/pitch/basketball.json
@@ -1,7 +1,7 @@
 {
    "name": "basketball court",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/leisure/pitch/soccer.json
+++ b/data/presets/presets/leisure/pitch/soccer.json
@@ -1,7 +1,7 @@
 {
    "name": "soccer field",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/leisure/pitch/tennis.json
+++ b/data/presets/presets/leisure/pitch/tennis.json
@@ -1,7 +1,7 @@
 {
    "name": "tennis court",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/leisure/playground.json
+++ b/data/presets/presets/leisure/playground.json
@@ -0,0 +1,12 @@
+{
+    "name": "playground",
+    "match": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "playground"
+        }
+    }
+}
--- a/data/presets/presets/man_made.json
+++ b/data/presets/presets/man_made.json
@@ -1,7 +1,7 @@
 {
    "name": "man made",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "vertex",
            "line",
--- a/data/presets/presets/man_made/lighthouse.json
+++ b/data/presets/presets/man_made/lighthouse.json
@@ -1,7 +1,7 @@
 {
    "name": "lighthouse",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/man_made/pier.json
+++ b/data/presets/presets/man_made/pier.json
@@ -1,7 +1,7 @@
 {
    "name": "pier",
    "match": {
-        "type": [
+        "geometry": [
            "line",
            "area"
        ],
--- a/data/presets/presets/natural.json
+++ b/data/presets/presets/natural.json
@@ -1,7 +1,7 @@
 {
    "name": "natural",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/natural/bay.json
+++ b/data/presets/presets/natural/bay.json
@@ -1,7 +1,7 @@
 {
    "name": "bay",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/natural/beach.json
+++ b/data/presets/presets/natural/beach.json
@@ -1,7 +1,7 @@
 {
    "name": "beach",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/natural/cliff.json
+++ b/data/presets/presets/natural/cliff.json
@@ -1,7 +1,7 @@
 {
    "name": "cliff",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "vertex",
            "line",
--- a/data/presets/presets/natural/coastline.json
+++ b/data/presets/presets/natural/coastline.json
@@ -1,7 +1,7 @@
 {
    "name": "coastline",
    "match": {
-        "type": [
+        "geometry": [
            "line"
        ],
        "terms": [
--- a/data/presets/presets/natural/glacier.json
+++ b/data/presets/presets/natural/glacier.json
@@ -1,7 +1,7 @@
 {
    "name": "glacier",
    "match": {
-        "type": [
+        "geometry": [
            "area"
        ],
        "terms": [
--- a/data/presets/presets/natural/grassland.json
+++ b/data/presets/presets/natural/grassland.json
@@ -1,7 +1,7 @@
 {
    "name": "grassland",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "area"
        ],
--- a/data/presets/presets/natural/heath.json
+++ b/data/presets/presets/natural/heath.json
@@ -1,7 +1,7 @@
 {
    "name": "heath",
    "match": {
-        "type": [
+        "geometry": [
            "area"
        ],
        "terms": [
--- a/data/presets/presets/natural/peak.json
+++ b/data/presets/presets/natural/peak.json
@@ -1,7 +1,7 @@
 {
    "name": "peak",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "vertex"
        ],
--- a/data/presets/presets/natural/scrub.json
+++ b/data/presets/presets/natural/scrub.json
@@ -1,7 +1,7 @@
 {
    "name": "scrub",
    "match": {
-        "type": [
+        "geometry": [
            "area"
        ],
        "tags": {
--- a/data/presets/presets/natural/spring.json
+++ b/data/presets/presets/natural/spring.json
@@ -1,7 +1,7 @@
 {
    "name": "spring",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "vertex"
        ],
--- a/data/presets/presets/natural/tree.json
+++ b/data/presets/presets/natural/tree.json
@@ -1,7 +1,7 @@
 {
    "name": "tree",
    "match": {
-        "type": [
+        "geometry": [
            "point",
            "vertex"
        ],
--- a/data/presets/presets/natural/water.json
+++ b/data/presets/presets/natural/water.json
@@ -1,7 +1,7 @@
 {
    "name": "water",
    "match": {
-        "type": [
+        "geometry": [
            "area"
        ],
        "tags": {
--- a/data/presets/presets/natural/water/lake.json
+++ b/data/presets/presets/natural/water/lake.json
@@ -1,7 +1,7 @@
 {
    "name": "lake",
    "match": {
-        "type": [
+        "geometry": [
            "area"
        ],
        "tags": {
--- a/data/presets/presets/natural/water/pond.json
+++ b/data/presets/presets/natural/water/pond.json
@@ -1,7 +1,7 @@
 {
    "name": "pond",
    "match": {
-        "type": [
+        "geometry": [
            "area"
        ],
        "tags": {
--- a/Show More
+++ b/Show More