Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'stellaeof'

NOTE: reverted the text buffering changes.

Conflicts:
	hybrid_inc/layer-transportation-us.xml.inc
	mapquest_inc/layer-streetnames-us.xml.inc
	mapquest_inc/layer-transportation-us.xml.inc
  • Loading branch information...
commit 3f389c801db712a0ce4c8c23bb2316b4d7dd49e7 2 parents 938150e + 1eefe59
@zerebubuth zerebubuth authored
View
1  .gitignore
@@ -8,3 +8,4 @@ hybrid_inc/settings.xml.inc
# technically this can be anywhere, but it's common to have it (or a symlink) here
world_boundaries
+symbols
View
9 common_inc/alley.sql
@@ -0,0 +1,9 @@
+select way,highway,
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel,
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel,
+ case when bridge in ('yes','true','1') then 'yes'::text else bridge end as bridge,
+ case when name ilike ref then null else name end as name,
+ ref,char_length(ref) as length
+from &prefix;_line
+where highway = 'service'
+order by z_order
View
3  common_inc/cycleway.sql
@@ -0,0 +1,3 @@
+select way,highway,horse,foot,bicycle from &prefix;_line
+ where highway in ('bridleway','footway','cycleway','path')
+ order by z_order
View
3  common_inc/ferry-routes.sql
@@ -0,0 +1,3 @@
+select way,route
+ from &prefix;_line
+ where route = 'ferry'
View
4 common_inc/pedestrian-polygon.sql
@@ -0,0 +1,4 @@
+select way,highway
+from &prefix;_polygon
+where highway in ('residential','unclassified','pedestrian','service','footway','living_street','track','path')
+order by z_order,way_area desc
View
3  common_inc/pedestrian-walkways.sql
@@ -0,0 +1,3 @@
+select way,highway,bicycle from &prefix;_line
+ where highway in ('pedestrian','footway','track','path','steps')
+ order by z_order,way_area desc
View
5 common_inc/rail.sql
@@ -0,0 +1,5 @@
+select way,railway,
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
+from &prefix;_line
+where railway is not null
+order by z_order
View
5 common_inc/ramp.sql
@@ -0,0 +1,5 @@
+select way,highway,
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
+from &prefix;_roads
+where highway in ('motorway_link')
+order by z_order
View
4 common_inc/runway.sql
@@ -0,0 +1,4 @@
+select way,aeroway
+from &prefix;_line
+where aeroway in ('runway','taxiway')
+order by z_order
View
18 common_inc/sql-us.xml.inc
@@ -0,0 +1,18 @@
+<!-- Transportation sql -->
+<!ENTITY sql-ferry-routes SYSTEM "ferry-routes.sql">
+<!ENTITY sql-pedestrian-walkways SYSTEM "pedestrian-walkways.sql">
+<!ENTITY sql-cycleway SYSTEM "cycleway.sql">
+<!ENTITY sql-alley SYSTEM "alley.sql">
+<!ENTITY sql-ramp SYSTEM "ramp.sql">
+<!ENTITY sql-street4 SYSTEM "street4.sql">
+<!ENTITY sql-street3 SYSTEM "street3.sql">
+<!ENTITY sql-street2 SYSTEM "street2.sql">
+<!ENTITY sql-street1 SYSTEM "street1.sql">
+<!ENTITY sql-street1-toll SYSTEM "street1-toll.sql">
+<!ENTITY sql-pedestrian-polygon SYSTEM "pedestrian-polygon.sql">
+<!ENTITY sql-runway SYSTEM "runway.sql">
+<!ENTITY sql-rail SYSTEM "rail.sql">
+<!ENTITY sql-alley SYSTEM "alley.sql">
+
+
+
View
9 common_inc/street1-toll.sql
@@ -0,0 +1,9 @@
+select way,highway,toll,
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel,
+ case when bridge in ('yes','true','1') then 'yes'::text else bridge end as bridge,
+ case when name ilike ref then null else name end as name,
+ ref,char_length(ref) as length
+from &prefix;_roads
+where highway in ('motorway') and (toll = 'yes' or toll = 'true')
+order by z_order
+
View
8 common_inc/street1.sql
@@ -0,0 +1,8 @@
+select way,highway,toll,aeroway,
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel,
+ case when bridge in ('yes','true','1') then 'yes'::text else bridge end as bridge,
+ case when name ilike ref then null else name end as name,
+ ref,char_length(ref) as length
+from &prefix;_roads
+where highway in ('motorway') and (toll is null or toll = 'no')
+order by z_order
View
9 common_inc/street2.sql
@@ -0,0 +1,9 @@
+select way,highway,aeroway,
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel,
+ case when bridge in ('yes','true','1') then 'yes'::text else bridge end as bridge,
+ case when name ilike ref then null else name end as name,
+ ref,char_length(ref) as length
+from &prefix;_roads
+where highway in ('trunk', 'trunk_link', 'primary', 'primary_link')
+order by z_order
+
View
8 common_inc/street3.sql
@@ -0,0 +1,8 @@
+select way,highway,aeroway,
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel,
+ case when bridge in ('yes','true','1') then 'yes'::text else bridge end as bridge,
+ case when name ilike ref then null else name end as name,
+ ref,char_length(ref) as length
+from &prefix;_line
+where highway in ('secondary', 'secondary_link', 'tertiary', 'tertiary_link')
+order by z_order
View
8 common_inc/street4.sql
@@ -0,0 +1,8 @@
+select way,highway
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel,
+ case when bridge in ('yes','true','1') then 'yes'::text else bridge end as bridge,
+ case when name ilike ref then null else name end as name,
+ ref,char_length(ref) as length
+from &prefix;_line
+where highway in ('residential', 'living_street', 'unclassified', 'road', 'residential_link', 'unclassified_link')
+order by z_order
View
53 hybrid_inc/layer-streetnames-us.xml.inc
@@ -162,6 +162,7 @@
&datasource-settings;
</Datasource>
</Layer>
+<!--
<Layer name="street-text" status="on" srs="&osm2pgsql_projection;">
<StyleName>street-text</StyleName>
<Datasource>
@@ -180,3 +181,55 @@
&datasource-settings;
</Datasource>
</Layer>
+-->
+
+<Layer name="street 4 text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street4;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="street 3 text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street3;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="street 2 text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street2;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="street 1 text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street1;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="street 1 toll text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street1-toll;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
View
2  hybrid_inc/layer-transportation-common-cycleway.xml.inc
@@ -37,7 +37,7 @@
<StyleName>cycleway</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,horse,foot,bicycle from &prefix;_line where highway in ('bridleway','footway','cycleway','path')) as roads
+ (&sql-cycleway;) as data
</Parameter>
&datasource-settings;
</Datasource>
View
116 hybrid_inc/layer-transportation-us.xml.inc
@@ -644,11 +644,8 @@
<StyleName>ferry-routes</StyleName>
<Datasource>
<Parameter name="table">
- (select way,route
- from &prefix;_line
- where route = 'ferry'
- ) as routes
- </Parameter>
+ (&sql-ferry-routes;) as data
+ </Parameter>
&datasource-settings;
</Datasource>
</Layer>
@@ -656,9 +653,7 @@
<StyleName>pedestrian-walkways</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,bicycle from &prefix;_line
- where highway in ('pedestrian','footway','track','path','steps')
- order by z_order,way_area desc) as roads
+ (&sql-pedestrian-walkways;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -668,12 +663,7 @@
<StyleName>alley</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway = 'service'
- order by z_order
- ) as roads
+ (&sql-alley;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -682,12 +672,7 @@
<StyleName>ramp casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway_link')
- order by z_order
- ) as roads
+ (&sql-ramp;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -696,12 +681,7 @@
<StyleName>street 4 casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway in ('residential', 'living_street', 'unclassified', 'road', 'residential_link', 'unclassified_link')
- order by z_order
- ) as roads
+ (&sql-street4;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -710,12 +690,7 @@
<StyleName>street 3 casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway in ('secondary', 'secondary_link', 'tertiary', 'tertiary_link')
- order by z_order
- ) as roads
+ (&sql-street3;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -724,12 +699,7 @@
<StyleName>street 2 casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('trunk', 'trunk_link', 'primary', 'primary_link')
- order by z_order
- ) as roads
+ (&sql-street2;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -738,12 +708,7 @@
<StyleName>ramp</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway_link')
- order by z_order
- ) as roads
+ (&sql-ramp;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -752,12 +717,7 @@
<StyleName>street 4</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway in ('residential', 'living_street', 'unclassified', 'road', 'residential_link', 'unclassified_link')
- order by z_order
- ) as roads
+ (&sql-street4;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -766,12 +726,7 @@
<StyleName>street 3</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway in ('secondary', 'secondary_link','tertiary','tertiary_link')
- order by z_order
- ) as roads
+ (&sql-street3;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -780,12 +735,7 @@
<StyleName>street 2</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('trunk', 'trunk_link', 'primary', 'primary_link')
- order by z_order
- ) as roads
+ (&sql-street2;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -794,12 +744,7 @@
<StyleName>street 1 casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll is null or toll = 'no')
- order by z_order
- ) as roads
+ (&sql-street1;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -808,12 +753,7 @@
<StyleName>street 1 toll casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll = 'yes' or toll = 'true')
- order by z_order
- ) as roads
+ (&sql-street1-toll;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -822,12 +762,7 @@
<StyleName>street 1</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll is null or toll = 'no')
- order by z_order
- ) as roads
+ (&sql-street1;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -836,12 +771,7 @@
<StyleName>centerline</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll is null or toll = 'no')
- order by z_order
- ) as roads
+ (&sql-street1;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -850,12 +780,7 @@
<StyleName>street 1 toll</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll = 'yes' or toll = 'true')
- order by z_order
- ) as roads
+ (&sql-street1-toll;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -864,12 +789,7 @@
<StyleName>centerline toll</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll = 'yes' or toll = 'true')
- order by z_order
- ) as roads
+ (&sql-street1-toll;) as data
</Parameter>
&datasource-settings;
</Datasource>
View
2  mapquest-hybridus.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map [
<!ENTITY % entities SYSTEM "hybrid_inc/entities.xml.inc">
+<!ENTITY % sql SYSTEM "common_inc/sql-us.xml.inc">
+%sql;
<!ENTITY % layers SYSTEM "hybrid_inc/layers-us.xml.inc">
%entities;
]>
View
2  mapquest-us.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map [
<!ENTITY % entities SYSTEM "mapquest_inc/entities.xml.inc">
+<!ENTITY % sql SYSTEM "common_inc/sql-us.xml.inc">
+%sql;
<!ENTITY % layers SYSTEM "mapquest_inc/layers-us.xml.inc">
%entities;
]>
View
62 mapquest_inc/layer-streetnames-us.xml.inc
@@ -129,11 +129,17 @@
<Rule>
<Filter>[highway] = 'secondary' or [highway] = 'proposed' or [highway]='construction'</Filter>
&maxscale_zoom12;
- <TextSymbolizer name="[name]" fontset-name="book-fonts" size="12" fill="#2b2b2b" halo-fill="rgba(255,255,255,0.25)" halo-radius="2" placement="line" max-char-angle-delta="40" avoid-edges="true"/>
+ <TextSymbolizer name="[name]" fontset-name="book-fonts" size="11" fill="#2b2b2b" halo-fill="rgba(255,255,255,0.25)" halo-radius="2" placement="line" max-char-angle-delta="40" avoid-edges="true"/>
</Rule>
<!--tertiary text-->
<Rule>
<Filter>[highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'unclassified' or [highway] = 'road' or [highway] = 'tertiary_link' or [highway] = 'residential_link' or [highway] = 'unclassified_link'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <TextSymbolizer name="[name]" fontset-name="book-fonts" size="11" fill="#2b2b2b" halo-fill="rgba(255,255,255,0.25)" halo-radius="2" placement="line" max-char-angle-delta="40" avoid-edges="true"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'unclassified' or [highway] = 'road' or [highway] = 'tertiary_link' or [highway] = 'residential_link' or [highway] = 'unclassified_link'</Filter>
&maxscale_zoom16;
&minscale_zoom17;
<TextSymbolizer name="[name]" fontset-name="book-fonts" size="11" fill="#2b2b2b" halo-fill="rgba(255,255,255,0.25)" halo-radius="2" placement="line" max-char-angle-delta="40" avoid-edges="true"/>
@@ -162,6 +168,8 @@
&datasource-settings;
</Datasource>
</Layer>
+
+<!--
<Layer name="street-text" status="on" srs="&osm2pgsql_projection;">
<StyleName>street-text</StyleName>
<Datasource>
@@ -180,3 +188,55 @@
&datasource-settings;
</Datasource>
</Layer>
+-->
+
+<Layer name="street 4 text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street4;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="street 3 text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street3;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="street 2 text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street2;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="street 1 text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street1;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="street 1 toll text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>street-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (&sql-street1-toll;) as data
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
View
2  mapquest_inc/layer-transportation-common-cycleway.xml.inc
@@ -37,7 +37,7 @@
<StyleName>cycleway</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,horse,foot,bicycle from &prefix;_line where highway in ('bridleway','footway','cycleway','path')) as roads
+ (&sql-cycleway;) as data
</Parameter>
&datasource-settings;
</Datasource>
View
143 mapquest_inc/layer-transportation-us.xml.inc
@@ -738,11 +738,8 @@
<StyleName>ferry-routes</StyleName>
<Datasource>
<Parameter name="table">
- (select way,route
- from &prefix;_line
- where route = 'ferry'
- ) as routes
- </Parameter>
+ (&sql-ferry-routes;) as data
+ </Parameter>
&datasource-settings;
</Datasource>
</Layer>
@@ -750,9 +747,7 @@
<StyleName>pedestrian-walkways</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,bicycle from &prefix;_line
- where highway in ('pedestrian','footway','track','path','steps')
- order by z_order,way_area desc) as roads
+ (&sql-pedestrian-walkways;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -761,10 +756,8 @@
<StyleName>pedestrian-polygon</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway from &prefix;_polygon
- where highway in ('residential','unclassified','pedestrian','service','footway','living_street','track','path')
- order by z_order,way_area desc) as roads
- </Parameter>
+ (&sql-pedestrian-polygon;) as data
+ </Parameter>
&datasource-settings;
</Datasource>
</Layer>
@@ -773,11 +766,8 @@
<StyleName>runway</StyleName>
<Datasource>
<Parameter name="table">
- (select way,aeroway
- from &prefix;_line
- where aeroway in ('runway','taxiway')
- order by z_order) as roads
- </Parameter>
+ (&sql-runway;) as data
+ </Parameter>
&datasource-settings;
</Datasource>
</Layer>
@@ -785,12 +775,7 @@
<StyleName>rail</StyleName>
<Datasource>
<Parameter name="table">
- (select way,railway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where railway is not null
- order by z_order
- ) as roads
+ (&sql-rail;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -799,12 +784,7 @@
<StyleName>ramp casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway_link')
- order by z_order
- ) as roads
+ (&sql-ramp;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -813,12 +793,7 @@
<StyleName>alley casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway = 'service'
- order by z_order
- ) as roads
+ (&sql-alley;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -827,12 +802,7 @@
<StyleName>street 4 casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway in ('residential', 'living_street', 'unclassified', 'road', 'residential_link', 'unclassified_link')
- order by z_order
- ) as roads
+ (&sql-street4;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -841,12 +811,7 @@
<StyleName>street 3 casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway in ('secondary', 'secondary_link','tertiary','tertiary_link')
- order by z_order
- ) as roads
+ (&sql-street3;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -855,12 +820,7 @@
<StyleName>street 2 casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('trunk', 'trunk_link', 'primary', 'primary_link')
- order by z_order
- ) as roads
+ (&sql-street2;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -876,12 +836,7 @@
<StyleName>ramp</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway_link')
- order by z_order
- ) as roads
+ (&sql-ramp;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -890,12 +845,7 @@
<StyleName>alley</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway = 'service'
- order by z_order
- ) as roads
+ (&sql-alley;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -904,12 +854,7 @@
<StyleName>street 4</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway in ('residential', 'living_street', 'unclassified', 'road', 'residential_link', 'unclassified_link')
- order by z_order
- ) as roads
+ (&sql-street4;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -918,12 +863,7 @@
<StyleName>street 3</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_line
- where highway in ('secondary', 'secondary_link','tertiary','tertiary_link')
- order by z_order
- ) as roads
+ (&sql-street3;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -932,12 +872,7 @@
<StyleName>street 2</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('trunk', 'trunk_link', 'primary', 'primary_link')
- order by z_order
- ) as roads
+ (&sql-street2;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -946,12 +881,7 @@
<StyleName>street 1 casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll is null or toll = 'no')
- order by z_order
- ) as roads
+ (&sql-street1;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -960,12 +890,7 @@
<StyleName>street 1 toll casing</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll = 'yes' or toll = 'true')
- order by z_order
- ) as roads
+ (&sql-street1-toll;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -974,12 +899,7 @@
<StyleName>street 1</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll is null or toll = 'no')
- order by z_order
- ) as roads
+ (&sql-street1;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -988,12 +908,7 @@
<StyleName>centerline</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll is null or toll = 'no')
- order by z_order
- ) as roads
+ (&sql-street1;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -1002,12 +917,7 @@
<StyleName>street 1 toll</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll = 'yes' or toll = 'true')
- order by z_order
- ) as roads
+ (&sql-street1-toll;) as data
</Parameter>
&datasource-settings;
</Datasource>
@@ -1016,12 +926,7 @@
<StyleName>centerline toll</StyleName>
<Datasource>
<Parameter name="table">
- (select way,highway,toll,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end as tunnel
- from &prefix;_roads
- where highway in ('motorway') and (toll = 'yes' or toll = 'true')
- order by z_order
- ) as roads
+ (&sql-street1-toll;) as data
</Parameter>
&datasource-settings;
</Datasource>
Please sign in to comment.
Something went wrong with that request. Please try again.