#! /bin/sh /usr/share/dpatch/dpatch-run
## 97-osmxml.dpatch by Andreas Putzo <andreas@putzo.net>
##
## DP: Fix hexadecimal color.
## DP: Comment world_boundaries by default.

@DPATCH@
diff -urNad gpsdrive-2.10~pre4~/scripts/mapnik/osm-in.xml gpsdrive-2.10~pre4/scripts/mapnik/osm-in.xml
--- gpsdrive-2.10~pre4~/scripts/mapnik/osm-in.xml	2008-02-29 09:01:17.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/mapnik/osm-in.xml	2008-02-29 09:01:58.000000000 +0000
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
+
+<!-- world_boundaries are disabled by default.
+     See commented BLOCK below.
+-->     
+
+
 <Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs">
     <Style name="mapnik:selection">
       <Rule>
@@ -346,7 +352,7 @@
       <Filter>[amenity] = 'parking'</Filter>
       <MaxScaleDenominator>25000</MaxScaleDenominator>
       <LineSymbolizer>
-        <CssParameter name="stroke">eeeed1</CssParameter>
+        <CssParameter name="stroke">#eeeed1</CssParameter>
 	<CssParameter name="stroke-width">0.3</CssParameter>
       </LineSymbolizer>
     </Rule>
@@ -1637,6 +1643,9 @@
     </Rule>
  </Style>
 
+
+<!-- BEGIN WORLD_BOUNDARIES BLOCK  Uncomment this part if you have world_boundaries installed
+
   <Layer name="world-1" status="on" srs="+proj=merc +datum=WGS84 +over">
     <StyleName>world-1</StyleName>
     <Datasource>
@@ -1677,7 +1686,18 @@
       <Parameter name="file">@DATA_DIR@/world_boundaries/builtup_area</Parameter>
     </Datasource>
   </Layer>
-  
+
+  <Layer name="places" status="on">
+    <StyleName>places</StyleName>
+    <Datasource>
+      <Parameter name="type">shape</Parameter>
+      <Parameter name="file">@DATA_DIR@/world_boundaries/places</Parameter>
+    </Datasource>
+  </Layer>
+
+END WORLD BOUNDARIES BLOCK -->
+
+
   <Layer name="leisure" status="on" srs="+proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs">
     <StyleName>leisure</StyleName>
     <Datasource>
@@ -1729,7 +1749,6 @@
   </Layer>
   
   <Layer name="roads" status="on" srs="+proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs">
-    <!--StyleName>roads-casing</StyleName-->
     <StyleName>roads</StyleName>
     <Datasource>
       <Parameter name="type">postgis</Parameter>
@@ -1781,12 +1800,4 @@
       <Parameter name="estimate_extent">true</Parameter>
     </Datasource>
   </Layer>
-  
-  <Layer name="places" status="on">
-    <StyleName>places</StyleName>
-    <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">@DATA_DIR@/world_boundaries/places</Parameter>
-    </Datasource>
-  </Layer>
 </Map>