From a7dd6db8a7c766b033ab1ba9e7853527868a9f49 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 11 Dec 2019 10:31:33 -0500
Subject: [PATCH] Use `tunnel=culvert` on waterways when using the "add a
 tunnel" crossing ways fix (re: #6617)

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

diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js
index b271b4444..cfd129680 100644
--- a/modules/validations/crossing_ways.js
+++ b/modules/validations/crossing_ways.js
@@ -550,7 +550,12 @@ export function validationCrossingWays(context) {
                         tags.bridge = 'yes';
                         tags.layer = '1';
                     } else {
-                        tags.tunnel = 'yes';
+                        var tunnelValue = 'yes';
+                        if (getFeatureTypeForTags(tags) === 'waterway') {
+                            // use `tunnel=culvert` for waterways by default
+                            tunnelValue = 'culvert';
+                        }
+                        tags.tunnel = tunnelValue;
                         tags.layer = '-1';
                     }
                     // apply the structure tags to the way