From b62fe3d87dcf3d0979aba1d78d1a2d78955ff312 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Sun, 17 May 2020 16:22:15 -0400
Subject: [PATCH] Clarify scope of deprecations from #7514

---
 data/deprecated.json | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/data/deprecated.json b/data/deprecated.json
index 3757e5e17..fe483061f 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -1328,14 +1328,29 @@
     "replace": {"volcano:status": "extinct"}
   },
   {
-    "old": {"type": "gas",},
-    "replace": {"substance": "gas"}
-  }, 
-  {
-    "old": {"type": "oil",},
-    "replace": {"substance": "oil"}
+    "old": {"type": "gas", "man_made": "pipeline"},
+    "replace": {"substance": "gas", "man_made": "pipeline"}
+  },
+  {
+    "old": {"type": "gas", "man_made": "pumping_rig"},
+    "replace": {"substance": "gas", "man_made": "pumping_rig"}
+  },
+  {
+    "old": {"type": "gas", "pipeline": "*"},
+    "replace": {"substance": "gas", "pipeline": "$1"}
+  },
+  {
+    "old": {"type": "oil", "man_made": "pipeline"},
+    "replace": {"substance": "oil", "man_made": "pipeline"}
+  },
+  {
+    "old": {"type": "oil", "man_made": "pumping_rig"},
+    "replace": {"substance": "oil", "man_made": "pumping_rig"}
+  },
+  {
+    "old": {"type": "oil", "pipeline": "*"},
+    "replace": {"substance": "oil", "pipeline": "$1"}
   },
-    
   {
     "old": {"type": "scoria"},
     "replace": {"volcano:type": "scoria"}
@@ -1353,9 +1368,17 @@
     "replace": {"studio": "video"}
   },
   {
-    "old": {"type": "water",},
-    "replace": {"substance": "water"}
-  },    
+    "old": {"type": "water", "man_made": "pipeline"},
+    "replace": {"substance": "water", "man_made": "pipeline"}
+  },
+  {
+    "old": {"type": "water", "man_made": "reservoir_covered"},
+    "replace": {"content": "water", "man_made": "reservoir_covered"}
+  },
+  {
+    "old": {"type": "water", "pipeline": "*"},
+    "replace": {"substance": "water", "pipeline": "$1"}
+  },
   {
     "old": {"unnamed": "*"},
     "replace": {"noname": "$1"}