Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

waterways: render tunnel=culvert like tunnel=yes (fixes #3341) #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

waterways: render tunnel=culvert like tunnel=yes (fixes #3341) #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f90eca8
waterways: render tunnel=culvert like tunnel=yes (fixes #3341)
danstowell Apr 1, 2013
9d00ef2
Also handle culvert for streams and ditches (thanks @xkomczax)
danstowell Jun 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions inc/layer-water.xml.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,67 +177,67 @@
<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"/>
<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_zoom17;
&minscale_zoom17;
<LineSymbolizer stroke="#b5d0d0" stroke-width="11" stroke-dasharray="4,2"/>
<LineSymbolizer stroke="white" stroke-width="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_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"/>
<LineSymbolizer stroke="white" stroke-width="3"/>
<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"/>
<LineSymbolizer stroke="white" stroke-width="7"/>
<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"/>
Expand All @@ -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"/>
Expand All @@ -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>
Expand Down Expand Up @@ -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'))
Expand Down