From 3fad3513c1363a06289d1f58fb31e1a411f1ead0 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 26 Apr 2019 16:05:10 -0700
Subject: [PATCH 01/23] Don't zoom to the feature and remove hover-highlighting
 upon clicking the issue fix button in the issues pane

---
 modules/ui/issues.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/ui/issues.js b/modules/ui/issues.js
index 7c41a25f1..ebaea9816 100644
--- a/modules/ui/issues.js
+++ b/modules/ui/issues.js
@@ -144,7 +144,12 @@ export function uiIssues(context) {
                     .datum(d.autoFix)  // set button datum to the autofix
                     .attr('class', 'autofix action')
                     .on('click', function(d) {
-                        utilHighlightEntities(d.entityIds, false, context);
+                        d3_event.preventDefault();
+                        d3_event.stopPropagation();
+
+                        var issuesEntityIDs = d.issue.entities.map(function(e) { return e.id; });
+                        utilHighlightEntities(issuesEntityIDs.concat(d.entityIds), false, context);
+
                         context.perform.apply(context, d.autoArgs);
                         context.validator().validate();
                     })

From ea05d4e6726ae7d8f905ac90898c7a41e2fc35e1 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 26 Apr 2019 16:26:19 -0700
Subject: [PATCH 02/23] Unhighlight features when clicking issue quick fix
 (close #6219)

---
 modules/ui/entity_issues.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/ui/entity_issues.js b/modules/ui/entity_issues.js
index b8122aec8..c0d493b71 100644
--- a/modules/ui/entity_issues.js
+++ b/modules/ui/entity_issues.js
@@ -189,7 +189,8 @@ export function uiEntityIssues(context) {
             })
             .on('click', function(d) {
                 if (d.onClick) {
-                    utilHighlightEntities(d.entityIds, false, context);
+                    var issueEntityIDs = d.issue.entities.map(function(e) { return e.id; });
+                    utilHighlightEntities(issueEntityIDs.concat(d.entityIds), false, context);
                     d.onClick();
                     context.validator().validate();
                 }

From 1bb0a6a0bcd80b6905aa11dba5aa7e1634292f5d Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 26 Apr 2019 16:40:53 -0700
Subject: [PATCH 03/23] Add Fishing field to Pier preset Deprecate
 shop=money_transfer

---
 data/deprecated.json                    | 4 ++++
 data/presets/presets.json               | 2 +-
 data/presets/presets/man_made/pier.json | 1 +
 data/taginfo.json                       | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/deprecated.json b/data/deprecated.json
index 0da58f2c2..177541708 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -597,6 +597,10 @@
       "old": {"shop": "luggage"},
       "replace": {"shop": "bag"}
     },
+    {
+      "old": {"shop": "money_transfer"},
+      "replace": {"amenity": "money_transfer"}
+    },
     {
       "old": {"shop": "moneylender"},
       "replace": {"shop": "money_lender"}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6cb831b77..3cc95ca3f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -668,7 +668,7 @@
     "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator", "manufacturer"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
     "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
     "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
-    "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["incline", "{highway/footway}"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "addTags": {"highway": "footway", "man_made": "pier"}, "removeTags": {"highway": "footway", "man_made": "pier"}, "name": "Pier"},
+    "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["fishing", "incline", "{highway/footway}"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "addTags": {"highway": "footway", "man_made": "pier"}, "removeTags": {"highway": "footway", "man_made": "pier"}, "name": "Pier"},
     "man_made/pier/floating": {"icon": "temaki-pedestrian", "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier", "floating": "yes"}, "addTags": {"highway": "footway", "man_made": "pier", "floating": "yes"}, "removeTags": {"highway": "footway", "man_made": "pier", "floating": "yes"}, "name": "Floating Pier"},
     "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
     "man_made/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "removeTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground Pipeline"},
diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json
index 5b0b3bc0d..4b40d83dd 100644
--- a/data/presets/presets/man_made/pier.json
+++ b/data/presets/presets/man_made/pier.json
@@ -9,6 +9,7 @@
         "lit"
     ],
     "moreFields": [
+        "fishing",
         "incline",
         "{highway/footway}"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index d24ea0bc3..e69b2e9c0 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1828,6 +1828,7 @@
     {"key": "shop", "value": "gallery", "description": "🄳 ➜ shop=art"},
     {"key": "shop", "value": "lingerie", "description": "🄳 ➜ shop=clothes + clothes=underwear"},
     {"key": "shop", "value": "luggage", "description": "🄳 ➜ shop=bag"},
+    {"key": "shop", "value": "money_transfer", "description": "🄳 ➜ amenity=money_transfer"},
     {"key": "shop", "value": "moneylender", "description": "🄳 ➜ shop=money_lender"},
     {"key": "shop", "value": "organic", "description": "🄳 ➜ shop=supermarket + organic=only"},
     {"key": "shop", "value": "perfume", "description": "🄳 ➜ shop=perfumery"},

From bdb5add98248d73655bc5e3c6b07fb2b539ce1cf Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Sat, 27 Apr 2019 15:36:14 +0200
Subject: [PATCH 04/23] Add aerialway=j-bar to presets

---
 data/presets/presets/aerialway/j-bar.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 data/presets/presets/aerialway/j-bar.json

diff --git a/data/presets/presets/aerialway/j-bar.json b/data/presets/presets/aerialway/j-bar.json
new file mode 100644
index 000000000..530f023d4
--- /dev/null
+++ b/data/presets/presets/aerialway/j-bar.json
@@ -0,0 +1,17 @@
+{
+    "geometry": [
+        "line"
+    ],
+    "fields": [
+        "name",
+        "aerialway/capacity",
+        "aerialway/duration"
+    ],
+    "terms": [
+        "jbar"
+    ],
+    "tags": {
+        "aerialway": "j-bar"
+    },
+    "name": "J-bar Lift"
+}

From c812d11c03b208743adbf249ce4ecbffe6edd9ff Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Sat, 27 Apr 2019 17:07:39 -0700
Subject: [PATCH 05/23] Deprecate "todo" and "TODO" tags in favor of "fixme"
 (re: #6214)

---
 data/deprecated.json | 8 ++++++++
 data/taginfo.json    | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/data/deprecated.json b/data/deprecated.json
index 177541708..c22c72da9 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -677,6 +677,14 @@
       "old": {"theatre:type": "amphitheatre"},
       "replace": {"theatre:type": "amphi"}
     },
+    {
+      "old": {"todo": "*"},
+      "replace": {"fixme": "$1"}
+    },
+    {
+      "old": {"TODO": "*"},
+      "replace": {"fixme": "$1"}
+    },
     {
       "old": {"toilets:disposal": "longdrop"},
       "replace": {"toilets:disposal": "pitlatrine"}
diff --git a/data/taginfo.json b/data/taginfo.json
index e69b2e9c0..4107eaa66 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1848,6 +1848,8 @@
     {"key": "sloped_curb", "value": "no", "description": "🄳 ➜ kerb=raised"},
     {"key": "sloped_curb", "value": "yes", "description": "🄳 ➜ kerb=lowered"},
     {"key": "theatre:type", "value": "amphitheatre", "description": "🄳 ➜ theatre:type=amphi"},
+    {"key": "todo", "description": "🄳 ➜ fixme=*"},
+    {"key": "TODO", "description": "🄳 ➜ fixme=*"},
     {"key": "toilets:disposal", "value": "longdrop", "description": "🄳 ➜ toilets:disposal=pitlatrine"},
     {"key": "toilets:disposal", "value": "pit_latrine", "description": "🄳 ➜ toilets:disposal=pitlatrine"},
     {"key": "tourism", "value": "bed_and_breakfast", "description": "🄳 ➜ tourism=guest_house + guest_house=bed_and_breakfast"},

From 061f61e7ddff8d120b785b9e7b110bb4f7c11089 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Sat, 27 Apr 2019 17:07:57 -0700
Subject: [PATCH 06/23] Add derived data for j-bar preset

---
 data/presets.yaml         | 5 +++++
 data/presets/presets.json | 1 +
 data/taginfo.json         | 1 +
 dist/locales/en.json      | 4 ++++
 4 files changed, 11 insertions(+)

diff --git a/data/presets.yaml b/data/presets.yaml
index bc9fcd248..871484db1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2302,6 +2302,11 @@ en:
         # aerialway=goods
         name: Goods Aerialway
         terms: '<translate with synonyms or related terms for ''Goods Aerialway'', separated by commas>'
+      aerialway/j-bar:
+        # aerialway=j-bar
+        name: J-bar Lift
+        # 'terms: jbar'
+        terms: '<translate with synonyms or related terms for ''J-bar Lift'', separated by commas>'
       aerialway/magic_carpet:
         # aerialway=magic_carpet
         name: Magic Carpet Lift
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3cc95ca3f..d8b278a04 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -30,6 +30,7 @@
     "aerialway/drag_lift": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "drag_lift"}, "name": "Drag Lift"},
     "aerialway/gondola": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "gondola"}, "name": "Gondola"},
     "aerialway/goods": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "goods"}, "name": "Goods Aerialway"},
+    "aerialway/j-bar": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["jbar"], "tags": {"aerialway": "j-bar"}, "name": "J-bar Lift"},
     "aerialway/magic_carpet": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "magic_carpet"}, "name": "Magic Carpet Lift"},
     "aerialway/mixed_lift": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "mixed_lift"}, "name": "Mixed Lift"},
     "aerialway/platter": {"geometry": ["line"], "terms": ["button lift", "poma lift"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "platter"}, "name": "Platter Lift"},
diff --git a/data/taginfo.json b/data/taginfo.json
index 4107eaa66..d918edfc0 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -33,6 +33,7 @@
     {"key": "aerialway", "value": "drag_lift", "description": "🄿 Drag Lift", "object_types": ["way"]},
     {"key": "aerialway", "value": "gondola", "description": "🄿 Gondola", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/aerialway-15.svg?sanitize=true"},
     {"key": "aerialway", "value": "goods", "description": "🄿 Goods Aerialway", "object_types": ["way"]},
+    {"key": "aerialway", "value": "j-bar", "description": "🄿 J-bar Lift", "object_types": ["way"]},
     {"key": "aerialway", "value": "magic_carpet", "description": "🄿 Magic Carpet Lift", "object_types": ["way"]},
     {"key": "aerialway", "value": "mixed_lift", "description": "🄿 Mixed Lift", "object_types": ["way"]},
     {"key": "aerialway", "value": "platter", "description": "🄿 Platter Lift", "object_types": ["way"]},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 983f64180..17ed154d1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4334,6 +4334,10 @@
                     "name": "Goods Aerialway",
                     "terms": ""
                 },
+                "aerialway/j-bar": {
+                    "name": "J-bar Lift",
+                    "terms": "jbar"
+                },
                 "aerialway/magic_carpet": {
                     "name": "Magic Carpet Lift",
                     "terms": ""

From 20d75a58218879368d9a87c185cbadaf24068ff2 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Sat, 27 Apr 2019 17:31:29 -0700
Subject: [PATCH 07/23] Deprecate lawyer=notary (re: #6248)

---
 data/deprecated.json | 4 ++++
 data/taginfo.json    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/deprecated.json b/data/deprecated.json
index c22c72da9..4e9d137ad 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -407,6 +407,10 @@
       "old": {"landuse": "wood"},
       "replace": {"natural": "wood"}
     },
+    {
+      "old": {"lawyer": "notary"},
+      "replace": {"office": "notary"}
+    },
     {
       "old": {"leisure": "beach"},
       "replace": {"natural": "beach"}
diff --git a/data/taginfo.json b/data/taginfo.json
index d918edfc0..c1048fe15 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -734,7 +734,7 @@
     {"key": "office", "value": "insurance", "description": "🄿 Insurance Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "it", "description": "🄿 Information Technology Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "lawyer", "description": "🄿 Law Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-balance-scale.svg?sanitize=true"},
-    {"key": "lawyer", "value": "notary", "description": "🄿 Notary Office (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
+    {"key": "lawyer", "value": "notary", "description": "🄿 Notary Office (unsearchable), 🄳 ➜ office=notary", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "moving_company", "description": "🄿 Moving Company Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-people-carry.svg?sanitize=true"},
     {"key": "office", "value": "newspaper", "description": "🄿 Newspaper Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-newspaper.svg?sanitize=true"},
     {"key": "office", "value": "ngo", "description": "🄿 NGO Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},

From 5a17379c9c450a21d5ac844e23829f883d0f20ec Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Sun, 28 Apr 2019 17:52:51 +0200
Subject: [PATCH 08/23] Deprecate amenity=dancing_school

Also deprecated in the wiki and a replacement is available, see https://wiki.openstreetmap.org/wiki/Tag%3Aamenity%3Ddancing_school
---
 data/deprecated.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/deprecated.json b/data/deprecated.json
index 4e9d137ad..9614f1768 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -28,6 +28,10 @@
       "old": {"amenity": "community_center"},
       "replace": {"amenity": "community_centre"}
     },
+    {
+      "old": {"amenity": "dancing_school"},
+      "replace": {"leisure": "dance", "dance:teaching": "yes" }
+    },
     {
       "old": {"amenity": "dog_bin"},
       "replace": {"amenity": "waste_basket", "waste": "dog_excrement"}

From b5e87cadfb1a8df17501d5d65fb8e1ebead579d4 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Sun, 28 Apr 2019 18:10:12 +0200
Subject: [PATCH 09/23] Deprecate amenity/leisure=club/social_club

See https://wiki.openstreetmap.org/wiki/Key%3Aclub , club is documented as a top-level tag
---
 data/deprecated.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/data/deprecated.json b/data/deprecated.json
index 4e9d137ad..ec0e2099e 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -24,6 +24,10 @@
       "old": {"amenity": "citymap_post"},
       "replace": {"tourism": "information"}
     },
+    {
+      "old": {"amenity": "club"},
+      "replace": {"club": "*"}
+    },
     {
       "old": {"amenity": "community_center"},
       "replace": {"amenity": "community_centre"}
@@ -108,6 +112,10 @@
       "old": {"amenity": "sloped_curb"},
       "replace": {"kerb": "lowered"}
     },
+    {
+      "old": {"amenity": "social_club"},
+      "replace": {"club": "*"}
+    },
     {
       "old": {"amenity": "swimming_pool"},
       "replace": {"leisure": "swimming_pool"}
@@ -419,6 +427,10 @@
       "old": {"leisure": "club"},
       "replace": {"club": "*"}
     },
+    {
+      "old": {"leisure": "social_club"},
+      "replace": {"club": "*"}
+    },
     {
       "old": {"leisure": "video_arcade"},
       "replace": {"leisure": "amusement_arcade"}

From d3df05b9c26e3d0ac3833fd94f9a2fcc4d67c8ba Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sun, 28 Apr 2019 18:43:56 +0200
Subject: [PATCH 10/23] Add preset for building=hangar

Make the hangar building preset have a lower matchScore so that first the aeroway=hangar is found
---
 data/presets/presets/aeroway/hangar.json  |  8 ++++++++
 data/presets/presets/building/hangar.json | 13 +++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 data/presets/presets/building/hangar.json

diff --git a/data/presets/presets/aeroway/hangar.json b/data/presets/presets/aeroway/hangar.json
index 5f8c2ae64..4fe765ede 100644
--- a/data/presets/presets/aeroway/hangar.json
+++ b/data/presets/presets/aeroway/hangar.json
@@ -9,5 +9,13 @@
     "tags": {
         "aeroway": "hangar"
     },
+    "addTags": {
+        "building": "hangar",
+        "aeroway": "hangar"
+    },
+    "removeTags": {
+        "building": "hangar",
+        "aeroway": "hangar"
+    },
     "name": "Hangar"
 }
diff --git a/data/presets/presets/building/hangar.json b/data/presets/presets/building/hangar.json
new file mode 100644
index 000000000..feaf4259d
--- /dev/null
+++ b/data/presets/presets/building/hangar.json
@@ -0,0 +1,13 @@
+{
+    "fields": [
+        "name"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "hangar"
+    },
+    "matchScore": 0.5,
+    "name": "Hangar building"
+}

From 54612a168e818fd30b1b12e1d043a17e50bbbce6 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sun, 28 Apr 2019 18:56:07 +0200
Subject: [PATCH 11/23] Add shop=general for general store

---
 data/presets/presets/shop/general.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 data/presets/presets/shop/general.json

diff --git a/data/presets/presets/shop/general.json b/data/presets/presets/shop/general.json
new file mode 100644
index 000000000..f79ee8da0
--- /dev/null
+++ b/data/presets/presets/shop/general.json
@@ -0,0 +1,12 @@
+{
+    "icon": "maki-shop",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "general"
+    },
+    "terms": ["village shop"],
+    "name": "General store"
+}

From 98827f60173a36bbba018149fca18c4952ae0363 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sun, 28 Apr 2019 21:41:44 +0200
Subject: [PATCH 12/23] Add man_made=dyke preset

---
 data/presets/presets/man_made/dyke.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 data/presets/presets/man_made/dyke.json

diff --git a/data/presets/presets/man_made/dyke.json b/data/presets/presets/man_made/dyke.json
new file mode 100644
index 000000000..4307ca3c2
--- /dev/null
+++ b/data/presets/presets/man_made/dyke.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "man_made": "dyke"
+    },
+    "terms": [
+        "Dike", "Dyke", "Floodbank", "Stopbank"
+    ]
+    "name": "Levee"
+}

From 77a6174d368a595d8a97fb761ede70fe6cf85026 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sun, 28 Apr 2019 21:42:27 +0200
Subject: [PATCH 13/23] add missing ","

---
 data/presets/presets/man_made/dyke.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/presets/man_made/dyke.json b/data/presets/presets/man_made/dyke.json
index 4307ca3c2..88304126c 100644
--- a/data/presets/presets/man_made/dyke.json
+++ b/data/presets/presets/man_made/dyke.json
@@ -7,6 +7,6 @@
     },
     "terms": [
         "Dike", "Dyke", "Floodbank", "Stopbank"
-    ]
+    ],
     "name": "Levee"
 }

From 6cd015901b110ef1e17701fe06574dfa90eaa33a Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sun, 28 Apr 2019 22:00:18 +0200
Subject: [PATCH 14/23] add man_made=beacon preset

---
 data/presets/presets/man_made/beacon.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 data/presets/presets/man_made/beacon.json

diff --git a/data/presets/presets/man_made/beacon.json b/data/presets/presets/man_made/beacon.json
new file mode 100644
index 000000000..abba520cc
--- /dev/null
+++ b/data/presets/presets/man_made/beacon.json
@@ -0,0 +1,18 @@
+{
+    "fields": [
+        "name",
+        "height"
+    ],
+    "moreFields": [
+        "seamark/type"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "man_made": "beacon"
+    },
+    "name": "Beacon",
+    "matchScore": 0.5
+}

From 1a890c3860137ffb3a40aaf515cb7c6e978f12ab Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Sun, 28 Apr 2019 22:28:24 +0200
Subject: [PATCH 15/23] Add castle tower preset

See https://wiki.openstreetmap.org/wiki/Tag%3Atower%3Atype%3Ddefensive , used 3800+ times
---
 .../presets/man_made/tower/defensive.json     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 data/presets/presets/man_made/tower/defensive.json

diff --git a/data/presets/presets/man_made/tower/defensive.json b/data/presets/presets/man_made/tower/defensive.json
new file mode 100644
index 000000000..93cbaed89
--- /dev/null
+++ b/data/presets/presets/man_made/tower/defensive.json
@@ -0,0 +1,20 @@
+{
+    "icon": "maki-castle",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "man_made": "tower",
+        "tower:type": "defensive"
+    },
+    "reference": {
+        "key": "tower:type",
+        "value": "defensive"
+    },
+    "terms": [
+        "Defensive tower",
+        "Castle tower"
+    ],
+    "name": "Fortified tower"
+}

From 773c35b2cb2fda8f2816288c0e83702fdcf51eed Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Sun, 28 Apr 2019 22:45:33 +0200
Subject: [PATCH 16/23] Add tourism information terminal preset

Used 5k+ times, see https://wiki.openstreetmap.org/wiki/Tag:information%3Dterminal
---
 .../presets/tourism/information/terminal.json | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 data/presets/presets/tourism/information/terminal.json

diff --git a/data/presets/presets/tourism/information/terminal.json b/data/presets/presets/tourism/information/terminal.json
new file mode 100644
index 000000000..862f43b40
--- /dev/null
+++ b/data/presets/presets/tourism/information/terminal.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-information",
+    "fields": [
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "tourism": "information",
+        "information": "terminal"
+    },
+    "reference": {
+        "key": "information",
+        "value": "terminal"
+    },
+    "name": "Information Terminal"
+}

From cebf05823e3c807087b832affaba8da1f120397b Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Sun, 28 Apr 2019 23:52:30 +0200
Subject: [PATCH 17/23] Mention reference in the readme for presets

---
 data/presets/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/data/presets/README.md b/data/presets/README.md
index 7eb8094ff..1f313c3aa 100644
--- a/data/presets/README.md
+++ b/data/presets/README.md
@@ -199,6 +199,17 @@ The ID of a preset that is preferable to this one. iD's validator will flag feat
 
 When possible, use `deprecated.json` instead to specify upgrade paths for old tags. This property is meant for special cases, such as upgrades with geometry requirements.
 
+##### `reference`
+
+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, 
+```javascript
+"reference": {
+    "key": "tower:type",
+    "value": "communication"
+}
+```
 
 ## Fields
 

From 8bab697ca97cf1414146c74a3b2dde633567e452 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Mon, 29 Apr 2019 00:11:30 +0200
Subject: [PATCH 18/23] Capitalize General Store

---
 data/presets/presets/shop/general.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/presets/shop/general.json b/data/presets/presets/shop/general.json
index f79ee8da0..3ce303078 100644
--- a/data/presets/presets/shop/general.json
+++ b/data/presets/presets/shop/general.json
@@ -8,5 +8,5 @@
         "shop": "general"
     },
     "terms": ["village shop"],
-    "name": "General store"
+    "name": "General Store"
 }

From 554c6cd9c8d6098c3dc6928d96e53b66c317c16e Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Mon, 29 Apr 2019 00:12:17 +0200
Subject: [PATCH 19/23] Capitalize Hangar Building

---
 data/presets/presets/building/hangar.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/presets/building/hangar.json b/data/presets/presets/building/hangar.json
index feaf4259d..9faff8227 100644
--- a/data/presets/presets/building/hangar.json
+++ b/data/presets/presets/building/hangar.json
@@ -9,5 +9,5 @@
         "building": "hangar"
     },
     "matchScore": 0.5,
-    "name": "Hangar building"
+    "name": "Hangar Building"
 }

From 7a2b4618e5d97b7606b407507a58f8d94a2daaf2 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Mon, 29 Apr 2019 00:12:55 +0200
Subject: [PATCH 20/23] Capitalize Tower

---
 data/presets/presets/man_made/tower/defensive.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/presets/presets/man_made/tower/defensive.json b/data/presets/presets/man_made/tower/defensive.json
index 93cbaed89..9b3ffbaa5 100644
--- a/data/presets/presets/man_made/tower/defensive.json
+++ b/data/presets/presets/man_made/tower/defensive.json
@@ -13,8 +13,8 @@
         "value": "defensive"
     },
     "terms": [
-        "Defensive tower",
-        "Castle tower"
+        "Defensive Tower",
+        "Castle Tower"
     ],
-    "name": "Fortified tower"
+    "name": "Fortified Tower"
 }

From 28444a4b251fe5e88d34198bf747b4d5624d6bfc Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Mon, 29 Apr 2019 00:13:22 +0200
Subject: [PATCH 21/23] Capitalize Village Shop

---
 data/presets/presets/shop/general.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/presets/shop/general.json b/data/presets/presets/shop/general.json
index 3ce303078..07c330e21 100644
--- a/data/presets/presets/shop/general.json
+++ b/data/presets/presets/shop/general.json
@@ -7,6 +7,6 @@
     "tags": {
         "shop": "general"
     },
-    "terms": ["village shop"],
+    "terms": ["Village Shop"],
     "name": "General Store"
 }

From 94b0376ccf10189d9966a61ba5dcfe46b5724514 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 29 Apr 2019 10:21:31 -0700
Subject: [PATCH 22/23] Add building fields to more building presets (re:
 #6238)

---
 data/presets/presets.json                     | 12 ++++++------
 data/presets/presets/building/carport.json    |  2 +-
 data/presets/presets/building/garage.json     |  2 +-
 data/presets/presets/building/garages.json    |  2 +-
 data/presets/presets/building/grandstand.json |  4 ----
 data/presets/presets/building/hut.json        |  3 ---
 data/presets/presets/building/roof.json       |  3 +--
 7 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index d8b278a04..a04b2e0fd 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -291,7 +291,7 @@
     "building/boathouse": {"icon": "maki-harbor", "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"},
     "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
     "building/cabin": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"},
-    "building/carport": {"icon": "fas-warehouse", "fields": ["height", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"},
+    "building/carport": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"},
     "building/cathedral": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"},
     "building/chapel": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "chapel"}, "matchScore": 0.5, "name": "Chapel Building"},
     "building/church": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"},
@@ -303,14 +303,14 @@
     "building/dormitory": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "dormitory"}, "matchScore": 0.5, "name": "Dormitory"},
     "building/farm_auxiliary": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm_auxiliary"}, "matchScore": 0.5, "name": "Farm Building"},
     "building/farm": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm"}, "matchScore": 0.5, "name": "Farm House"},
-    "building/garage": {"icon": "fas-warehouse", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"building": "garage"}, "matchScore": 0.5, "name": "Garage"},
-    "building/garages": {"icon": "fas-warehouse", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"building": "garages"}, "matchScore": 0.5, "name": "Garages"},
-    "building/grandstand": {"icon": "maki-building", "fields": ["name", "height"], "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"},
+    "building/garage": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "garage"}, "matchScore": 0.5, "name": "Garage"},
+    "building/garages": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "garages"}, "matchScore": 0.5, "name": "Garages"},
+    "building/grandstand": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"},
     "building/greenhouse": {"icon": "maki-garden-centre", "geometry": ["area"], "tags": {"building": "greenhouse"}, "matchScore": 0.5, "name": "Greenhouse"},
     "building/hospital": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"},
     "building/hotel": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"},
     "building/house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "house"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "House"},
-    "building/hut": {"icon": "maki-home", "fields": ["name"], "geometry": ["area"], "tags": {"building": "hut"}, "matchScore": 0.5, "name": "Hut"},
+    "building/hut": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "hut"}, "matchScore": 0.5, "name": "Hut"},
     "building/industrial": {"icon": "maki-industry", "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial Building"},
     "building/kindergarten": {"icon": "maki-building", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"},
     "building/mosque": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"},
@@ -318,7 +318,7 @@
     "building/public": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "public"}, "matchScore": 0.5, "name": "Public Building"},
     "building/residential": {"icon": "maki-residential-community", "geometry": ["area"], "tags": {"building": "residential"}, "matchScore": 0.5, "name": "Residential Building"},
     "building/retail": {"icon": "maki-commercial", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "retail"}, "matchScore": 0.5, "name": "Retail Building"},
-    "building/roof": {"icon": "maki-shelter", "fields": ["name", "address", "layer"], "geometry": ["area"], "tags": {"building": "roof"}, "matchScore": 0.5, "name": "Roof"},
+    "building/roof": {"icon": "maki-shelter", "fields": ["{building}", "layer"], "geometry": ["area"], "tags": {"building": "roof"}, "matchScore": 0.5, "name": "Roof"},
     "building/ruins": {"icon": "temaki-ruins", "geometry": ["area"], "tags": {"building": "ruins"}, "matchScore": 0.5, "name": "Building Ruins"},
     "building/school": {"icon": "maki-building", "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"},
     "building/semidetached_house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "semidetached_house"}, "terms": ["home", "double", "duplex", "twin", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Semi-Detached House"},
diff --git a/data/presets/presets/building/carport.json b/data/presets/presets/building/carport.json
index 06aa5a79c..dac54e2d0 100644
--- a/data/presets/presets/building/carport.json
+++ b/data/presets/presets/building/carport.json
@@ -1,7 +1,7 @@
 {
     "icon": "fas-warehouse",
     "fields": [
-        "height",
+        "{building}",
         "capacity"
     ],
     "geometry": [
diff --git a/data/presets/presets/building/garage.json b/data/presets/presets/building/garage.json
index 8cc77f8b5..1e20eb4bd 100644
--- a/data/presets/presets/building/garage.json
+++ b/data/presets/presets/building/garage.json
@@ -1,7 +1,7 @@
 {
     "icon": "fas-warehouse",
     "fields": [
-        "name",
+        "{building}",
         "capacity"
     ],
     "geometry": [
diff --git a/data/presets/presets/building/garages.json b/data/presets/presets/building/garages.json
index 79a6d7933..887a264f2 100644
--- a/data/presets/presets/building/garages.json
+++ b/data/presets/presets/building/garages.json
@@ -1,7 +1,7 @@
 {
     "icon": "fas-warehouse",
     "fields": [
-        "name",
+        "{building}",
         "capacity"
     ],
     "geometry": [
diff --git a/data/presets/presets/building/grandstand.json b/data/presets/presets/building/grandstand.json
index 46b41c563..e27f052a5 100644
--- a/data/presets/presets/building/grandstand.json
+++ b/data/presets/presets/building/grandstand.json
@@ -1,9 +1,5 @@
 {
     "icon": "maki-building",
-    "fields": [
-        "name",
-        "height"
-    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/building/hut.json b/data/presets/presets/building/hut.json
index 6e0335f34..5693655d2 100644
--- a/data/presets/presets/building/hut.json
+++ b/data/presets/presets/building/hut.json
@@ -1,8 +1,5 @@
 {
     "icon": "maki-home",
-    "fields": [
-        "name"
-    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/building/roof.json b/data/presets/presets/building/roof.json
index 3df90136c..b419deb93 100644
--- a/data/presets/presets/building/roof.json
+++ b/data/presets/presets/building/roof.json
@@ -1,8 +1,7 @@
 {
     "icon": "maki-shelter",
     "fields": [
-        "name",
-        "address",
+        "{building}",
         "layer"
     ],
     "geometry": [

From aff50def815b6848fdfefaa52cea91e5434dae1c Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 29 Apr 2019 10:38:58 -0700
Subject: [PATCH 23/23] Don't recommend `public_transport:version` for
 `public_transport=stop_area` (close #6250)

---
 data/presets/presets.json                            |  2 +-
 data/presets/presets/public_transport/stop_area.json | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3ae8db3ac..e8800da0b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -866,7 +866,7 @@
     "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Station"},
     "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "removeTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Station / Terminal"},
     "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
-    "public_transport/stop_area": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "addTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "removeTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"},
+    "public_transport/stop_area": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"},
     "public_transport/stop_position_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stopping Location"},
     "public_transport/stop_position_bus": {"icon": "maki-bus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "bus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stopping Location"},
     "public_transport/stop_position_ferry": {"icon": "maki-ferry", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["boat", "dock", "ferry", "pier", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stopping Location"},
diff --git a/data/presets/presets/public_transport/stop_area.json b/data/presets/presets/public_transport/stop_area.json
index 00396e5e9..f7e302169 100644
--- a/data/presets/presets/public_transport/stop_area.json
+++ b/data/presets/presets/public_transport/stop_area.json
@@ -13,16 +13,6 @@
         "type": "public_transport",
         "public_transport": "stop_area"
     },
-    "addTags": {
-        "type": "public_transport",
-        "public_transport": "stop_area",
-        "public_transport:version": "2"
-    },
-    "removeTags": {
-        "type": "public_transport",
-        "public_transport": "stop_area",
-        "public_transport:version": "2"
-    },
     "reference": {
         "key": "public_transport",
         "value": "stop_area"