Don't require man_made=pipeline on pipeline=valve (re: #6393)

openstreetmap · Oct 24, 2019 · af4e59f · af4e59f
1 parent 889ec37
commit af4e59f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/data/presets.yaml b/data/presets.yaml
@@ -5969,7 +5969,7 @@ en:
         # 'terms: oil,natural gas,water,sewer,sewage'
         terms: '<translate with synonyms or related terms for ''Underground Pipeline'', separated by commas>'
       man_made/pipeline/valve:
-        # 'man_made=pipeline, pipeline=valve'
+        # pipeline=valve
         name: Pipeline Valve
         # 'terms: oil,natural gas,water,sewer,sewage'
         terms: '<translate with synonyms or related terms for ''Pipeline Valve'', separated by commas>'

diff --git a/data/presets/presets.json b/data/presets/presets.json
@@ -750,7 +750,7 @@
     "man_made/pier/floating": {"icon": "temaki-pedestrian", "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"},
     "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"}, "name": "Underground Pipeline"},
-    "man_made/pipeline/valve": {"icon": "temaki-wheel", "geometry": ["vertex"], "fields": ["ref", "operator", "valve", "location", "diameter"], "moreFields": ["colour", "manufacturer", "material"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "pipeline": "valve"}, "name": "Pipeline Valve"},
+    "man_made/pipeline/valve": {"icon": "temaki-wheel", "geometry": ["vertex"], "fields": ["ref", "operator", "valve", "location", "diameter"], "moreFields": ["colour", "manufacturer", "material"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"pipeline": "valve"}, "name": "Pipeline Valve"},
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
     "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
     "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},

diff --git a/data/presets/presets/man_made/pipeline/valve.json b/data/presets/presets/man_made/pipeline/valve.json
@@ -23,7 +23,6 @@
         "sewage"
     ],
     "tags": {
-        "man_made": "pipeline",
         "pipeline": "valve"
     },
     "name": "Pipeline Valve"