diff --git a/demo/data/boundaries.dbf b/demo/data/boundaries.dbf
index be8d57fa3..aeed23561 100644
Binary files a/demo/data/boundaries.dbf and b/demo/data/boundaries.dbf differ
diff --git a/demo/data/boundaries.prj b/demo/data/boundaries.prj
new file mode 100644
index 000000000..21aa9c392
--- /dev/null
+++ b/demo/data/boundaries.prj
@@ -0,0 +1 @@
+PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/demo/data/boundaries.sbn b/demo/data/boundaries.sbn
new file mode 100644
index 000000000..d988d225b
Binary files /dev/null and b/demo/data/boundaries.sbn differ
diff --git a/demo/data/boundaries.sbx b/demo/data/boundaries.sbx
new file mode 100644
index 000000000..c66e6e334
Binary files /dev/null and b/demo/data/boundaries.sbx differ
diff --git a/demo/data/boundaries.shp b/demo/data/boundaries.shp
index 2b61a9214..48fcfdb87 100644
Binary files a/demo/data/boundaries.shp and b/demo/data/boundaries.shp differ
diff --git a/demo/data/boundaries.shp.xml b/demo/data/boundaries.shp.xml
new file mode 100644
index 000000000..0973dedee
--- /dev/null
+++ b/demo/data/boundaries.shp.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
+<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20435800</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_1" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="202939">Project Z:\mapnik-trunk\demo\data\boundaries.shp Z:\mapnik-trunk\demo\data\boundaries_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_3" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203122">Rename Z:\mapnik-trunk\demo\data\boundaries_Project.shp Z:\mapnik-trunk\demo\data\boundaries.shp ShapeFile</Process><Process Name="Rename_27" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204652">Rename Z:\mapnik-trunk\demo\data\boundaries_shp.shp Z:\mapnik-trunk\demo\data\boundaries.shp ShapeFile</Process></lineage></DataProperties><MetaID>{11E7D7C0-9F4D-4BB6-BFF8-F3FE77C30F38}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20435800</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/boundaries.shx b/demo/data/boundaries.shx
index 43c297051..9a6bd46d7 100644
Binary files a/demo/data/boundaries.shx and b/demo/data/boundaries.shx differ
diff --git a/demo/data/boundaries_l.dbf b/demo/data/boundaries_l.dbf
index 91b0675ba..e6bc20c98 100644
Binary files a/demo/data/boundaries_l.dbf and b/demo/data/boundaries_l.dbf differ
diff --git a/demo/data/boundaries_l.prj b/demo/data/boundaries_l.prj
new file mode 100644
index 000000000..21aa9c392
--- /dev/null
+++ b/demo/data/boundaries_l.prj
@@ -0,0 +1 @@
+PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/demo/data/boundaries_l.sbn b/demo/data/boundaries_l.sbn
new file mode 100644
index 000000000..4739b24db
Binary files /dev/null and b/demo/data/boundaries_l.sbn differ
diff --git a/demo/data/boundaries_l.sbx b/demo/data/boundaries_l.sbx
new file mode 100644
index 000000000..e609d80c5
Binary files /dev/null and b/demo/data/boundaries_l.sbx differ
diff --git a/demo/data/boundaries_l.shp b/demo/data/boundaries_l.shp
index c336018ed..9951fe8ff 100644
Binary files a/demo/data/boundaries_l.shp and b/demo/data/boundaries_l.shp differ
diff --git a/demo/data/boundaries_l.shp.xml b/demo/data/boundaries_l.shp.xml
new file mode 100644
index 000000000..26d85186f
--- /dev/null
+++ b/demo/data/boundaries_l.shp.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
+<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20435900</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_4" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203244">Project Z:\mapnik-trunk\demo\data\boundaries_l.shp Z:\mapnik-trunk\demo\data\boundaries_l_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_6" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203309">Rename Z:\mapnik-trunk\demo\data\boundaries_l_Project.shp Z:\mapnik-trunk\demo\data\boundaries_l.shp ShapeFile</Process><Process Name="Rename_26" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204641">Rename Z:\mapnik-trunk\demo\data\boundaries_l_shp.shp Z:\mapnik-trunk\demo\data\boundaries_l.shp ShapeFile</Process></lineage></DataProperties><MetaID>{6498D899-968E-419C-96BC-4A6039E0D319}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20435900</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/boundaries_l.shx b/demo/data/boundaries_l.shx
index bbf800a4b..d0f18f8a9 100644
Binary files a/demo/data/boundaries_l.shx and b/demo/data/boundaries_l.shx differ
diff --git a/demo/data/ontdrainage.dbf b/demo/data/ontdrainage.dbf
index 708742703..33d8004b6 100644
Binary files a/demo/data/ontdrainage.dbf and b/demo/data/ontdrainage.dbf differ
diff --git a/demo/data/ontdrainage.prj b/demo/data/ontdrainage.prj
new file mode 100644
index 000000000..21aa9c392
--- /dev/null
+++ b/demo/data/ontdrainage.prj
@@ -0,0 +1 @@
+PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/demo/data/ontdrainage.sbn b/demo/data/ontdrainage.sbn
new file mode 100644
index 000000000..f89d40e71
Binary files /dev/null and b/demo/data/ontdrainage.sbn differ
diff --git a/demo/data/ontdrainage.sbx b/demo/data/ontdrainage.sbx
new file mode 100644
index 000000000..3739c6198
Binary files /dev/null and b/demo/data/ontdrainage.sbx differ
diff --git a/demo/data/ontdrainage.shp b/demo/data/ontdrainage.shp
index 5da82c9c5..758d37ed0 100644
Binary files a/demo/data/ontdrainage.shp and b/demo/data/ontdrainage.shp differ
diff --git a/demo/data/ontdrainage.shp.xml b/demo/data/ontdrainage.shp.xml
new file mode 100644
index 000000000..f763c88b6
--- /dev/null
+++ b/demo/data/ontdrainage.shp.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
+<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20440100</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_7" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203436">Project Z:\mapnik-trunk\demo\data\ontdrainage.shp Z:\mapnik-trunk\demo\data\ontdrainage_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_9" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203518">Rename Z:\mapnik-trunk\demo\data\ontdrainage_Project.shp Z:\mapnik-trunk\demo\data\ontdrainage.shp ShapeFile</Process><Process Name="Rename_28" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204707">Rename Z:\mapnik-trunk\demo\data\ontdrainage_shp.shp Z:\mapnik-trunk\demo\data\ontdrainage.shp ShapeFile</Process></lineage></DataProperties><MetaID>{FB3824F8-C9DD-41CD-950D-7CDE493F1C80}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20440100</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/ontdrainage.shx b/demo/data/ontdrainage.shx
index 546eb658c..9f11f920e 100644
Binary files a/demo/data/ontdrainage.shx and b/demo/data/ontdrainage.shx differ
diff --git a/demo/data/popplaces.dbf b/demo/data/popplaces.dbf
index a54f071c2..408968e85 100644
Binary files a/demo/data/popplaces.dbf and b/demo/data/popplaces.dbf differ
diff --git a/demo/data/popplaces.prj b/demo/data/popplaces.prj
new file mode 100644
index 000000000..21aa9c392
--- /dev/null
+++ b/demo/data/popplaces.prj
@@ -0,0 +1 @@
+PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/demo/data/popplaces.sbn b/demo/data/popplaces.sbn
new file mode 100644
index 000000000..4298585f7
Binary files /dev/null and b/demo/data/popplaces.sbn differ
diff --git a/demo/data/popplaces.sbx b/demo/data/popplaces.sbx
new file mode 100644
index 000000000..c02888185
Binary files /dev/null and b/demo/data/popplaces.sbx differ
diff --git a/demo/data/popplaces.shp b/demo/data/popplaces.shp
index 85c26bfaf..3c3f7ac44 100644
Binary files a/demo/data/popplaces.shp and b/demo/data/popplaces.shp differ
diff --git a/demo/data/popplaces.shp.xml b/demo/data/popplaces.shp.xml
new file mode 100644
index 000000000..5d2180039
--- /dev/null
+++ b/demo/data/popplaces.shp.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
+<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20440200</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_10" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203711">Project Z:\mapnik-trunk\demo\data\popplaces.shp Z:\mapnik-trunk\demo\data\popplaces_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_12" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203732">Rename Z:\mapnik-trunk\demo\data\popplaces_Project.shp Z:\mapnik-trunk\demo\data\popplaces.shp ShapeFile</Process><Process Name="Rename_29" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204718">Rename Z:\mapnik-trunk\demo\data\popplaces_shp.shp Z:\mapnik-trunk\demo\data\popplaces.shp ShapeFile</Process></lineage></DataProperties><MetaID>{976BB2B2-C17F-4944-BE7B-C454E656918D}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20440200</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/popplaces.shx b/demo/data/popplaces.shx
index 95a01e0bc..f36ff6b4c 100644
Binary files a/demo/data/popplaces.shx and b/demo/data/popplaces.shx differ
diff --git a/demo/data/qcdrainage.dbf b/demo/data/qcdrainage.dbf
index 783b284df..95ce20f20 100644
Binary files a/demo/data/qcdrainage.dbf and b/demo/data/qcdrainage.dbf differ
diff --git a/demo/data/qcdrainage.prj b/demo/data/qcdrainage.prj
new file mode 100644
index 000000000..21aa9c392
--- /dev/null
+++ b/demo/data/qcdrainage.prj
@@ -0,0 +1 @@
+PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/demo/data/qcdrainage.sbn b/demo/data/qcdrainage.sbn
new file mode 100644
index 000000000..9f9af3e11
Binary files /dev/null and b/demo/data/qcdrainage.sbn differ
diff --git a/demo/data/qcdrainage.sbx b/demo/data/qcdrainage.sbx
new file mode 100644
index 000000000..c73534e78
Binary files /dev/null and b/demo/data/qcdrainage.sbx differ
diff --git a/demo/data/qcdrainage.shp b/demo/data/qcdrainage.shp
index 21cbecd95..ce685f8bb 100644
Binary files a/demo/data/qcdrainage.shp and b/demo/data/qcdrainage.shp differ
diff --git a/demo/data/qcdrainage.shp.xml b/demo/data/qcdrainage.shp.xml
new file mode 100644
index 000000000..5f88a561b
--- /dev/null
+++ b/demo/data/qcdrainage.shp.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
+<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20440300</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_13" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203819">Project Z:\mapnik-trunk\demo\data\qcdrainage.shp Z:\mapnik-trunk\demo\data\qcdrainage_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_15" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203837">Rename Z:\mapnik-trunk\demo\data\qcdrainage_Project.shp Z:\mapnik-trunk\demo\data\qcdrainage.shp ShapeFile</Process><Process Name="Rename_30" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204729">Rename Z:\mapnik-trunk\demo\data\qcdrainage_shp.shp Z:\mapnik-trunk\demo\data\qcdrainage.shp ShapeFile</Process></lineage></DataProperties><MetaID>{4C6B0852-DD15-4FB1-828C-E3FE1F5083FB}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20440300</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/qcdrainage.shx b/demo/data/qcdrainage.shx
index 03c285349..295f57005 100644
Binary files a/demo/data/qcdrainage.shx and b/demo/data/qcdrainage.shx differ
diff --git a/demo/data/roads.dbf b/demo/data/roads.dbf
index d95b3bcf4..73c1db9dd 100644
Binary files a/demo/data/roads.dbf and b/demo/data/roads.dbf differ
diff --git a/demo/data/roads.prj b/demo/data/roads.prj
new file mode 100644
index 000000000..21aa9c392
--- /dev/null
+++ b/demo/data/roads.prj
@@ -0,0 +1 @@
+PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/demo/data/roads.sbn b/demo/data/roads.sbn
new file mode 100644
index 000000000..c65a91956
Binary files /dev/null and b/demo/data/roads.sbn differ
diff --git a/demo/data/roads.sbx b/demo/data/roads.sbx
new file mode 100644
index 000000000..b804cb3b2
Binary files /dev/null and b/demo/data/roads.sbx differ
diff --git a/demo/data/roads.shp b/demo/data/roads.shp
index 172188697..6f7e2a2bf 100644
Binary files a/demo/data/roads.shp and b/demo/data/roads.shp differ
diff --git a/demo/data/roads.shp.xml b/demo/data/roads.shp.xml
new file mode 100644
index 000000000..132f21521
--- /dev/null
+++ b/demo/data/roads.shp.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
+<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20440600</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_16" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203859">Project Z:\mapnik-trunk\demo\data\roads.shp Z:\mapnik-trunk\demo\data\roads_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_18" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203920">Rename Z:\mapnik-trunk\demo\data\roads_Project.shp Z:\mapnik-trunk\demo\data\roads.shp ShapeFile</Process><Process Name="Rename_31" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204740">Rename Z:\mapnik-trunk\demo\data\roads_shp.shp Z:\mapnik-trunk\demo\data\roads.shp ShapeFile</Process></lineage></DataProperties><MetaID>{8D5C6277-B191-49E2-BF58-09F1C9803B91}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20440600</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/roads.shx b/demo/data/roads.shx
index 077c86c42..5d4b156fa 100644
Binary files a/demo/data/roads.shx and b/demo/data/roads.shx differ
diff --git a/demo/python/rundemo.py b/demo/python/rundemo.py
index 578d51f64..af17c0967 100644
--- a/demo/python/rundemo.py
+++ b/demo/python/rundemo.py
@@ -288,7 +288,7 @@ m.layers.append(popplaces_lyr)
 
 # Set the initial extent of the map.
 
-m.zoom_to_box(Envelope(7622019.99659767, 2966323.17001496, 7909470.44644348, 2755360.15422466))
+m.zoom_to_box(Envelope(1405120.04127408,-247003.813399447,1706357.31328276,-25098.593149577))
 
 # Render two maps, one PNG, one JPEG.