Permalink
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...
2 parents 938150e + 1eefe59 commit 3f389c801db712a0ce4c8c23bb2316b4d7dd49e7 @zerebubuth zerebubuth committed Jul 4, 2011
View
@@ -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
@@ -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
@@ -0,0 +1,3 @@
+select way,highway,horse,foot,bicycle from &prefix;_line
+ where highway in ('bridleway','footway','cycleway','path')
+ order by z_order
@@ -0,0 +1,3 @@
+select way,route
+ from &prefix;_line
+ where route = 'ferry'
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,4 @@
+select way,aeroway
+from &prefix;_line
+where aeroway in ('runway','taxiway')
+order by z_order
View
@@ -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">
+
+
+
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
+
@@ -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>
Oops, something went wrong.

0 comments on commit 3f389c8

Please sign in to comment.