From f5ea983e283f7a6179b06558195a2486897216ea Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 4 Dec 2019 15:26:55 -0500
Subject: [PATCH] Add fields to `man_made=petroleum_well` Deprecate
 `man_made=gas_well` and `man_made=oil_well`

---
 data/deprecated.json                              | 8 ++++++++
 data/presets/presets.json                         | 2 +-
 data/presets/presets/man_made/petroleum_well.json | 6 ++++++
 data/taginfo.json                                 | 2 ++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/data/deprecated.json b/data/deprecated.json
index 1a8aab070..3c5a31325 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -623,6 +623,10 @@
       "old": {"man_made": "cut_line"},
       "replace": {"man_made": "cutline"}
     },
+    {
+      "old": {"man_made": "gas_well"},
+      "replace": {"man_made": "petroleum_well", "substance": "gas"}
+    },
     {
       "old": {"man_made": "jetty"},
       "replace": {"highway": "footway", "man_made": "pier"}
@@ -643,6 +647,10 @@
       "old": {"man_made": "oil_tank"},
       "replace": {"man_made": "storage_tank", "content": "oil"}
     },
+    {
+      "old": {"man_made": "oil_well"},
+      "replace": {"man_made": "petroleum_well", "substance": "oil"}
+    },
     {
       "old": {"man_made": "village_pump"},
       "replace": {"man_made": "water_well"}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8c492d251..8d7753d99 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -749,7 +749,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/obelisk": {"icon": "maki-monument", "fields": ["name", "inscription", "height", "material", "colour"], "geometry": ["point", "vertex", "area"], "tags": {"man_made": "obelisk"}, "name": "Obelisk"},
     "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
-    "man_made/petroleum_well": {"icon": "temaki-oil_well", "moreFields": ["gnis/feature_id"], "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/petroleum_well": {"icon": "temaki-oil_well", "fields": ["name", "ref", "operator", "substance"], "moreFields": ["gnis/feature_id"], "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-pier_fixed", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["{highway/footway}", "access", "fishing", "gnis/feature_id", "incline"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "name": "Pier"},
     "man_made/pier/floating": {"icon": "temaki-pier_floating", "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier", "floating": "yes"}, "name": "Floating Pier"},
     "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["operator", "location", "substance", "layer", "diameter"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
diff --git a/data/presets/presets/man_made/petroleum_well.json b/data/presets/presets/man_made/petroleum_well.json
index 4b094da65..4e3545da8 100644
--- a/data/presets/presets/man_made/petroleum_well.json
+++ b/data/presets/presets/man_made/petroleum_well.json
@@ -1,5 +1,11 @@
 {
     "icon": "temaki-oil_well",
+    "fields": [
+        "name",
+        "ref",
+        "operator",
+        "substance"
+    ],
     "moreFields": [
         "gnis/feature_id"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index 5d1d7c7e4..93cbea5d5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2029,11 +2029,13 @@
     {"key": "leisure", "value": "video_arcade", "description": "🄳 ➜ leisure=amusement_arcade"},
     {"key": "leisure", "value": "recreation_ground", "description": "🄳 ➜ landuse=recreation_ground"},
     {"key": "man_made", "value": "cut_line", "description": "🄳 ➜ man_made=cutline"},
+    {"key": "man_made", "value": "gas_well", "description": "🄳 ➜ man_made=petroleum_well + substance=gas"},
     {"key": "man_made", "value": "jetty", "description": "🄳 ➜ highway=footway + man_made=pier"},
     {"key": "man_made", "value": "mdf", "description": "🄳 ➜ telecom=exchange"},
     {"key": "man_made", "value": "MDF", "description": "🄳 ➜ telecom=exchange"},
     {"key": "man_made", "value": "fuel_storage_tank", "description": "🄳 ➜ man_made=storage_tank + content=fuel"},
     {"key": "man_made", "value": "oil_tank", "description": "🄳 ➜ man_made=storage_tank + content=oil"},
+    {"key": "man_made", "value": "oil_well", "description": "🄳 ➜ man_made=petroleum_well + substance=oil"},
     {"key": "man_made", "value": "village_pump", "description": "🄳 ➜ man_made=water_well"},
     {"key": "man_made", "value": "wastewater_tank", "description": "🄳 ➜ man_made=storage_tank + content=wastewater"},
     {"key": "man_made", "value": "water_tank", "description": "🄳 ➜ man_made=storage_tank + content=water"},