From f90eca852d01b2a08e7339e423d42830b7cfa50d Mon Sep 17 00:00:00 2001
From: Dan Stowell <danstowell@users.sourceforge.net>
Date: Mon, 1 Apr 2013 10:53:19 +0100
Subject: [PATCH 1/2] waterways: render tunnel=culvert like tunnel=yes (fixes
 #3341)

---
 inc/layer-water.xml.inc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/inc/layer-water.xml.inc b/inc/layer-water.xml.inc
index f819bc4..59000c2 100644
--- a/inc/layer-water.xml.inc
+++ b/inc/layer-water.xml.inc
@@ -177,14 +177,14 @@
       <LineSymbolizer stroke="#b5d0d0" stroke-width="1"/>
     </Rule>
     <Rule>
-      <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
+      <Filter>[waterway]='river' and ([tunnel] = 'yes' or [tunnel] = 'culvert')</Filter>
       &maxscale_zoom14;
       &minscale_zoom14;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="6" stroke-dasharray="4,2"/>
       <LineSymbolizer stroke="white" stroke-width="4"/>
       <TextSymbolizer size="10" fill="#6699cc" placement="line" minimum-distance="200" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule><Rule>
-      <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
+      <Filter>[waterway]='river' and ([tunnel] = 'yes' or [tunnel] = 'culvert')</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="7" stroke-dasharray="4,2"/>
@@ -192,7 +192,7 @@
       <TextSymbolizer size="10" fill="#6699cc" placement="line" minimum-distance="200" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
+      <Filter>[waterway]='river' and ([tunnel] = 'yes' or [tunnel] = 'culvert')</Filter>
       &maxscale_zoom17;
       &minscale_zoom17;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="11" stroke-dasharray="4,2"/>
@@ -200,14 +200,14 @@
       <TextSymbolizer size="10" fill="#6699cc" placement="line" minimum-distance="200" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
+      <Filter>[waterway]='river' and ([tunnel] = 'yes' or [tunnel] = 'culvert')</Filter>
       &maxscale_zoom18;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="13" stroke-dasharray="4,2"/>
       <LineSymbolizer stroke="white" stroke-width="9"/>
       <TextSymbolizer size="10" fill="#6699cc" placement="line" minimum-distance="200" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>[waterway]='canal' and [tunnel] = 'yes'</Filter>
+      <Filter>[waterway]='canal' and ([tunnel] = 'yes' or [tunnel] = 'culvert')</Filter>
       &maxscale_zoom14;
       &minscale_zoom16;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="7" stroke-dasharray="4,2"/>
@@ -215,14 +215,14 @@
       <TextSymbolizer size="9" fill="#6699cc" placement="line" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [disused]='yes')</Filter>
+      <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [tunnel] = 'culvert' or [disused]='yes')</Filter>
       &maxscale_zoom14;
       &minscale_zoom16;
       <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0" stroke-width="7" stroke-linecap="round"/>
       <TextSymbolizer size="9" fill="#6699cc" placement="line" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>[waterway]='canal' and [tunnel] = 'yes'</Filter>
+      <Filter>[waterway]='canal' and ([tunnel] = 'yes' or [tunnel] = 'culvert')</Filter>
       &maxscale_zoom17;
       &minscale_zoom18;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="11" stroke-dasharray="4,2"/>
@@ -230,14 +230,14 @@
       <TextSymbolizer size="9" fill="#6699cc" placement="line" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [disused]='yes' or [lock]='yes')</Filter>
+      <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [tunnel] = 'culvert' or [disused]='yes' or [lock]='yes')</Filter>
       &maxscale_zoom17;
       &minscale_zoom18;
       <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0" stroke-width="11" stroke-linecap="round"/>
       <TextSymbolizer size="9" fill="#6699cc" placement="line" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [disused]='yes') and [lock]='yes'</Filter>
+      <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [tunnel] = 'culvert' or [disused]='yes') and [lock]='yes'</Filter>
       &maxscale_zoom17;
       &minscale_zoom18;
       <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0" stroke-width="7" stroke-linecap="round"/>

From 9d00ef2d6f8939dd643bc7c3cf16d0c43dbacc1b Mon Sep 17 00:00:00 2001
From: Dan Stowell <danstowell@users.sourceforge.net>
Date: Sat, 8 Jun 2013 23:32:50 +0100
Subject: [PATCH 2/2] Also handle culvert for streams and ditches (thanks
 @xkomczax)

---
 inc/layer-water.xml.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/layer-water.xml.inc b/inc/layer-water.xml.inc
index 59000c2..8e147f7 100644
--- a/inc/layer-water.xml.inc
+++ b/inc/layer-water.xml.inc
@@ -264,28 +264,28 @@
       <TextSymbolizer size="10" fill="#80d1ae" spacing="600" placement="line" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>[waterway]='stream' and [tunnel]='yes'</Filter>
+      <Filter>[waterway]='stream' and ([tunnel]='yes' or [tunnel]='culvert')</Filter>
       &maxscale_zoom15;
       &minscale_zoom18;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="2.4" stroke-dasharray="4,2"/>
       <LineSymbolizer stroke="#f3f7f7" stroke-width="1.2"/>
     </Rule>
     <Rule>
-      <Filter>[waterway]='stream' and not [tunnel]='yes'</Filter>
+      <Filter>[waterway]='stream' and not ([tunnel]='yes' or [tunnel]='culvert')</Filter>
       &maxscale_zoom15;
       &minscale_zoom18;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="2"/>
       <TextSymbolizer size="8" fill="#6699cc" spacing="600" placement="line" fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>([waterway]='drain' or [waterway]='ditch') and [tunnel]='yes'</Filter>
+      <Filter>([waterway]='drain' or [waterway]='ditch') and ([tunnel]='yes' or [tunnel] = 'culvert')</Filter>
       &maxscale_zoom15;
       &minscale_zoom18;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="2" stroke-dasharray="4,2"/>
       <LineSymbolizer stroke="#f3f7f7" stroke-width="1"/>
     </Rule>
     <Rule>
-      <Filter>([waterway]='drain' or [waterway]='ditch') and not [tunnel]='yes'</Filter>
+      <Filter>([waterway]='drain' or [waterway]='ditch') and not ([tunnel]='yes' or [tunnel] = 'culvert')</Filter>
       &maxscale_zoom15;
       &minscale_zoom18;
       <LineSymbolizer stroke="#b5d0d0" stroke-width="1"/>
@@ -300,7 +300,7 @@
       (select way,waterway
       from &prefix;_line
       where waterway in ('stream','drain','ditch')
-        and (tunnel is null or tunnel != 'yes')
+        and (tunnel is null or (tunnel != 'yes' and tunnel != 'culvert'))
       ) as water_lines</Parameter>
       &datasource-settings;
     </Datasource>
@@ -363,7 +363,7 @@
     <Datasource>
       <Parameter name="table">
       (select way,waterway,disused,lock,name,
-      case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
+      case when tunnel in ('yes','true','1','culvert') then 'yes'::text else tunnel end as tunnel
       from &prefix;_line
       where waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','wadi')
         and (bridge is null or bridge not in ('yes','true','1','aqueduct'))