Permalink
Browse files

Fixed SQL includes so that the entities resolve in all the styles, an…

…d lay the way for SQL includes to be used for UK & EU styles.
  • Loading branch information...
zerebubuth committed Jul 4, 2011
1 parent 3f389c8 commit e74c07bd59d1def6677d39a0733b48026dcc4f20
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">
+
+
+
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">
+
+
+
View
@@ -1,4 +1,4 @@
-select way,highway
+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,
View
@@ -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-eu.xml.inc">
+%sql;
<!ENTITY % layers SYSTEM "mapquest_inc/layers-eu.xml.inc">
%entities;
]>
View
@@ -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-eu.xml.inc">
+%sql;
<!ENTITY % layers SYSTEM "hybrid_inc/layers-eu.xml.inc">
%entities;
]>
View
@@ -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-uk.xml.inc">
+%sql;
<!ENTITY % layers SYSTEM "hybrid_inc/layers-uk.xml.inc">
%entities;
]>
View
@@ -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-uk.xml.inc">
+%sql;
<!ENTITY % layers SYSTEM "mapquest_inc/layers-uk.xml.inc">
%entities;
]>
@@ -6,6 +6,7 @@
<!ENTITY layer-border-casing SYSTEM "layer-border-casing-eu-uk.xml.inc">
<!ENTITY layer-buildings SYSTEM "layer-buildings.xml.inc">
<!ENTITY layer-overpass SYSTEM "layer-overpass-uk.xml.inc">
+<!ENTITY layer-transportation SYSTEM "layer-transportation-uk.xml.inc">
<!ENTITY layer-transportation-common-cycleway SYSTEM "layer-transportation-common-cycleway.xml.inc">
<!ENTITY layer-water SYSTEM "layer-water.xml.inc">
<!ENTITY layer-landmark SYSTEM "layer-landmark.xml.inc">

0 comments on commit e74c07b

Please sign in to comment.