maposmatic-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Maposmatic-dev] [PATCH] Stamen Toner stylesheet: create style files, f


From: Étienne Loks
Subject: [Maposmatic-dev] [PATCH] Stamen Toner stylesheet: create style files, fix locality, hamlet and villag e names
Date: Sun, 15 Apr 2012 16:32:17 +0200

As the changes in the base stylesheet begins to be heavy, specific
stylesheets files have been created. Reference files (labels.mms for
labels-ocitysmap.mss and style-toner-standard.mml for
style-toner-ocitysmap.mml) have been added to ocitysmap repository to
track changes on the toner main repository.

style-toner-ocitysmap.mml and labels-ocitysmap.mss have been updated
to display names of localities, hamlets and villages.

INSTALL instructions have been updated.
---
 INSTALL                                    |   43 +-
 stylesheet/toner/correct_label_fonts.sh    |    8 -
 stylesheet/toner/correct_mml.sh            |   26 -
 stylesheet/toner/labels-ocitysmap.mss      |  670 +++++++
 stylesheet/toner/labels.mss                |  668 +++++++
 stylesheet/toner/style-toner-ocitysmap.mml | 2688 ++++++++++++++++++++++++++++
 stylesheet/toner/style-toner-standard.mml  | 2518 ++++++++++++++++++++++++++
 7 files changed, 6553 insertions(+), 68 deletions(-)
 delete mode 100755 stylesheet/toner/correct_label_fonts.sh
 delete mode 100755 stylesheet/toner/correct_mml.sh
 create mode 100644 stylesheet/toner/labels-ocitysmap.mss
 create mode 100644 stylesheet/toner/labels.mss
 create mode 100644 stylesheet/toner/style-toner-ocitysmap.mml
 create mode 100644 stylesheet/toner/style-toner-standard.mml

diff --git a/INSTALL b/INSTALL
index d67d58e..ca0b3f4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -495,42 +495,17 @@ Other views are necessary.
  4.3 Stylesheet generation
 
     cd /path/to/toner/mapnik/
+    cp /path/to/ocitysmap/stylesheet/toner/style-toner-ocitysmap.mml .
+    cp /path/to/ocitysmap/stylesheet/toner/labels-ocitysmap.mss .
 
-    # replace MS fonts with DejaVu
-    /path/to/ocitysmap/stylesheet/toner/correct_label_fonts.sh
-
-    # fix the mml file:
-    #   - change table names with our tables
-    #   - add the ability to specifiy a password to naturalearth database
-    #   - set manualy an extent when estimate_extent is set to false
-    /path/to/ocitysmap/stylesheet/toner/correct_mml.sh
-
-    # configure database access
-    vim style-toner-standard.mml
-
-    (...)
-    <!ENTITY nev_host "localhost">
-    <!ENTITY nev_name "naturalearth">
-    <!ENTITY nev_user "maposmatic">
-    <!ENTITY nev_pass "maposmatic_password">
-
-    <!ENTITY osm_host "localhost">
-    <!ENTITY osm_port "5432">
-    <!ENTITY osm_name "maposmatic">
-    <!ENTITY osm_user "maposmatic">
-    <!ENTITY osm_pass "maposmatic_password">
-
-    <!ENTITY included_data_host "localhost">
-    <!ENTITY included_data_port "5432">
-    <!ENTITY included_data_name "naturalearth">
-    <!ENTITY included_data_user "maposmatic">
-    <!ENTITY included_data_pass "maposmatic_password">
-    (...)
+    # configure database access: change host, name, user and password
+    # for each database listed at top of the file
+    vim style-toner-ocitysmap.mml
 
     # generate the stylesheet
-    /path/to/cascadenik/cascadenik-compile.py style-toner-standard.mml \
-                                       /tmp/style-toner-standard-mapnik2.xml
-    mv /tmp/style-toner-standard-mapnik2.xml /path/to/toner/mapnik/
+    /path/to/cascadenik/cascadenik-compile.py style-toner-ocitysmap.mml \
+                                       /tmp/style-toner-ocitysmap.xml
+    mv /tmp/style-toner-ocitysmap.xml /path/to/ocitysmap/stylesheet/toner/
 
  5. ocitysmap configuration
 
@@ -541,7 +516,7 @@ Edit properly the configuration file.
     [Toner]
     name: Toner
     description: Stamen Toner stylesheet
-    path: /path/to/toner/mapnik/style-toner-standard-mapnik2.xml
+    path: /path/to/ocitysmap/stylesheet/toner/style-toner-ocitysmap.xml
 
 Don't forget to add "Toner" to the available_stylesheets variable, which lists
 all available stylesheets.
diff --git a/stylesheet/toner/correct_label_fonts.sh 
b/stylesheet/toner/correct_label_fonts.sh
deleted file mode 100755
index 7e6aedb..0000000
--- a/stylesheet/toner/correct_label_fonts.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-sed -i 's/Italic/Oblique/' labels.mss
-sed -i 's/Arial Unicode MS Regular/DejaVu Sans/' labels.mss
-sed -i 's/Arial Regular/DejaVu Sans/' labels.mss
-sed -i 's/Arial Unicode MS/DejaVu Sans/' labels.mss
-sed -i 's/Arial Regular/DejaVu/' labels.mss
-sed -i 's/Arial Bold/DejaVu Sans Bold/' labels.mss
diff --git a/stylesheet/toner/correct_mml.sh b/stylesheet/toner/correct_mml.sh
deleted file mode 100755
index d1d4173..0000000
--- a/stylesheet/toner/correct_mml.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-sed -i 's|<Parameter name="password"></Parameter>|<Parameter 
name="password">\&nev_pass;</Parameter>|' style-toner-standard.mml
-sed -i 's/land_110m/ne_110m_land/' style-toner-standard.mml
-sed -i 's/land_50m/ne_50m_land/' style-toner-standard.mml
-sed -i "s/admin_0_countries_110m</ne_110m_admin_0_countries</" 
style-toner-standard.mml
-sed -i "s/admin_0_countries_50m</ne_50m_admin_0_countries</" 
style-toner-standard.mml
-sed -i "s/admin_0_countries_10m</ne_10m_admin_0_countries</" 
style-toner-standard.mml
-sed -i 
's/admin_1_states_provinces_lines_110m/ne_110m_admin_1_states_provinces_lines_shp/'
 style-toner-standard.mml
-sed -i 
's/admin_1_states_provinces_lines_50m/ne_50m_admin_1_states_provinces_lines_shp/'
 style-toner-standard.mml
-sed -i 
's/admin_1_states_provinces_lines_10m/ne_10m_admin_1_states_provinces_lines_shp/'
 style-toner-standard.mml
-sed -i 's/admin_1_states_provinces_110m/ne_110m_admin_1_states_provinces_shp/' 
style-toner-standard.mml
-sed -i 's/admin_1_states_provinces_50m/ne_50m_admin_1_states_provinces_shp/' 
style-toner-standard.mml
-sed -i 's/admin_1_states_provinces_10m/ne_10m_admin_1_states_provinces_shp/' 
style-toner-standard.mml
-
-sed -i 's/lakes_110m/ne_110m_lakes/' style-toner-standard.mml
-sed -i 's/lakes_50m/ne_50m_lakes/' style-toner-standard.mml
-sed -i 's/lakes_10m/ne_10m_lakes/' style-toner-standard.mml
-
-sed -i 's/geography_marine_polys_110m/ne_110m_geography_marine_polys/' 
style-toner-standard.mml
-sed -i 's/geography_marine_polys_50m/ne_50m_geography_marine_polys/' 
style-toner-standard.mml
-sed -i 's/geography_marine_polys_10m/ne_10m_geography_marine_polys/' 
style-toner-standard.mml
-
-sed -i 's/coastline_10m/ne_10m_coastline/' style-toner-standard.mml
-
-sed -i 's|<Parameter name="estimate_extent">false</Parameter>|<Parameter 
name="estimate_extent">false</Parameter>\n            <Parameter 
name="extent">\&epsg900913_extent;</Parameter>|' style-toner-standard.mml
diff --git a/stylesheet/toner/labels-ocitysmap.mss 
b/stylesheet/toner/labels-ocitysmap.mss
new file mode 100644
index 0000000..6967af8
--- /dev/null
+++ b/stylesheet/toner/labels-ocitysmap.mss
@@ -0,0 +1,670 @@
+/*
+    The labels are for world zooms, mid-zooms, and detailed city zooms, all in 
one file.
+    Covers zooms 0 to 19.
+    
+    Used in map style MMLs:
+    
+    • Normal map style
+        - just this MSS
+    • Hybrid map style
+        - also overriden by: 
+          toner-hybrid-with-labels.mss
+    • Hybrid map style - labels only    
+        - also overriden by:
+          toner-hybrid-only-labels.mss
+*/
+
+/*
+Continent labels are just points.
+*/
+#continent-labels[zoom>=1][zoom<3] name
+{
+    text-face-name: 'DejaVu Sans Bold';
+    text-wrap-width: 32;
+    text-size: 14;
+    text-fill: #000;
+    text-halo-radius: 3;
+    text-halo-fill: #fff;
+}
+
+
+/*
+Ocean, Sea, Bay and other marine labels. Some use of scalerank column
+here helps define exactly which features come in at which zoom levels.
+*/
+#marine-labels-110m[zoom=2][scalerank=0] name,
+#marine-labels-110m[zoom=3] name,
+#marine-labels-50m[zoom=4][scalerank<4] name
+{
+    text-face-name: 'DejaVu Sans Bold Oblique';
+    text-wrap-width: 80;
+    text-size: 14;
+    text-fill: #fff;
+    text-halo-radius: 1;
+    text-halo-fill: #000;
+}
+
+#marine-labels-50m[zoom>=5][zoom<6] name,
+#marine-labels-10m[zoom>=6] name
+{
+    text-face-name: 'DejaVu Sans Oblique';
+    text-wrap-width: 80;
+    text-size: 14;
+    text-fill: #fff;
+    text-halo-radius: 1;
+    text-halo-fill: #000;
+}
+
+
+/*
+Country labels
+*/
+.country-labels-110m-z3[zoom=3][longfrom<=3] name,
+.country-labels-110m-z3[zoom=3][longfrom>3] shortname
+{
+    text-face-name: 'DejaVu Sans';
+    text-wrap-width: 80;
+    text-size: 13;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.country-labels-110m-z4[zoom=4] label_z4
+{
+    text-face-name: 'DejaVu Sans Bold';
+    text-wrap-width: 80;
+    text-size: 14;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.country-labels-110m-z5[zoom=5] label_z5
+{
+    text-face-name: 'DejaVu Sans Bold';
+    text-wrap-width: 80;
+    text-size: 16;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.country-labels-110m-z6[zoom=6] label_z6
+{
+    text-face-name: 'DejaVu Sans Bold';
+    text-wrap-width: 80;
+    text-size: 18;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+
+/*
+Admin-1 (states, provinces) labels
+*/
+.admin1-labels-50m-z4[zoom=4] label_z4,
+.admin1-labels-50m-z5[zoom=5] label_z5,
+.admin1-labels-50m-z6[zoom=6] label_z6,
+.admin1-labels-50m-z7[zoom=7] label_z7
+{
+    text-face-name: 'DejaVu Sans';
+    text-wrap-width: 80;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.admin1-labels-50m-z4[zoom=4]{ text-size: 12; }
+.admin1-labels-50m-z5[zoom=5]{ text-size: 16; }
+.admin1-labels-50m-z6[zoom=6]{ text-size: 18; }
+.admin1-labels-50m-z7[zoom=7]{ text-size: 20; }
+
+
+/*
+City labels
+*/
+.city-points-z4[zoom=4],
+.city-points-z5[zoom=5],
+.city-points-z6[zoom=6],
+.city-points-z7[zoom=7],
+.city-points-z8[zoom=8]
+/*,
+.city-points-z9[zoom=9]*/
+{
+    point-file: url('icons/dot.png');
+    point-allow-overlap: true;
+}
+
+.city-labels-z4[zoom=4][justified='left'],
+.city-labels-z5[zoom=5][justified='left'],
+.city-labels-z6[zoom=6][justified='left'],
+.city-labels-z7[zoom=7][justified='left'],
+.city-labels-z8[zoom=8][justified='left']
+/*,
+.city-labels-z9[zoom=9][justified='left']
+*/
+{
+    text-dx: -5;
+    text-dy: 1;
+}
+
+.city-labels-z4[zoom=4][justified='right'],
+.city-labels-z5[zoom=5][justified='right'],
+.city-labels-z6[zoom=6][justified='right'],
+.city-labels-z7[zoom=7][justified='right'],
+.city-labels-z8[zoom=8][justified='right']
+/*,
+.city-labels-z9[zoom=9][justified='right']
+*/
+{
+    text-dx: 5;
+    text-dy: 1;
+}
+
+
+.city-labels-z4[zoom=4] name,
+.city-labels-z5[zoom=5] name,
+.city-labels-z6[zoom=6] name
+{
+    text-allow-overlap: true;
+    text-face-name: 'DejaVu Sans';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.city-labels-z7[zoom=7] name
+{
+    text-allow-overlap: true;
+    text-face-name: 'DejaVu Sans Bold';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;    
+}
+
+.city-labels-z8[zoom=8] name,
+.city-points-z9[zoom=9] name,
+.city-points-z10[zoom=10] name,
+.city-points-z11[zoom=11] name,
+.city-points-z12[zoom=12] name
+{
+    text-allow-overlap: true;
+    text-face-name: 'DejaVu Sans Bold';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;    
+}
+
+/* 
+    We loose the townspot and don't use Dymo 
+    placement anymore, so don't let Mapnik 
+    overlap 
+*/
+
+.city-points-z9[zoom=9] name,
+.city-points-z10[zoom=10] name,
+.city-points-z11[zoom=11] name,
+.city-points-z12[zoom=12] name
+{
+    text-allow-overlap: false;
+}
+
+/*
+City Labels ZOOM 4
+*/
+.city-labels-z4[zoom=4] name { text-size: 10; }
+.city-labels-z4[zoom=4][font_size=14] name { text-size: 14; }
+
+/* About:                                                    */
+/* Labels should look pretty, that's where Dymo comes in     */
+/* These are for the Dymo settings, and for debug            */
+/* Once it goes thru Dymo, we just use font_size             */
+
+/* NOTE: We use font_size instead of population proxy,       */
+/* as Mapnik freaks when pop is not a number, and sometimes  */
+/* Dymo doesn't spit out the right field formating.          */
+
+/*
+.city-labels-z4[zoom=4] name { text-size: 10; }
+.city-labels-z4[zoom=4][population>=25000] name { text-size: 10; }
+.city-labels-z4[zoom=4][population>=100000] name { text-size: 10; }
+.city-labels-z4[zoom=4][population>=1000000] name { text-size: 14; }
+*/
+
+/*
+City Labels ZOOM 5
+*/
+.city-labels-z5[zoom=5] name { text-size: 12; }
+.city-labels-z5[zoom=5][font_size=16] name { text-size: 16; }
+/*
+.city-labels-z5[zoom=5] name { text-size: 12; }
+.city-labels-z5[zoom=5][population>=25000] name { text-size: 12; }
+.city-labels-z5[zoom=5][population>=100000] name { text-size: 12; }
+.city-labels-z5[zoom=5][population>=1000000] name { text-size: 16; }
+*/
+
+/*
+City Labels ZOOM 6
+*/
+.city-labels-z6[zoom=6] name { text-size: 12; }
+.city-labels-z6[zoom=6][font_size=18] name { text-size: 18; }
+/*
+.city-labels-z6[zoom=6] name { text-size: 12; }
+.city-labels-z6[zoom=6][population>=25000] name { text-size: 12; }
+.city-labels-z6[zoom=6][population>=100000] name { text-size: 12; }
+.city-labels-z6[zoom=6][population>=1000000] name { text-size: 18; }
+*/
+
+/*
+City Labels ZOOM 7
+*/
+.city-labels-z7[zoom=7] name { text-size: 12; }
+.city-labels-z7[zoom=7][font_size=18] name { text-size: 18; }
+/*
+.city-labels-z7[zoom=7][population>0] name { text-size: 12; }
+.city-labels-z7[zoom=7][population>=25000] name { text-size: 12; }
+.city-labels-z7[zoom=7][population>=100000] name { text-size: 12; }
+.city-labels-z7[zoom=7][population>=1000000] name { text-size: 18; }
+*/
+
+/*
+City Labels ZOOM 8, 9 10
+*/
+.city-labels-z8[zoom=8] name { text-size: 13; }
+.city-labels-z8[zoom=8][font_size=20] name { text-size: 20; }
+.city-points-z9[zoom=9] name { text-size: 13; }
+.city-points-z9[zoom=9][font_size=20] name { text-size: 20; }
+.city-points-z10[zoom=10] name { text-size: 13; }
+.city-points-z10[zoom=10][font_size=20] name { text-size: 20; }
+.city-points-z11[zoom=11] name { text-size: 13; }
+.city-points-z11[zoom=11][font_size=20] name { text-size: 20; }
+.city-points-z12[zoom=12] name { text-size: 13; }
+.city-points-z12[zoom=12][font_size=20] name { text-size: 20; }
+
+/*
+.city-labels-z8[zoom=8] name { text-size: 13; }
+.city-labels-z8[zoom=8][population>=25000] name { text-size: 13; }
+.city-labels-z8[zoom=8][population>=100000] name { text-size: 20; }
+.city-labels-z8[zoom=8][population>=1000000] name { text-size: 20; }
+
+.city-points-z9[zoom=9] name { text-size: 13; }
+.city-points-z9[zoom=9][population>=25000] name { text-size: 13; }
+.city-points-z9[zoom=9][population>=100000] name { text-size: 20; }
+.city-points-z9[zoom=9][population>=1000000] name { text-size: 20; }
+
+.city-points-z10[zoom=10] name { text-size: 13; }
+.city-points-z10[zoom=10][population>=25000] name { text-size: 13; }
+.city-points-z10[zoom=10][population>=100000] name { text-size: 20; }
+.city-points-z10[zoom=10][population>=1000000] name { text-size: 20; }
+
+.city-points-z11[zoom=11] name { text-size: 13; }
+.city-points-z11[zoom=11][population>=25000] name { text-size: 13; }
+.city-points-z11[zoom=11][population>=100000] name { text-size: 20; }
+.city-points-z11[zoom=11][population>=1000000] name { text-size: 20; }
+
+.city-points-z12[zoom=12] name { text-size: 13; }
+.city-points-z12[zoom=12][population>=25000] name { text-size: 13; }
+.city-points-z12[zoom=12][population>=100000] name { text-size: 20; }
+.city-points-z12[zoom=12][population>=1000000] name { text-size: 20; }
+*/
+
+
+/*
+If you wanted to use OSM labels instead...
+Note: make sure that layer is 'on' in the MML
+*/
+
+
+.osm-place-points[zoom>=10][place=village] name,
+.osm-place-points[zoom>=10][place=hamlet] name
+{
+    text-allow-overlap: false;
+    text-face-name: 'DejaVu Sans Bold';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+    text-size: 13;
+}
+
+.osm-place-points[zoom>=10][place=locality] name
+{
+    text-allow-overlap: false;
+    text-face-name: 'DejaVu Sans Bold';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+    text-size: 11;
+}
+
+
+
+
+
+/*
+Park labels
+*/
+/*                                   */
+/* REFERNCE THE POLYS being filtered */
+/*
+.green-areas[zoom=10][area>5000000],
+.green-areas[zoom=11][area>1000000],
+.green-areas[zoom=12][area> 500000],
+.green-areas[zoom=12][area> 200000],
+.green-areas[zoom=13][area>  75000],
+.green-areas[zoom=14][area>  10000],
+.green-areas[zoom>14]
+{
+*/
+
+.water-bodies-labels[zoom=9][area>100000000][kind=lake] name,
+.water-bodies-labels[zoom=10][area>100000000][kind=lake] name,
+.water-bodies-labels[zoom=11][area>25000000] name
+{ 
+    text-face-name: 'DejaVu Sans Oblique';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 200;
+    text-allow-overlap: false;
+    text-wrap-width: 50;
+}
+
+
+.water-bodies-labels[zoom=12][area>5000000][kind=lake] name,
+#green-areas-labels[zoom=12][area>5000000] name
+{ 
+    text-face-name: 'DejaVu Sans Oblique';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 200;
+    text-allow-overlap: false;
+    text-wrap-width: 70;
+}
+
+
+.water-bodies-labels[zoom=13][area>2000000][kind=lake] name,
+#green-areas-labels[zoom=13][area>2000000] name
+{ 
+    text-face-name: 'DejaVu Sans Oblique';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 100;
+    text-allow-overlap: false;
+    text-wrap-width: 70;
+}
+.water-bodies-labels[zoom=14][area>200000] name,
+#green-areas-labels[zoom=14][area>200000] name
+{ 
+    text-face-name: 'DejaVu Sans Oblique';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 100;
+    text-allow-overlap: false;
+    text-wrap-width: 70;
+}
+.water-bodies-labels[zoom=15][area>50000] name,
+#green-areas-labels[zoom=15][area>50000] name 
+{ 
+    text-face-name: 'DejaVu Sans Oblique';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 100;
+    text-allow-overlap: false;
+    text-wrap-width: 30;
+}
+
+.water-bodies-labels[zoom=16][area>10000] name,
+.water-bodies-labels[zoom>=17] name,
+#green-areas-labels[zoom=16][area>10000] name,
+#green-areas-labels[zoom>=17] name
+{ 
+    text-face-name: 'DejaVu Sans Oblique';
+    text-size: 13;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-wrap-width: 40;
+    text-halo-radius: 2;
+    text-spacing: 100;
+    text-allow-overlap: false;
+    text-wrap-width: 40;
+}
+
+.water-bodies-labels[zoom>=9] name
+{
+    text-fill: #fff;
+    text-halo-fill: #000;
+    text-size: 13 !important;
+}
+.water-bodies-labels[zoom>=16] name
+{
+    text-size: 14 !important;
+}
+
+#green-areas-labels[zoom>=12] name
+{
+    text-fill: #000;
+    text-halo-fill: #fff;
+}
+
+
+
+/*
+Road labels
+*/
+#major-road-labels[zoom>=12] name
+{
+    text-face-name: 'DejaVu Sans Bold';
+    text-placement: line;
+    text-max-char-angle-delta: 30;
+    text-fill: #000;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+}
+
+#major-road-labels[highway=trunk][zoom>=14] name
+{
+    text-face-name: 'DejaVu Sans Bold';
+    text-placement: line;
+    text-max-char-angle-delta: 30;
+    text-fill: #000;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+}
+
+#major-road-labels[highway=primary][zoom>=14] name
+{
+    text-face-name: 'DejaVu Sans Bold';
+    text-placement: line;
+    text-max-char-angle-delta: 30;
+    text-fill: #000;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+}
+
+#major-road-labels[highway=primary][zoom>=16] name
+{
+    text-halo-radius: 2;
+}
+
+#major-road-labels[zoom=16] name
+{
+    text-fill: #000;
+    text-halo-fill: #fff;
+}
+
+#major-road-labels[is_tunnel=yes][zoom>=15] name
+{
+    text-fill: #777;
+    text-halo-fill: #fff;
+}
+
+#minor-road-labels[zoom>=16] name
+{
+    text-face-name: 'DejaVu Sans Bold';
+    text-placement: line;
+    text-max-char-angle-delta: 30;
+    text-fill: #000;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+}
+
+#major-road-labels[zoom=12] name { text-dy: 7; }
+#major-road-labels[highway=trunk][zoom=12] name { text-size: 12; }
+#major-road-labels[highway=primary][zoom=12] name { text-size: 12; }
+
+#major-road-labels[zoom=13] name { text-dy: 8; }
+#major-road-labels[highway=trunk][zoom=13] name { text-size: 13; }
+#major-road-labels[highway=primary][zoom=13] name { text-size: 13; }
+
+#major-road-labels[highway=trunk][zoom=14] name { text-dy: 9; text-size: 14; }
+#major-road-labels[highway=primary][zoom=14] name { text-dy: 9; text-size: 14; 
}
+#major-road-labels[highway=secondary][zoom=14] name { text-dy: 7; text-size: 
12; }
+
+#major-road-labels[highway=trunk][zoom=15] name { text-dy: 12; text-size: 15; }
+#major-road-labels[highway=primary][zoom=15] name { text-dy: 12; text-size: 
15; }
+#major-road-labels[highway=secondary][zoom=15] name { text-dy: 11; text-size: 
13; }
+#major-road-labels[highway=tertiary][zoom=15] name { text-dy: 11; text-size: 
13; }
+
+#major-road-labels[highway=trunk][zoom=16] name { text-dy: 13; text-size: 14; }
+#major-road-labels[highway=primary][zoom=16] name { text-dy: 13; text-size: 
14; }
+#major-road-labels[highway=secondary][zoom=16] name { text-dy: 13; 
text-spacing: 124; text-size: 13; text-halo-radius: 2; }
+#major-road-labels[highway=tertiary][zoom=16] name { text-dy: 13; 
text-spacing: 124; text-size: 13; text-halo-radius: 2; }
+#minor-road-labels[zoom=16] name { text-dy: 10; text-spacing: 124; text-size: 
10; text-halo-radius: 2; }
+
+#major-road-labels[highway=trunk][zoom=17] name { text-dy: 16; text-size: 16; }
+#major-road-labels[highway=primary][zoom=17] name { text-dy: 14; text-size: 
14; }
+#major-road-labels[highway=secondary][zoom=17] name { text-dy: 14; 
text-spacing: 180; text-size: 14; text-halo-radius: 2; }
+#major-road-labels[highway=tertiary][zoom=17] name { text-dy: 13; 
text-spacing: 180; text-size: 12; text-halo-radius: 2; }
+#minor-road-labels[zoom=17] name { text-dy: 13; text-spacing: 180; text-size: 
12; text-halo-radius: 2; }
+
+#major-road-labels[highway=trunk][zoom>=18] name { text-size: 16; }
+#major-road-labels[highway=primary][zoom>=18] name { text-size: 14; }
+#major-road-labels[highway=secondary][zoom>=18] name { text-size: 14; 
text-spacing: 300; text-halo-radius: 2; }
+#major-road-labels[highway=tertiary][zoom>=18] name { text-size: 12; 
text-spacing: 400; text-halo-radius: 2; }
+#minor-road-labels[zoom>=18] name { text-size: 12; text-spacing: 400; 
text-halo-radius: 2; }
+
+
+/*
+Subway stations and icons
+*/
+#poi-stations[zoom>=18][railway=station] name 
+{ 
+    text-face-name: 'DejaVu Sans Bold';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-fill: #4581C3;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+    text-allow-overlap: true;
+    text-wrap-width: 30;
+    text-dx: 0;
+    text-dy: 8;
+}
+
+#poi-station-labels[zoom=17][railway=station] { 
+       point-file: url('icons/subway_sm.png'); 
+}
+
+#poi-station-labels[zoom>=18][railway=station] { 
+       point-file: url('icons/subway.png'); 
+}
+
+
+/*
+.airports[zoom=2][natlscale>148],
+.airports[zoom=3][natlscale>74],
+.airports[zoom=4][natlscale>37],
+.airports[zoom=5][natlscale>18],
+.airports[zoom=6][natlscale>9.2],
+.airports[zoom=7][natlscale>4.6],
+.airports[zoom=8][natlscale>2.3],
+.airports[zoom=9][natlscale>1.2],
+*/
+.airports[zoom=10][natlscale>.57],
+.airports[zoom=11][natlscale>.29],
+/*
+.airports[zoom=12][natlscale>.14],
+.airports[zoom=13][natlscale>.07]
+*/
+.airports[zoom=12][natlscale>.29],
+.airports[zoom=13][natlscale>.29]
+{
+    point-file: url('icons/airplane-19-reverse.png');
+}
+
+/*
+.airports[zoom=14][natlscale>.04],
+.airports[zoom=15][natlscale>.02],
+.airports[zoom>=16][natlscale>.01],
+.airports[zoom=14][natlscale>.29],
+.airports[zoom=15][natlscale>.29],
+.airports[zoom>=16][natlscale>.29]
+{
+    point-file: url('icons/airplane-35-reverse.png');
+}
+*/
+
+
+/*
+.airports[zoom=2][natlscale>148] label_sm,
+.airports[zoom=3][natlscale>74] label_sm,
+.airports[zoom=4][natlscale>37] label_sm,
+.airports[zoom=5][natlscale>18] label_sm,
+.airports[zoom=6][natlscale>9.2] label_sm,
+.airports[zoom=7][natlscale>4.6] label_sm,
+.airports[zoom=8][natlscale>2.3] label_sm,
+.airports[zoom=9][natlscale>1.2] label_sm,
+.airports[zoom=10][natlscale>.57] label_sm,
+*/
+/*
+.airports[zoom=11][natlscale>.29] label_sm,
+.airports[zoom=12][natlscale>.29] label_sm,
+*/
+/*
+.airports[zoom=12][natlscale>.14] label_sm,
+.airports[zoom=13][natlscale>.07] label_lng,
+.airports[zoom=14][natlscale>.04] label_lng,
+.airports[zoom=15][natlscale>.02] label_lng,
+.airports[zoom>=16][natlscale>.01] label_lng
+*/
+.airports[zoom=13][natlscale>.29] label_lng,
+.airports[zoom=14][natlscale>.29] label_lng,
+.airports[zoom=15][natlscale>.29] label_lng,
+.airports[zoom>=16][natlscale>.29] label_lng
+{
+    text-face-name: 'DejaVu Sans Oblique';
+    text-fill: #000;
+    text-size: 14;
+    
+    text-halo-fill: #fff;
+    text-halo-radius: 2;
+    
+    text-wrap-width: 128;
+    text-dy: 14;
+
+    text-allow-overlap: true;
+}
+
+.airports[zoom=14][natlscale>.29] label_lng,
+.airports[zoom=15][natlscale>.29] label_lng,
+.airports[zoom>=16][natlscale>.29] label_lng
+{
+    text-dy: 0;
+}
diff --git a/stylesheet/toner/labels.mss b/stylesheet/toner/labels.mss
new file mode 100644
index 0000000..999452e
--- /dev/null
+++ b/stylesheet/toner/labels.mss
@@ -0,0 +1,668 @@
+/*
+    The labels are for world zooms, mid-zooms, and detailed city zooms, all in 
one file.
+    Covers zooms 0 to 19.
+    
+    Used in map style MMLs:
+    
+    • Normal map style
+        - just this MSS
+    • Hybrid map style
+        - also overriden by: 
+          toner-hybrid-with-labels.mss
+    • Hybrid map style - labels only    
+        - also overriden by:
+          toner-hybrid-only-labels.mss
+*/
+
+/*
+Continent labels are just points.
+*/
+#continent-labels[zoom>=1][zoom<3] name
+{
+    text-face-name: 'Arial Unicode MS Bold';
+    text-wrap-width: 32;
+    text-size: 14;
+    text-fill: #000;
+    text-halo-radius: 3;
+    text-halo-fill: #fff;
+}
+
+
+/*
+Ocean, Sea, Bay and other marine labels. Some use of scalerank column
+here helps define exactly which features come in at which zoom levels.
+*/
+#marine-labels-110m[zoom=2][scalerank=0] name,
+#marine-labels-110m[zoom=3] name,
+#marine-labels-50m[zoom=4][scalerank<4] name
+{
+    text-face-name: 'Arial Unicode MS Bold Italic';
+    text-wrap-width: 80;
+    text-size: 14;
+    text-fill: #fff;
+    text-halo-radius: 1;
+    text-halo-fill: #000;
+}
+
+#marine-labels-50m[zoom>=5][zoom<6] name,
+#marine-labels-10m[zoom>=6] name
+{
+    text-face-name: 'Arial Unicode MS Italic';
+    text-wrap-width: 80;
+    text-size: 14;
+    text-fill: #fff;
+    text-halo-radius: 1;
+    text-halo-fill: #000;
+}
+
+
+/*
+Country labels
+*/
+.country-labels-110m-z3[zoom=3][longfrom<=3] name,
+.country-labels-110m-z3[zoom=3][longfrom>3] shortname
+{
+    text-face-name: 'Arial Regular';
+    text-wrap-width: 80;
+    text-size: 13;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.country-labels-110m-z4[zoom=4] label_z4
+{
+    text-face-name: 'Arial Unicode MS Bold';
+    text-wrap-width: 80;
+    text-size: 14;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.country-labels-110m-z5[zoom=5] label_z5
+{
+    text-face-name: 'Arial Unicode MS Bold';
+    text-wrap-width: 80;
+    text-size: 16;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.country-labels-110m-z6[zoom=6] label_z6
+{
+    text-face-name: 'Arial Unicode MS Bold';
+    text-wrap-width: 80;
+    text-size: 18;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+
+/*
+Admin-1 (states, provinces) labels
+*/
+.admin1-labels-50m-z4[zoom=4] label_z4,
+.admin1-labels-50m-z5[zoom=5] label_z5,
+.admin1-labels-50m-z6[zoom=6] label_z6,
+.admin1-labels-50m-z7[zoom=7] label_z7
+{
+    text-face-name: 'Arial Unicode MS Regular';
+    text-wrap-width: 80;
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.admin1-labels-50m-z4[zoom=4]{ text-size: 12; }
+.admin1-labels-50m-z5[zoom=5]{ text-size: 16; }
+.admin1-labels-50m-z6[zoom=6]{ text-size: 18; }
+.admin1-labels-50m-z7[zoom=7]{ text-size: 20; }
+
+
+/*
+City labels
+*/
+.city-points-z4[zoom=4],
+.city-points-z5[zoom=5],
+.city-points-z6[zoom=6],
+.city-points-z7[zoom=7],
+.city-points-z8[zoom=8]
+/*,
+.city-points-z9[zoom=9]*/
+{
+    point-file: url('icons/dot.png');
+    point-allow-overlap: true;
+}
+
+.city-labels-z4[zoom=4][justified='left'],
+.city-labels-z5[zoom=5][justified='left'],
+.city-labels-z6[zoom=6][justified='left'],
+.city-labels-z7[zoom=7][justified='left'],
+.city-labels-z8[zoom=8][justified='left']
+/*,
+.city-labels-z9[zoom=9][justified='left']
+*/
+{
+    text-dx: -5;
+    text-dy: 1;
+}
+
+.city-labels-z4[zoom=4][justified='right'],
+.city-labels-z5[zoom=5][justified='right'],
+.city-labels-z6[zoom=6][justified='right'],
+.city-labels-z7[zoom=7][justified='right'],
+.city-labels-z8[zoom=8][justified='right']
+/*,
+.city-labels-z9[zoom=9][justified='right']
+*/
+{
+    text-dx: 5;
+    text-dy: 1;
+}
+
+
+.city-labels-z4[zoom=4] name,
+.city-labels-z5[zoom=5] name,
+.city-labels-z6[zoom=6] name
+{
+    text-allow-overlap: true;
+    text-face-name: 'Arial Unicode MS Regular';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+}
+
+.city-labels-z7[zoom=7] name
+{
+    text-allow-overlap: true;
+    text-face-name: 'Arial Unicode MS Bold';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;    
+}
+
+.city-labels-z8[zoom=8] name,
+.city-points-z9[zoom=9] name,
+.city-points-z10[zoom=10] name,
+.city-points-z11[zoom=11] name,
+.city-points-z12[zoom=12] name
+{
+    text-allow-overlap: true;
+    text-face-name: 'Arial Unicode MS Bold';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;    
+}
+
+/* 
+    We loose the townspot and don't use Dymo 
+    placement anymore, so don't let Mapnik 
+    overlap 
+*/
+
+.city-points-z9[zoom=9] name,
+.city-points-z10[zoom=10] name,
+.city-points-z11[zoom=11] name,
+.city-points-z12[zoom=12] name
+{
+    text-allow-overlap: false;
+}
+
+/*
+City Labels ZOOM 4
+*/
+.city-labels-z4[zoom=4] name { text-size: 10; }
+.city-labels-z4[zoom=4][font_size=14] name { text-size: 14; }
+
+/* About:                                                    */
+/* Labels should look pretty, that's where Dymo comes in     */
+/* These are for the Dymo settings, and for debug            */
+/* Once it goes thru Dymo, we just use font_size             */
+
+/* NOTE: We use font_size instead of population proxy,       */
+/* as Mapnik freaks when pop is not a number, and sometimes  */
+/* Dymo doesn't spit out the right field formating.          */
+
+/*
+.city-labels-z4[zoom=4] name { text-size: 10; }
+.city-labels-z4[zoom=4][population>=25000] name { text-size: 10; }
+.city-labels-z4[zoom=4][population>=100000] name { text-size: 10; }
+.city-labels-z4[zoom=4][population>=1000000] name { text-size: 14; }
+*/
+
+/*
+City Labels ZOOM 5
+*/
+.city-labels-z5[zoom=5] name { text-size: 12; }
+.city-labels-z5[zoom=5][font_size=16] name { text-size: 16; }
+/*
+.city-labels-z5[zoom=5] name { text-size: 12; }
+.city-labels-z5[zoom=5][population>=25000] name { text-size: 12; }
+.city-labels-z5[zoom=5][population>=100000] name { text-size: 12; }
+.city-labels-z5[zoom=5][population>=1000000] name { text-size: 16; }
+*/
+
+/*
+City Labels ZOOM 6
+*/
+.city-labels-z6[zoom=6] name { text-size: 12; }
+.city-labels-z6[zoom=6][font_size=18] name { text-size: 18; }
+/*
+.city-labels-z6[zoom=6] name { text-size: 12; }
+.city-labels-z6[zoom=6][population>=25000] name { text-size: 12; }
+.city-labels-z6[zoom=6][population>=100000] name { text-size: 12; }
+.city-labels-z6[zoom=6][population>=1000000] name { text-size: 18; }
+*/
+
+/*
+City Labels ZOOM 7
+*/
+.city-labels-z7[zoom=7] name { text-size: 12; }
+.city-labels-z7[zoom=7][font_size=18] name { text-size: 18; }
+/*
+.city-labels-z7[zoom=7][population>0] name { text-size: 12; }
+.city-labels-z7[zoom=7][population>=25000] name { text-size: 12; }
+.city-labels-z7[zoom=7][population>=100000] name { text-size: 12; }
+.city-labels-z7[zoom=7][population>=1000000] name { text-size: 18; }
+*/
+
+/*
+City Labels ZOOM 8, 9 10
+*/
+.city-labels-z8[zoom=8] name { text-size: 13; }
+.city-labels-z8[zoom=8][font_size=20] name { text-size: 20; }
+.city-points-z9[zoom=9] name { text-size: 13; }
+.city-points-z9[zoom=9][font_size=20] name { text-size: 20; }
+.city-points-z10[zoom=10] name { text-size: 13; }
+.city-points-z10[zoom=10][font_size=20] name { text-size: 20; }
+.city-points-z11[zoom=11] name { text-size: 13; }
+.city-points-z11[zoom=11][font_size=20] name { text-size: 20; }
+.city-points-z12[zoom=12] name { text-size: 13; }
+.city-points-z12[zoom=12][font_size=20] name { text-size: 20; }
+
+/*
+.city-labels-z8[zoom=8] name { text-size: 13; }
+.city-labels-z8[zoom=8][population>=25000] name { text-size: 13; }
+.city-labels-z8[zoom=8][population>=100000] name { text-size: 20; }
+.city-labels-z8[zoom=8][population>=1000000] name { text-size: 20; }
+
+.city-points-z9[zoom=9] name { text-size: 13; }
+.city-points-z9[zoom=9][population>=25000] name { text-size: 13; }
+.city-points-z9[zoom=9][population>=100000] name { text-size: 20; }
+.city-points-z9[zoom=9][population>=1000000] name { text-size: 20; }
+
+.city-points-z10[zoom=10] name { text-size: 13; }
+.city-points-z10[zoom=10][population>=25000] name { text-size: 13; }
+.city-points-z10[zoom=10][population>=100000] name { text-size: 20; }
+.city-points-z10[zoom=10][population>=1000000] name { text-size: 20; }
+
+.city-points-z11[zoom=11] name { text-size: 13; }
+.city-points-z11[zoom=11][population>=25000] name { text-size: 13; }
+.city-points-z11[zoom=11][population>=100000] name { text-size: 20; }
+.city-points-z11[zoom=11][population>=1000000] name { text-size: 20; }
+
+.city-points-z12[zoom=12] name { text-size: 13; }
+.city-points-z12[zoom=12][population>=25000] name { text-size: 13; }
+.city-points-z12[zoom=12][population>=100000] name { text-size: 20; }
+.city-points-z12[zoom=12][population>=1000000] name { text-size: 20; }
+*/
+
+
+/*
+If you wanted to use OSM labels instead...
+Note: make sure that layer is 'on' in the MML
+*/
+
+/*
+.osm-place-points[zoom=11][place=city] name 
+{
+    text-allow-overlap: false;
+    text-face-name: 'Arial Bold';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+    text-size: 20;
+}
+.osm-place-points[zoom=11][place=town] name
+{
+    text-allow-overlap: false;
+    text-face-name: 'Arial Bold';
+    text-fill: #000;
+    text-halo-radius: 2;
+    text-halo-fill: #fff;
+       text-size: 13;
+}
+*/
+
+
+
+
+/*
+Park labels
+*/
+/*                                   */
+/* REFERNCE THE POLYS being filtered */
+/*
+.green-areas[zoom=10][area>5000000],
+.green-areas[zoom=11][area>1000000],
+.green-areas[zoom=12][area> 500000],
+.green-areas[zoom=12][area> 200000],
+.green-areas[zoom=13][area>  75000],
+.green-areas[zoom=14][area>  10000],
+.green-areas[zoom>14]
+{
+*/
+
+.water-bodies-labels[zoom=9][area>100000000][kind=lake] name,
+.water-bodies-labels[zoom=10][area>100000000][kind=lake] name,
+.water-bodies-labels[zoom=11][area>25000000] name
+{ 
+    text-face-name: 'Arial Unicode MS Italic';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 200;
+    text-allow-overlap: false;
+    text-wrap-width: 50;
+}
+
+
+.water-bodies-labels[zoom=12][area>5000000][kind=lake] name,
+#green-areas-labels[zoom=12][area>5000000] name
+{ 
+    text-face-name: 'Arial Unicode MS Italic';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 200;
+    text-allow-overlap: false;
+    text-wrap-width: 70;
+}
+
+
+.water-bodies-labels[zoom=13][area>2000000][kind=lake] name,
+#green-areas-labels[zoom=13][area>2000000] name
+{ 
+    text-face-name: 'Arial Unicode MS Italic';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 100;
+    text-allow-overlap: false;
+    text-wrap-width: 70;
+}
+.water-bodies-labels[zoom=14][area>200000] name,
+#green-areas-labels[zoom=14][area>200000] name
+{ 
+    text-face-name: 'Arial Unicode MS Italic';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 100;
+    text-allow-overlap: false;
+    text-wrap-width: 70;
+}
+.water-bodies-labels[zoom=15][area>50000] name,
+#green-areas-labels[zoom=15][area>50000] name 
+{ 
+    text-face-name: 'Arial Unicode MS Italic';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-halo-radius: 2;
+    text-spacing: 100;
+    text-allow-overlap: false;
+    text-wrap-width: 30;
+}
+
+.water-bodies-labels[zoom=16][area>10000] name,
+.water-bodies-labels[zoom>=17] name,
+#green-areas-labels[zoom=16][area>10000] name,
+#green-areas-labels[zoom>=17] name
+{ 
+    text-face-name: 'Arial Unicode MS Italic';
+    text-size: 13;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-wrap-width: 40;
+    text-halo-radius: 2;
+    text-spacing: 100;
+    text-allow-overlap: false;
+    text-wrap-width: 40;
+}
+
+.water-bodies-labels[zoom>=9] name
+{
+    text-fill: #fff;
+    text-halo-fill: #000;
+    text-size: 13 !important;
+}
+.water-bodies-labels[zoom>=16] name
+{
+    text-size: 14 !important;
+}
+
+#green-areas-labels[zoom>=12] name
+{
+    text-fill: #000;
+    text-halo-fill: #fff;
+}
+
+
+
+/*
+Road labels
+*/
+#major-road-labels[zoom>=12] name
+{
+    text-face-name: 'Arial Unicode MS Bold';
+    text-placement: line;
+    text-max-char-angle-delta: 30;
+    text-fill: #000;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+}
+
+#major-road-labels[highway=trunk][zoom>=14] name
+{
+    text-face-name: 'Arial Unicode MS Bold';
+    text-placement: line;
+    text-max-char-angle-delta: 30;
+    text-fill: #000;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+}
+
+#major-road-labels[highway=primary][zoom>=14] name
+{
+    text-face-name: 'Arial Unicode MS Bold';
+    text-placement: line;
+    text-max-char-angle-delta: 30;
+    text-fill: #000;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+}
+
+#major-road-labels[highway=primary][zoom>=16] name
+{
+    text-halo-radius: 2;
+}
+
+#major-road-labels[zoom=16] name
+{
+    text-fill: #000;
+    text-halo-fill: #fff;
+}
+
+#major-road-labels[is_tunnel=yes][zoom>=15] name
+{
+    text-fill: #777;
+    text-halo-fill: #fff;
+}
+
+#minor-road-labels[zoom>=16] name
+{
+    text-face-name: 'Arial Unicode MS Bold';
+    text-placement: line;
+    text-max-char-angle-delta: 30;
+    text-fill: #000;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+}
+
+#major-road-labels[zoom=12] name { text-dy: 7; }
+#major-road-labels[highway=trunk][zoom=12] name { text-size: 12; }
+#major-road-labels[highway=primary][zoom=12] name { text-size: 12; }
+
+#major-road-labels[zoom=13] name { text-dy: 8; }
+#major-road-labels[highway=trunk][zoom=13] name { text-size: 13; }
+#major-road-labels[highway=primary][zoom=13] name { text-size: 13; }
+
+#major-road-labels[highway=trunk][zoom=14] name { text-dy: 9; text-size: 14; }
+#major-road-labels[highway=primary][zoom=14] name { text-dy: 9; text-size: 14; 
}
+#major-road-labels[highway=secondary][zoom=14] name { text-dy: 7; text-size: 
12; }
+
+#major-road-labels[highway=trunk][zoom=15] name { text-dy: 12; text-size: 15; }
+#major-road-labels[highway=primary][zoom=15] name { text-dy: 12; text-size: 
15; }
+#major-road-labels[highway=secondary][zoom=15] name { text-dy: 11; text-size: 
13; }
+#major-road-labels[highway=tertiary][zoom=15] name { text-dy: 11; text-size: 
13; }
+
+#major-road-labels[highway=trunk][zoom=16] name { text-dy: 13; text-size: 14; }
+#major-road-labels[highway=primary][zoom=16] name { text-dy: 13; text-size: 
14; }
+#major-road-labels[highway=secondary][zoom=16] name { text-dy: 13; 
text-spacing: 124; text-size: 13; text-halo-radius: 2; }
+#major-road-labels[highway=tertiary][zoom=16] name { text-dy: 13; 
text-spacing: 124; text-size: 13; text-halo-radius: 2; }
+#minor-road-labels[zoom=16] name { text-dy: 10; text-spacing: 124; text-size: 
10; text-halo-radius: 2; }
+
+#major-road-labels[highway=trunk][zoom=17] name { text-dy: 16; text-size: 16; }
+#major-road-labels[highway=primary][zoom=17] name { text-dy: 14; text-size: 
14; }
+#major-road-labels[highway=secondary][zoom=17] name { text-dy: 14; 
text-spacing: 180; text-size: 14; text-halo-radius: 2; }
+#major-road-labels[highway=tertiary][zoom=17] name { text-dy: 13; 
text-spacing: 180; text-size: 12; text-halo-radius: 2; }
+#minor-road-labels[zoom=17] name { text-dy: 13; text-spacing: 180; text-size: 
12; text-halo-radius: 2; }
+
+#major-road-labels[highway=trunk][zoom>=18] name { text-size: 16; }
+#major-road-labels[highway=primary][zoom>=18] name { text-size: 14; }
+#major-road-labels[highway=secondary][zoom>=18] name { text-size: 14; 
text-spacing: 300; text-halo-radius: 2; }
+#major-road-labels[highway=tertiary][zoom>=18] name { text-size: 12; 
text-spacing: 400; text-halo-radius: 2; }
+#minor-road-labels[zoom>=18] name { text-size: 12; text-spacing: 400; 
text-halo-radius: 2; }
+
+
+/*
+Subway stations and icons
+*/
+#poi-stations[zoom>=18][railway=station] name 
+{ 
+    text-face-name: 'Arial Bold';
+    text-size: 12;
+    text-placement: point;
+    text-max-char-angle-delta: 30;
+    text-fill: #4581C3;
+    text-halo-radius: 1;
+    text-halo-fill: #fff;
+    text-spacing: 100;
+    text-allow-overlap: true;
+    text-wrap-width: 30;
+    text-dx: 0;
+    text-dy: 8;
+}
+
+#poi-station-labels[zoom=17][railway=station] { 
+       point-file: url('icons/subway_sm.png'); 
+}
+
+#poi-station-labels[zoom>=18][railway=station] { 
+       point-file: url('icons/subway.png'); 
+}
+
+
+/*
+.airports[zoom=2][natlscale>148],
+.airports[zoom=3][natlscale>74],
+.airports[zoom=4][natlscale>37],
+.airports[zoom=5][natlscale>18],
+.airports[zoom=6][natlscale>9.2],
+.airports[zoom=7][natlscale>4.6],
+.airports[zoom=8][natlscale>2.3],
+.airports[zoom=9][natlscale>1.2],
+*/
+.airports[zoom=10][natlscale>.57],
+.airports[zoom=11][natlscale>.29],
+/*
+.airports[zoom=12][natlscale>.14],
+.airports[zoom=13][natlscale>.07]
+*/
+.airports[zoom=12][natlscale>.29],
+.airports[zoom=13][natlscale>.29]
+{
+    point-file: url('icons/airplane-19-reverse.png');
+}
+
+/*
+.airports[zoom=14][natlscale>.04],
+.airports[zoom=15][natlscale>.02],
+.airports[zoom>=16][natlscale>.01],
+.airports[zoom=14][natlscale>.29],
+.airports[zoom=15][natlscale>.29],
+.airports[zoom>=16][natlscale>.29]
+{
+    point-file: url('icons/airplane-35-reverse.png');
+}
+*/
+
+
+/*
+.airports[zoom=2][natlscale>148] label_sm,
+.airports[zoom=3][natlscale>74] label_sm,
+.airports[zoom=4][natlscale>37] label_sm,
+.airports[zoom=5][natlscale>18] label_sm,
+.airports[zoom=6][natlscale>9.2] label_sm,
+.airports[zoom=7][natlscale>4.6] label_sm,
+.airports[zoom=8][natlscale>2.3] label_sm,
+.airports[zoom=9][natlscale>1.2] label_sm,
+.airports[zoom=10][natlscale>.57] label_sm,
+*/
+/*
+.airports[zoom=11][natlscale>.29] label_sm,
+.airports[zoom=12][natlscale>.29] label_sm,
+*/
+/*
+.airports[zoom=12][natlscale>.14] label_sm,
+.airports[zoom=13][natlscale>.07] label_lng,
+.airports[zoom=14][natlscale>.04] label_lng,
+.airports[zoom=15][natlscale>.02] label_lng,
+.airports[zoom>=16][natlscale>.01] label_lng
+*/
+.airports[zoom=13][natlscale>.29] label_lng,
+.airports[zoom=14][natlscale>.29] label_lng,
+.airports[zoom=15][natlscale>.29] label_lng,
+.airports[zoom>=16][natlscale>.29] label_lng
+{
+    text-face-name: 'Arial Unicode MS Italic';
+    text-fill: #000;
+    text-size: 14;
+    
+    text-halo-fill: #fff;
+    text-halo-radius: 2;
+    
+    text-wrap-width: 128;
+    text-dy: 14;
+
+    text-allow-overlap: true;
+}
+
+.airports[zoom=14][natlscale>.29] label_lng,
+.airports[zoom=15][natlscale>.29] label_lng,
+.airports[zoom>=16][natlscale>.29] label_lng
+{
+    text-dy: 0;
+}
\ No newline at end of file
diff --git a/stylesheet/toner/style-toner-ocitysmap.mml 
b/stylesheet/toner/style-toner-ocitysmap.mml
new file mode 100644
index 0000000..b297a89
--- /dev/null
+++ b/stylesheet/toner/style-toner-ocitysmap.mml
@@ -0,0 +1,2688 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map[
+    <!ENTITY epsg4326 "+proj=longlat +datum=WGS84">
+    <!ENTITY epsg900913 "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 
+lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m address@hidden +no_defs +over">
+    <!ENTITY epsg900913_extent "-20037508,-20037508,20037508,20037508">
+
+    <!ENTITY nev_host "localhost">
+    <!ENTITY nev_name "naturalearth">
+    <!ENTITY nev_user "maposmatic">
+    <!ENTITY nev_pass "map">
+
+    <!ENTITY osm_host "localhost">
+    <!ENTITY osm_port "5432">
+    <!ENTITY osm_name "maposmatic">
+    <!ENTITY osm_user "maposmatic">
+    <!ENTITY osm_pass "map">
+    
+    <!ENTITY included_data_host "localhost">
+    <!ENTITY included_data_port "5432">
+    <!ENTITY included_data_name "naturalearth">
+    <!ENTITY included_data_user "maposmatic">
+    <!ENTITY included_data_pass "map">
+]>
+
+<Map srs="&epsg900913;">
+    
+    <!-- -->
+    <Stylesheet src="naturalearth-lowzooms.mss"/>
+    <Stylesheet src="stylesheet.mss"/> 
+    <!-- -->
+    <Stylesheet src="labels-ocitysmap.mss"/>
+    <!--
+    <Stylesheet src="toner-only-labels.mss"/>
+    -->
+    <!--
+    <Stylesheet src="toner-hybrid-with-labels.mss"/>
+    -->    
+    <!--
+    <Stylesheet src="toner-hybrid-only-labels.mss"/>
+    -->    
+
+       <!-- start NATURAL EARTH -->
+       
+    <Layer class="shore" id="land-shapes-110m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">ne_110m_land</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="country-shapes-110m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">ne_110m_admin_0_countries</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="country-shapes-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">ne_50m_admin_0_countries</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+     <Layer class="shore" id="country-shapes-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">ne_10m_admin_0_countries</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="country-shapes-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">ne_10m_admin_0_countries</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+        
+    <Layer class="shore" id="coastline-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">ne_10m_coastline</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer status="on" id="land" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">coastline</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="admin1-lines-110m" status="off" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter 
name="table">ne_110m_admin_1_states_provinces_lines_shp</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="admin1-lines-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter 
name="table">ne_50m_admin_1_states_provinces_lines_shp</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="admin1-lines-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter 
name="table">ne_10m_admin_1_states_provinces_lines_shp</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer class="country-boundary-10m-whiteout" 
id="ne_10m_admin_0_boundary_lines_land" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">ne_10m_admin_0_boundary_lines_land</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="country-boundary-10m" 
id="ne_10m_admin_0_boundary_lines_land" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">ne_10m_admin_0_boundary_lines_land</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>    
+    
+    <Layer id="admin1-lines-osm" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name
+                 FROM planet_osm_polygon
+                 WHERE "boundary" IN ('administrative')
+                    AND "admin_level" IN ('4')
+                    AND "admin_level" NOT IN ('territorial_waters', 
'territorial waters')
+                 ORDER BY z_order ASC
+                
+                ) AS water]]></Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="green-areas-transparent hybrid_polygon_off" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        ST_Area(way) AS area
+                 FROM planet_osm_polygon
+                        WHERE "leisure" IN ('nature_reserve')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS greens]]></Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="green-areas hybrid_polygon_off" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        ST_Area(way) AS area,
+                        (CASE WHEN leisure IN ('park', 'water_park', 'marina',
+                                               'playground',
+                                               'garden', 'common') THEN 'park'
+                              WHEN amenity IN ('graveyard') THEN 'cemetery'
+                              WHEN landuse IN ('cemetery') THEN 'cemetery'
+                              WHEN leisure IN ('sports_centre', 'golf_course',
+                                               'stadium', 'track', 'pitch') 
THEN 'sport'
+                              WHEN landuse IN ('recreation_ground') THEN 
'sport'
+                              WHEN landuse IN ('forest', 'wood') THEN 'forest'
+                         ELSE '' END) AS kind
+                 FROM planet_osm_polygon
+                 WHERE leisure IN ('park', 'water_park', 'marina',
+                                   'playground', 'garden', 'common')
+                    OR amenity IN ('graveyard')
+                    OR landuse IN ('cemetery')
+                    OR leisure IN ('sports_centre', 'golf_course', 'stadium',
+                                   'track', 'pitch')
+                    OR landuse IN ('recreation_ground')
+                    OR landuse IN ('forest', 'wood')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS greens]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="aeroways" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        aeroway
+                 FROM planet_osm_line
+                 WHERE aeroway IS NOT NULL
+                
+                ) AS aeroway]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="water-bodies" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        ST_Area(way) AS area
+                 FROM planet_osm_polygon
+                 WHERE "natural" IN ('water', 'bay')
+                    OR waterway IN ('riverbank')
+                    OR landuse IN ('reservoir')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS water]]></Parameter>
+        </Datasource>
+    </Layer>
+        
+    <Layer class="shore" id="lakes-110m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">ne_110m_lakes</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="lakes-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">ne_50m_lakes</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="lakes-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">ne_10m_lakes</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+<!-- ZOOM 6 -->
+    <Layer class="ne_10m_z6_roads" id="z6_europe" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z6_roads" id="z6_global" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z6_roads" id="z6_global_extra" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z6_roads" id="z6_north_america" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 7 -->
+    <Layer class="ne_10m_z7_roads_casing" id="z7_europe_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_europe_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_casing" id="z7_europe_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_europe_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_europe_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_europe_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- HACK -->
+    <!-- This is neccesary as the zoom 8 global extract is broken, will be 
fixed in final 1.5 Natural Earth release -->
+    <Layer class="ne_10m_z7_roads_inline" id="z7_global_hack" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+
+    
+    <Layer class="ne_10m_z7_roads_casing" id="z7_global_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_global_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_casing" id="z7_global_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_global_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_casing" id="z7_north_america_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_north_america_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>    
+    <Layer class="ne_10m_z7_roads_casing" id="z7_north_america_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_north_america_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_north_america_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 8 -->
+    <Layer class="ne_10m_z8_roads_casing" id="z8_europe_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_europe_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_casing" id="z8_europe_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_europe_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_europe_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_europe_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_casing" id="z8_global_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_global_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_casing" id="z8_global_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_global_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_casing" id="z8_north_america_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_north_america_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>    
+    <Layer class="ne_10m_z8_roads_casing" id="z8_north_america_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_north_america_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_north_america_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_north_america_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="motorways-z9" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="geometry_field">way_zoom9</Parameter>
+            <Parameter name="table">planet_osm_motorways</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="admin1-labels-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">(SELECT *, SUBSTRING(hasc FROM 4) AS abbr 
FROM ne_50m_admin_1_states_provinces_shp) AS 
admin_1_states_provinces</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer class="admin1-labels-50m-z4" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_1_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer class="admin1-labels-50m-z5" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_1_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>    
+    <Layer class="admin1-labels-50m-z6" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_1_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>    
+    <Layer class="admin1-labels-50m-z7" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_1_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>    
+    
+    <Layer id="admin1-labels-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter 
name="table">ne_10m_admin_1_states_provinces_shp</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer class="country-labels-110m-z3" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_0_countries_110m_points</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer class="country-labels-110m-z4" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_0_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="country-labels-110m-z5" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_0_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="country-labels-110m-z6" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_0_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="marine-labels-110m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">(SELECT * FROM 
ne_110m_geography_marine_polys ORDER BY ScaleRank ASC) AS 
marine_polys</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="marine-labels-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">(SELECT * FROM 
ne_50m_geography_marine_polys ORDER BY ScaleRank ASC) AS 
marine_polys</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="marine-labels-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password">&nev_pass;</Parameter>
+            <Parameter name="table">(SELECT * FROM 
ne_10m_geography_marine_polys ORDER BY ScaleRank ASC) AS 
marine_polys</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="continent-labels" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">continents</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    
+    
+    <!-- Start HIGH ROAD  -->
+    
+    <Layer id="civic-areas" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name
+                 FROM planet_osm_polygon
+                 WHERE amenity IN ('school', 'college', 'university', 
'bus_station',
+                                   'ferry_terminal', 'hospital', 
'kindergarten',
+                                   'place_of_worship', 'public_building', 
'townhall')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS civic]]></Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="parking-areas" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name
+                 FROM planet_osm_polygon
+                 WHERE amenity IN ('parking')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS parking]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="z10-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z10</Parameter>
+        </Datasource>
+    </Layer>    
+
+    <Layer id="z11-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z11</Parameter>
+        </Datasource>
+    </Layer>    
+
+    <Layer id="z12-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z12</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="z13-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z13</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="z14-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z14</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="z15plus-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z15plus</Parameter>
+        </Datasource>
+    </Layer>
+
+
+       <!-- TODO: Update these to use the PGSQL Views above, not specific 
oddness below -->
+       
+         <Layer id="buildings" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">(SELECT way, ST_Area(way) AS area FROM 
planet_osm_polygon WHERE building IS NOT NULL ORDER BY z_order ASC, way_area 
DESC) AS footprints</Parameter>
+        </Datasource>
+    </Layer>
+
+         <Layer id="buildings-stamen" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table"><![CDATA[
+                (SELECT way, 
+                        ST_Area(way) AS area, 
+                        osm_id
+                   FROM planet_osm_polygon
+                   WHERE building IS NOT NULL 
+                      AND osm_id in (45074542)
+                   ORDER BY z_order ASC, way_area DESC
+                 ) AS footprints
+            ]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+
+    <!-- ZOOM 4 -->
+    <!-- ZOOM 4: LABELS -->
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 4: POINTS -->
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 5 -->
+    <!-- ZOOM 5: LABELS -->
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 5: POINTS -->
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 6 -->
+    <!-- ZOOM 6: LABELS -->
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 6: POINTS -->
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <!-- ZOOM 7 -->
+    <!-- ZOOM 7: LABELS -->
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 7: POINTS -->
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 8 -->
+    <!-- ZOOM 8: LABELS -->
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 8: POINTS -->
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>  
+    
+    <!-- ZOOM 9 -->
+    <!-- ZOOM 9: LABELS -->
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 9: POINTS -->
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>  
+    
+    <!-- ZOOM 10 -->
+    <!-- ZOOM 10: LABELS -->
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">australia_new_zealand_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- HACK zoom 10 never finished -->
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 10: POINTS -->
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">australia_new_zealand_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- HACK zoom 10 never finished -->
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 11 -->
+    <!-- ZOOM 11: LABELS -->
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">australia_new_zealand_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- HACK zoom 10 never finished -->
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+    
+    <!-- ZOOM 12 -->
+    <!-- ZOOM 12: LABELS -->
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">australia_new_zealand_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- HACK zoom 10 never finished -->
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+
+    <!--                   -->
+    <!-- NOW SWITCH TO OSM -->
+    <!--                   -->
+    
+    <Layer class="osm-place-points" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+                       <Parameter name="table"><![CDATA[
+                (SELECT *,
+                        COALESCE(z_order, 0) AS coalesced_z_order,
+                        (CASE WHEN place = 'city' THEN 0
+                              WHEN place = 'town' THEN 1
+                              WHEN place = 'village' THEN 2
+                              ELSE 3 END) AS priority
+                 FROM planet_osm_point
+                 WHERE place IN ('city', 'town', 'hamlet', 'village', 
'locality')
+                 ORDER BY priority ASC, coalesced_z_order DESC
+                ) AS places]]></Parameter>
+        </Datasource>
+    </Layer>      
+
+ <!--
+        Labels for motorways and major roads.
+    -->
+    <Layer id="green-areas-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        ST_Area(way) AS area,
+                        (CASE WHEN leisure IN ('park', 'water_park', 'marina',
+                                               'nature_reserve', 'playground',
+                                               'garden', 'common') THEN 'park'
+                              WHEN amenity IN ('graveyard') THEN 'cemetery'
+                              WHEN landuse IN ('cemetery') THEN 'cemetery'
+                              WHEN leisure IN ('sports_centre', 'golf_course',
+                                               'stadium', 'track', 'pitch') 
THEN 'sport'
+                              WHEN landuse IN ('recreation_ground') THEN 
'sport'
+                              WHEN landuse IN ('forest', 'wood') THEN 'forest'
+                         ELSE '' END) AS kind
+                 FROM planet_osm_polygon
+                 WHERE leisure IN ('park', 'water_park', 'marina', 
'nature_reserve',
+                                   'playground', 'garden', 'common')
+                    OR amenity IN ('graveyard')
+                    OR landuse IN ('cemetery')
+                    OR leisure IN ('sports_centre', 'golf_course', 'stadium',
+                                   'track', 'pitch')
+                    OR landuse IN ('recreation_ground')
+                    OR landuse IN ('forest', 'wood')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS greens]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="major-road-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        (CASE WHEN highway = 'motorway'
+                              THEN ''
+                              ELSE name
+                              END) AS name,
+                        (CASE WHEN highway = 'motorway' AND CHAR_LENGTH(ref) 
BETWEEN 2 AND 15
+                              THEN REGEXP_REPLACE(ref, E'\s*;\s*', E' / ', 'g')
+                              ELSE ''
+                              END) AS ref,
+                        (CASE WHEN highway = 'motorway' AND CHAR_LENGTH(ref) 
BETWEEN 2 AND 15
+                              THEN CHAR_LENGTH(ref)
+                              ELSE 0
+                              END) AS ref_length,
+
+                        highway,
+                        ST_Length(way) AS length,
+
+                        (CASE WHEN highway IN ('motorway', 'motorway_link') 
THEN 0
+                              WHEN highway IN ('footpath', 'track', 'footway', 
'steps', 'pedestrian', 'path', 'cycleway') THEN 1
+                              WHEN railway IN ('rail', 'spur', 'subway', 
'light_rail', 'tram', 'abandoned', 'disused', 'monorail') THEN 2
+                              WHEN highway IN ('trunk', 'trunk_link', 
'primary', 'primary_link') THEN 3
+                              WHEN highway = 'secondary' THEN 4
+                              WHEN highway = 'tertiary' THEN 5
+                              ELSE 9 END) AS priority,
+                        (CASE WHEN highway IN ('secondary', 'trunk', 
'trunk_link', 'primary', 'primary_link', 'motorway', 'motorway_link') THEN 
'major_road'
+                              WHEN highway IN ('residential', 'unclassified', 
'service', 'minor', 'road', 'tertiary') THEN 'minor_road'
+                              WHEN railway IN ('rail', 'spur', 'subway', 
'light_rail', 'tram', 'abandoned', 'disused', 'monorail') THEN 'rail'
+                              WHEN highway IN ('footpath', 'track', 'footway', 
'steps', 'pedestrian', 'path', 'cycleway') THEN 'path'
+                              ELSE '' END) AS kind,
+                        (CASE WHEN tunnel IN ('yes', 'true') THEN 'yes'
+                              ELSE 'no' END) AS is_tunnel,
+                        (CASE WHEN bridge IN ('yes', 'true') THEN 'yes'
+                              ELSE 'no' END) AS is_bridge
+
+                 FROM planet_osm_line
+
+                 WHERE highway IN ('secondary', 'trunk', 'trunk_link', 
'primary', 'primary_link', 'motorway', 'motorway_link')
+
+                 ORDER BY priority ASC, length DESC)
+                 
+                 AS collected_lines]]></Parameter>
+        </Datasource>
+    </Layer>
+
+    <!--
+        Labels for residential and minor roads.
+    -->
+    <Layer id="minor-road-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+
+                        highway,
+                        ST_Length(way) AS length,
+
+                        (CASE WHEN highway IN ('motorway', 'motorway_link') 
THEN 0
+                              WHEN highway IN ('footpath', 'track', 'footway', 
'steps', 'pedestrian', 'path', 'cycleway') THEN 1
+                              WHEN railway IN ('rail', 'spur', 'subway', 
'light_rail', 'tram', 'abandoned', 'disused', 'monorail') THEN 2
+                              WHEN highway IN ('trunk', 'trunk_link', 
'primary', 'primary_link') THEN 3
+                              WHEN highway = 'secondary' THEN 4
+                              WHEN highway = 'tertiary' THEN 5
+                              ELSE 9 END) AS priority,
+                        (CASE WHEN highway IN ('secondary', 'trunk', 
'trunk_link', 'primary', 'primary_link', 'motorway', 'motorway_link') THEN 
'major_road'
+                              WHEN highway IN ('residential', 'unclassified', 
'service', 'minor', 'road', 'tertiary') THEN 'minor_road'
+                              WHEN railway IN ('rail', 'spur', 'subway', 
'light_rail', 'tram', 'abandoned', 'disused', 'monorail') THEN 'rail'
+                              WHEN highway IN ('footpath', 'track', 'footway', 
'steps', 'pedestrian', 'path', 'cycleway') THEN 'path'
+                              ELSE '' END) AS kind,
+                        (CASE WHEN tunnel IN ('yes', 'true') THEN 'yes'
+                              ELSE 'no' END) AS is_tunnel,
+                        (CASE WHEN bridge IN ('yes', 'true') THEN 'yes'
+                              ELSE 'no' END) AS is_bridge
+
+                 FROM planet_osm_line
+
+                 WHERE highway IN ('residential', 'unclassified', 'service', 
'minor', 'road', 'tertiary')
+
+                 ORDER BY priority ASC, length DESC)
+                 
+                 AS collected_lines]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer class="water-bodies-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        ST_Area(way) AS area,
+                        (CASE WHEN "natural" IN ('water', 'bay') THEN 'sea'
+                              WHEN waterway IN ('riverbank') THEN 'river'
+                              WHEN landuse IN ('reservoir') THEN 'lake'
+                         ELSE '' END) AS kind
+                 FROM planet_osm_polygon
+                 WHERE "natural" IN ('water', 'bay')
+                    OR waterway IN ('riverbank')
+                    OR landuse IN ('reservoir')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS water]]></Parameter>
+        </Datasource>
+    </Layer>    
+    
+    <Layer id="poi-station-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        railway,
+                        highway
+                 FROM planet_osm_point
+                                WHERE "railway" IN ('station') OR
+                                       "highway" IN ('bus_stop')
+                 ORDER BY z_order ASC, way DESC
+                
+                ) AS poi]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer class="airports" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">airports_simple_0d29_less_merc</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+</Map>
diff --git a/stylesheet/toner/style-toner-standard.mml 
b/stylesheet/toner/style-toner-standard.mml
new file mode 100644
index 0000000..0439c00
--- /dev/null
+++ b/stylesheet/toner/style-toner-standard.mml
@@ -0,0 +1,2518 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map[
+    <!ENTITY epsg4326 "+proj=longlat +datum=WGS84">
+    <!ENTITY epsg900913 "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 
+lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m address@hidden +no_defs +over">
+    <!ENTITY epsg900913_extent "-20037508,-20037508,20037508,20037508">
+
+    <!ENTITY nev_host "localhost">
+    <!ENTITY nev_name "naturalearth1.1_merc">
+    <!ENTITY nev_user "nev">
+
+    <!ENTITY osm_host "localhost">
+    <!ENTITY osm_port "5432">
+    <!ENTITY osm_name "planet_osm">
+    <!ENTITY osm_user "osm">
+    <!ENTITY osm_pass "">
+    
+    <!ENTITY included_data_host "localhost">
+    <!ENTITY included_data_port "5432">
+    <!ENTITY included_data_name "toner">
+    <!ENTITY included_data_user "osm">
+    <!ENTITY included_data_pass "">
+]>
+
+<Map srs="&epsg900913;">
+    
+    <!-- -->
+    <Stylesheet src="naturalearth-lowzooms.mss"/>
+    <Stylesheet src="stylesheet.mss"/> 
+    <!-- -->
+    <Stylesheet src="labels.mss"/>
+    <!--
+    <Stylesheet src="toner-only-labels.mss"/>
+    -->
+    <!--
+    <Stylesheet src="toner-hybrid-with-labels.mss"/>
+    -->    
+    <!--
+    <Stylesheet src="toner-hybrid-only-labels.mss"/>
+    -->    
+
+       <!-- start NATURAL EARTH -->
+       
+    <Layer class="shore" id="land-shapes-110m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">land_110m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="country-shapes-110m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">admin_0_countries_110m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="country-shapes-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">admin_0_countries_50m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+     <Layer class="shore" id="country-shapes-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">admin_0_countries_10m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="country-shapes-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">admin_0_countries_10m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+        
+    <Layer class="shore" id="coastline-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">coastline_10m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer status="on" id="land" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">coastline</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="admin1-lines-110m" status="off" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter 
name="table">admin_1_states_provinces_lines_110m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="admin1-lines-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter 
name="table">admin_1_states_provinces_lines_50m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="admin1-lines-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter 
name="table">admin_1_states_provinces_lines_10m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer class="country-boundary-10m-whiteout" 
id="ne_10m_admin_0_boundary_lines_land" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">ne_10m_admin_0_boundary_lines_land</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="country-boundary-10m" 
id="ne_10m_admin_0_boundary_lines_land" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">ne_10m_admin_0_boundary_lines_land</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>    
+    
+    <Layer id="admin1-lines-osm" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name
+                 FROM planet_osm_polygon
+                 WHERE "boundary" IN ('administrative')
+                    AND "admin_level" IN ('4')
+                    AND "admin_level" NOT IN ('territorial_waters', 
'territorial waters')
+                 ORDER BY z_order ASC
+                
+                ) AS water]]></Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="green-areas-transparent hybrid_polygon_off" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        ST_Area(way) AS area
+                 FROM planet_osm_polygon
+                        WHERE "leisure" IN ('nature_reserve')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS greens]]></Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="green-areas hybrid_polygon_off" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        ST_Area(way) AS area,
+                        (CASE WHEN leisure IN ('park', 'water_park', 'marina',
+                                               'playground',
+                                               'garden', 'common') THEN 'park'
+                              WHEN amenity IN ('graveyard') THEN 'cemetery'
+                              WHEN landuse IN ('cemetery') THEN 'cemetery'
+                              WHEN leisure IN ('sports_centre', 'golf_course',
+                                               'stadium', 'track', 'pitch') 
THEN 'sport'
+                              WHEN landuse IN ('recreation_ground') THEN 
'sport'
+                              WHEN landuse IN ('forest', 'wood') THEN 'forest'
+                         ELSE '' END) AS kind
+                 FROM planet_osm_polygon
+                 WHERE leisure IN ('park', 'water_park', 'marina',
+                                   'playground', 'garden', 'common')
+                    OR amenity IN ('graveyard')
+                    OR landuse IN ('cemetery')
+                    OR leisure IN ('sports_centre', 'golf_course', 'stadium',
+                                   'track', 'pitch')
+                    OR landuse IN ('recreation_ground')
+                    OR landuse IN ('forest', 'wood')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS greens]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="aeroways" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        aeroway
+                 FROM planet_osm_line
+                 WHERE aeroway IS NOT NULL
+                
+                ) AS aeroway]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="water-bodies" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        ST_Area(way) AS area
+                 FROM planet_osm_polygon
+                 WHERE "natural" IN ('water', 'bay')
+                    OR waterway IN ('riverbank')
+                    OR landuse IN ('reservoir')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS water]]></Parameter>
+        </Datasource>
+    </Layer>
+        
+    <Layer class="shore" id="lakes-110m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">lakes_110m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="lakes-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">lakes_50m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="shore" id="lakes-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">lakes_10m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+<!-- ZOOM 6 -->
+    <Layer class="ne_10m_z6_roads" id="z6_europe" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z6_roads" id="z6_global" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z6_roads" id="z6_global_extra" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z6_roads" id="z6_north_america" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 7 -->
+    <Layer class="ne_10m_z7_roads_casing" id="z7_europe_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_europe_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_casing" id="z7_europe_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_europe_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_europe_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_europe_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- HACK -->
+    <!-- This is neccesary as the zoom 8 global extract is broken, will be 
fixed in final 1.5 Natural Earth release -->
+    <Layer class="ne_10m_z7_roads_inline" id="z7_global_hack" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z6_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+
+    
+    <Layer class="ne_10m_z7_roads_casing" id="z7_global_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_global_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_casing" id="z7_global_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_global_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_casing" id="z7_north_america_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_north_america_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>    
+    <Layer class="ne_10m_z7_roads_casing" id="z7_north_america_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_north_america_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z7_roads_inline" id="z7_north_america_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z7_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 8 -->
+    <Layer class="ne_10m_z8_roads_casing" id="z8_europe_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_europe_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_europe</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_casing" id="z8_europe_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_europe_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_europe_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_europe_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_casing" id="z8_global_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_global_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_global</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_casing" id="z8_global_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_global_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_global_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_casing" id="z8_north_america_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_north_america_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_north_america</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>    
+    <Layer class="ne_10m_z8_roads_casing" id="z8_north_america_extra_outline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_north_america_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="ne_10m_z8_roads_inline" id="z8_north_america_extra_inline" 
srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">roads_z8_north_america_extra</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="motorways-z9" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="geometry_field">way_zoom9</Parameter>
+            <Parameter name="table">planet_osm_motorways</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="admin1-labels-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">(SELECT *, SUBSTRING(hasc FROM 4) AS abbr 
FROM admin_1_states_provinces_50m) AS admin_1_states_provinces</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer class="admin1-labels-50m-z4" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_1_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer class="admin1-labels-50m-z5" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_1_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>    
+    <Layer class="admin1-labels-50m-z6" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_1_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>    
+    <Layer class="admin1-labels-50m-z7" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_1_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>    
+    
+    <Layer id="admin1-labels-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">admin_1_states_provinces_10m</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer class="country-labels-110m-z3" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_0_countries_110m_points</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer class="country-labels-110m-z4" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_0_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="country-labels-110m-z5" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_0_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="country-labels-110m-z6" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">admin_0_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="marine-labels-110m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">(SELECT * FROM geography_marine_polys_110m 
ORDER BY ScaleRank ASC) AS marine_polys</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="marine-labels-50m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">(SELECT * FROM geography_marine_polys_50m 
ORDER BY ScaleRank ASC) AS marine_polys</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="marine-labels-10m" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&nev_host;</Parameter>
+            <Parameter name="dbname">&nev_name;</Parameter>
+            <Parameter name="user">&nev_user;</Parameter>      
+            <Parameter name="password"></Parameter>
+            <Parameter name="table">(SELECT * FROM geography_marine_polys_10m 
ORDER BY ScaleRank ASC) AS marine_polys</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="continent-labels" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">continents</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+    
+    
+    <!-- Start HIGH ROAD  -->
+    
+    <Layer id="civic-areas" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name
+                 FROM planet_osm_polygon
+                 WHERE amenity IN ('school', 'college', 'university', 
'bus_station',
+                                   'ferry_terminal', 'hospital', 
'kindergarten',
+                                   'place_of_worship', 'public_building', 
'townhall')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS civic]]></Parameter>
+        </Datasource>
+    </Layer>
+    <Layer id="parking-areas" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name
+                 FROM planet_osm_polygon
+                 WHERE amenity IN ('parking')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS parking]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="z10-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z10</Parameter>
+        </Datasource>
+    </Layer>    
+
+    <Layer id="z11-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z11</Parameter>
+        </Datasource>
+    </Layer>    
+
+    <Layer id="z12-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z12</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="z13-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z13</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="z14-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z14</Parameter>
+        </Datasource>
+    </Layer>
+
+    <Layer id="z15plus-roads" class="roads" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">planet_osm_line_z15plus</Parameter>
+        </Datasource>
+    </Layer>
+
+
+       <!-- TODO: Update these to use the PGSQL Views above, not specific 
oddness below -->
+       
+         <Layer id="buildings" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table">(SELECT way, ST_Area(way) AS area FROM 
planet_osm_polygon WHERE building IS NOT NULL ORDER BY z_order ASC, way_area 
DESC) AS footprints</Parameter>
+        </Datasource>
+    </Layer>
+
+         <Layer id="buildings-stamen" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+            <Parameter name="table"><![CDATA[
+                (SELECT way, 
+                        ST_Area(way) AS area, 
+                        osm_id
+                   FROM planet_osm_polygon
+                   WHERE building IS NOT NULL 
+                      AND osm_id in (45074542)
+                   ORDER BY z_order ASC, way_area DESC
+                 ) AS footprints
+            ]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+
+    <!-- ZOOM 4 -->
+    <!-- ZOOM 4: LABELS -->
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 4: POINTS -->
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z4" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z4</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 5 -->
+    <!-- ZOOM 5: LABELS -->
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 5: POINTS -->
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z5" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z5</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 6 -->
+    <!-- ZOOM 6: LABELS -->
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 6: POINTS -->
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z6" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z6</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+
+    <!-- ZOOM 7 -->
+    <!-- ZOOM 7: LABELS -->
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 7: POINTS -->
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z7" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z7</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 8 -->
+    <!-- ZOOM 8: LABELS -->
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 8: POINTS -->
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z8" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z8</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>  
+    
+    <!-- ZOOM 9 -->
+    <!-- ZOOM 9: LABELS -->
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 9: POINTS -->
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">australia_new_zealand_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z9" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>  
+    
+    <!-- ZOOM 10 -->
+    <!-- ZOOM 10: LABELS -->
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">australia_new_zealand_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- HACK zoom 10 never finished -->
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_labels_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-labels-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_labels_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- ZOOM 10: POINTS -->
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">australia_new_zealand_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- HACK zoom 10 never finished -->
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z10" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+    <!-- ZOOM 11 -->
+    <!-- ZOOM 11: LABELS -->
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">australia_new_zealand_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- HACK zoom 10 never finished -->
+    <Layer class="city-points-z11" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+    
+    <!-- ZOOM 12 -->
+    <!-- ZOOM 12: LABELS -->
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">africa_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">asia_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter 
name="table">australia_new_zealand_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">north_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">south_america_points_z10</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- HACK zoom 10 never finished -->
+    <Layer class="city-points-z12" srs="&epsg4326;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">europe_points_z9</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    <!-- END HACK -->
+
+    <!--                   -->
+    <!-- NOW SWITCH TO OSM -->
+    <!--                   -->
+    
+    <Layer class="osm-place-points" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+                       <Parameter name="table"><![CDATA[
+                (SELECT *,
+                        COALESCE(z_order, 0) AS coalesced_z_order,
+                        (CASE WHEN place = 'city' THEN 0
+                              WHEN place = 'town' THEN 1
+                              WHEN place = 'village' THEN 2
+                              ELSE 3 END) AS priority
+                 FROM planet_osm_point
+                 WHERE place IN ('city', 'town', 'hamlet', 'village')
+                 ORDER BY priority ASC, coalesced_z_order DESC
+                ) AS places]]></Parameter>
+        </Datasource>
+    </Layer>      
+
+ <!--
+        Labels for motorways and major roads.
+    -->
+    <Layer id="green-areas-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        ST_Area(way) AS area,
+                        (CASE WHEN leisure IN ('park', 'water_park', 'marina',
+                                               'nature_reserve', 'playground',
+                                               'garden', 'common') THEN 'park'
+                              WHEN amenity IN ('graveyard') THEN 'cemetery'
+                              WHEN landuse IN ('cemetery') THEN 'cemetery'
+                              WHEN leisure IN ('sports_centre', 'golf_course',
+                                               'stadium', 'track', 'pitch') 
THEN 'sport'
+                              WHEN landuse IN ('recreation_ground') THEN 
'sport'
+                              WHEN landuse IN ('forest', 'wood') THEN 'forest'
+                         ELSE '' END) AS kind
+                 FROM planet_osm_polygon
+                 WHERE leisure IN ('park', 'water_park', 'marina', 
'nature_reserve',
+                                   'playground', 'garden', 'common')
+                    OR amenity IN ('graveyard')
+                    OR landuse IN ('cemetery')
+                    OR leisure IN ('sports_centre', 'golf_course', 'stadium',
+                                   'track', 'pitch')
+                    OR landuse IN ('recreation_ground')
+                    OR landuse IN ('forest', 'wood')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS greens]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer id="major-road-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        (CASE WHEN highway = 'motorway'
+                              THEN ''
+                              ELSE name
+                              END) AS name,
+                        (CASE WHEN highway = 'motorway' AND CHAR_LENGTH(ref) 
BETWEEN 2 AND 15
+                              THEN REGEXP_REPLACE(ref, E'\s*;\s*', E' / ', 'g')
+                              ELSE ''
+                              END) AS ref,
+                        (CASE WHEN highway = 'motorway' AND CHAR_LENGTH(ref) 
BETWEEN 2 AND 15
+                              THEN CHAR_LENGTH(ref)
+                              ELSE 0
+                              END) AS ref_length,
+
+                        highway,
+                        ST_Length(way) AS length,
+
+                        (CASE WHEN highway IN ('motorway', 'motorway_link') 
THEN 0
+                              WHEN highway IN ('footpath', 'track', 'footway', 
'steps', 'pedestrian', 'path', 'cycleway') THEN 1
+                              WHEN railway IN ('rail', 'spur', 'subway', 
'light_rail', 'tram', 'abandoned', 'disused', 'monorail') THEN 2
+                              WHEN highway IN ('trunk', 'trunk_link', 
'primary', 'primary_link') THEN 3
+                              WHEN highway = 'secondary' THEN 4
+                              WHEN highway = 'tertiary' THEN 5
+                              ELSE 9 END) AS priority,
+                        (CASE WHEN highway IN ('secondary', 'trunk', 
'trunk_link', 'primary', 'primary_link', 'motorway', 'motorway_link') THEN 
'major_road'
+                              WHEN highway IN ('residential', 'unclassified', 
'service', 'minor', 'road', 'tertiary') THEN 'minor_road'
+                              WHEN railway IN ('rail', 'spur', 'subway', 
'light_rail', 'tram', 'abandoned', 'disused', 'monorail') THEN 'rail'
+                              WHEN highway IN ('footpath', 'track', 'footway', 
'steps', 'pedestrian', 'path', 'cycleway') THEN 'path'
+                              ELSE '' END) AS kind,
+                        (CASE WHEN tunnel IN ('yes', 'true') THEN 'yes'
+                              ELSE 'no' END) AS is_tunnel,
+                        (CASE WHEN bridge IN ('yes', 'true') THEN 'yes'
+                              ELSE 'no' END) AS is_bridge
+
+                 FROM planet_osm_line
+
+                 WHERE highway IN ('secondary', 'trunk', 'trunk_link', 
'primary', 'primary_link', 'motorway', 'motorway_link')
+
+                 ORDER BY priority ASC, length DESC)
+                 
+                 AS collected_lines]]></Parameter>
+        </Datasource>
+    </Layer>
+
+    <!--
+        Labels for residential and minor roads.
+    -->
+    <Layer id="minor-road-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+
+                        highway,
+                        ST_Length(way) AS length,
+
+                        (CASE WHEN highway IN ('motorway', 'motorway_link') 
THEN 0
+                              WHEN highway IN ('footpath', 'track', 'footway', 
'steps', 'pedestrian', 'path', 'cycleway') THEN 1
+                              WHEN railway IN ('rail', 'spur', 'subway', 
'light_rail', 'tram', 'abandoned', 'disused', 'monorail') THEN 2
+                              WHEN highway IN ('trunk', 'trunk_link', 
'primary', 'primary_link') THEN 3
+                              WHEN highway = 'secondary' THEN 4
+                              WHEN highway = 'tertiary' THEN 5
+                              ELSE 9 END) AS priority,
+                        (CASE WHEN highway IN ('secondary', 'trunk', 
'trunk_link', 'primary', 'primary_link', 'motorway', 'motorway_link') THEN 
'major_road'
+                              WHEN highway IN ('residential', 'unclassified', 
'service', 'minor', 'road', 'tertiary') THEN 'minor_road'
+                              WHEN railway IN ('rail', 'spur', 'subway', 
'light_rail', 'tram', 'abandoned', 'disused', 'monorail') THEN 'rail'
+                              WHEN highway IN ('footpath', 'track', 'footway', 
'steps', 'pedestrian', 'path', 'cycleway') THEN 'path'
+                              ELSE '' END) AS kind,
+                        (CASE WHEN tunnel IN ('yes', 'true') THEN 'yes'
+                              ELSE 'no' END) AS is_tunnel,
+                        (CASE WHEN bridge IN ('yes', 'true') THEN 'yes'
+                              ELSE 'no' END) AS is_bridge
+
+                 FROM planet_osm_line
+
+                 WHERE highway IN ('residential', 'unclassified', 'service', 
'minor', 'road', 'tertiary')
+
+                 ORDER BY priority ASC, length DESC)
+                 
+                 AS collected_lines]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer class="water-bodies-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        ST_Area(way) AS area,
+                        (CASE WHEN "natural" IN ('water', 'bay') THEN 'sea'
+                              WHEN waterway IN ('riverbank') THEN 'river'
+                              WHEN landuse IN ('reservoir') THEN 'lake'
+                         ELSE '' END) AS kind
+                 FROM planet_osm_polygon
+                 WHERE "natural" IN ('water', 'bay')
+                    OR waterway IN ('riverbank')
+                    OR landuse IN ('reservoir')
+                 ORDER BY z_order ASC, way_area DESC
+                
+                ) AS water]]></Parameter>
+        </Datasource>
+    </Layer>    
+    
+    <Layer id="poi-station-labels" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&osm_host;</Parameter>
+            <Parameter name="port">&osm_port;</Parameter>
+            <Parameter name="user">&osm_user;</Parameter>
+            <Parameter name="password">&osm_pass;</Parameter>
+            <Parameter name="dbname">&osm_name;</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+            <Parameter name="extent">&epsg900913_extent;</Parameter>
+
+            <Parameter name="table"><![CDATA[
+                (SELECT way,
+                        name,
+                        railway,
+                        highway
+                 FROM planet_osm_point
+                                WHERE "railway" IN ('station') OR
+                                       "highway" IN ('bus_stop')
+                 ORDER BY z_order ASC, way DESC
+                
+                ) AS poi]]></Parameter>
+        </Datasource>
+    </Layer>
+    
+    <Layer class="airports" srs="&epsg900913;">
+        <Datasource>
+            <Parameter name="type">postgis</Parameter>
+            <Parameter name="host">&included_data_host;</Parameter>
+            <Parameter name="port">&included_data_port;</Parameter>
+            <Parameter name="dbname">&included_data_name;</Parameter>
+            <Parameter name="user">&included_data_user;</Parameter>      
+            <Parameter name="password">&included_data_pass;</Parameter>
+            <Parameter name="table">airports_simple_0d29_less_merc</Parameter>
+            <Parameter name="estimate_extent">false</Parameter>
+        </Datasource>
+    </Layer>
+    
+</Map>
\ No newline at end of file
-- 
1.7.9.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]