From d03815276e19048238c5dc6ac9e953ab1db9873f Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 14 Dec 2011 15:51:57 -0800
Subject: [PATCH 01/12] move the json config into the main script

---
 utils/mapnik-config/build.py                  | 14 --------------
 utils/mapnik-config/mapnik-config.template.sh | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/utils/mapnik-config/build.py b/utils/mapnik-config/build.py
index c86d3b5e7..8519051e0 100644
--- a/utils/mapnik-config/build.py
+++ b/utils/mapnik-config/build.py
@@ -28,20 +28,6 @@ CONFIG_FONTS='%(fonts)s'
 CONFIG_INPUT_PLUGINS='%(input_plugins)s'
 CONFIG_GIT_REVISION='%(git_revision)s'
 
-CONFIG_JSON="{
-  \\"prefix\\": \\"${CONFIG_PREFIX}\\",
-  \\"mapnik_libname\\": \\"${CONFIG_MAPNIK_LIBNAME}\\",
-  \\"mapnik_include\\": \\"${CONFIG_MAPNIK_INCLUDE}\\",
-  \\"mapnik_lib\\": \\"${CONFIG_MAPNIK_LIB}\\",
-  \\"version\\": \\"${CONFIG_MAPNIK_VERSION}\\",
-  \\"ldflags\\": \\"${CONFIG_MAPNIK_LDFLAGS}\\",
-  \\"dep_libs\\": \\"${CONFIG_DEP_LIBS}\\",
-  \\"other_includes\\": \\"${CONFIG_OTHER_INCLUDES}\\",
-  \\"fonts\\": \\"${CONFIG_FONTS}\\",
-  \\"input_plugins\\": \\"${CONFIG_INPUT_PLUGINS}\\",
-  \\"git_revision\\": \\"${CONFIG_GIT_REVISION}\\",
-}"
-
 '''
 
 def write_config(configuration,template,config_file):
diff --git a/utils/mapnik-config/mapnik-config.template.sh b/utils/mapnik-config/mapnik-config.template.sh
index ef62cdb86..c89bb3ef1 100755
--- a/utils/mapnik-config/mapnik-config.template.sh
+++ b/utils/mapnik-config/mapnik-config.template.sh
@@ -1,6 +1,20 @@
 
 ## program below
 
+CONFIG_JSON="{
+  \"prefix\": \"${CONFIG_PREFIX}\",
+  \"mapnik_libname\": \"${CONFIG_MAPNIK_LIBNAME}\",
+  \"mapnik_include\": \"${CONFIG_MAPNIK_INCLUDE}\",
+  \"mapnik_lib\": \"${CONFIG_MAPNIK_LIB}\",
+  \"version\": \"${CONFIG_MAPNIK_VERSION}\",
+  \"ldflags\": \"${CONFIG_MAPNIK_LDFLAGS}\",
+  \"dep_libs\": \"${CONFIG_DEP_LIBS}\",
+  \"other_includes\": \"${CONFIG_OTHER_INCLUDES}\",
+  \"fonts\": \"${CONFIG_FONTS}\",
+  \"input_plugins\": \"${CONFIG_INPUT_PLUGINS}\",
+  \"git_revision\": \"${CONFIG_GIT_REVISION}\"
+}"
+
 usage()
 {
     cat <<EOF

From d4b85f55f9d0bca5c305def661c53e98473e5386 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 15 Dec 2011 17:18:22 -0800
Subject: [PATCH 02/12] Add missing break

---
 plugins/input/sqlite/sqlite_utils.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/input/sqlite/sqlite_utils.hpp b/plugins/input/sqlite/sqlite_utils.hpp
index 1e3ede064..6fbe32b31 100644
--- a/plugins/input/sqlite/sqlite_utils.hpp
+++ b/plugins/input/sqlite/sqlite_utils.hpp
@@ -568,6 +568,7 @@ public:
                     // PRAGMA table_info is used so here we assume the column is a string
                     // which is a lesser evil than altogether dropping the column
                     desc.add_descriptor(mapnik::attribute_descriptor(fld_name, mapnik::String));
+                    break;
 
                 case SQLITE_BLOB:
                     if (geometry_field.empty()

From 6aefbd0d99369f2739d70e2c271bef6c83e67e49 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 07:22:52 -0800
Subject: [PATCH 03/12] update tests as per #992

---
 bindings/python/mapnik/printing.py                 |  8 ++++----
 tests/data/good_maps/markers_symbolizer_lines.xml  |  2 +-
 tests/data/good_maps/markers_symbolizer_points.xml | 14 +++++++-------
 tests/data/good_maps/point_csv.xml                 |  6 +++---
 tests/data/good_maps/point_json.xml                |  6 +++---
 tests/data/good_maps/point_json_inline.xml         |  6 +++---
 tests/data/good_maps/point_symbolizer.xml          | 14 +++++++-------
 .../point_symbolizer_ignore_placements.xml         |  4 ++--
 .../good_maps/point_symbolizer_on_polygon_map.xml  | 10 +++++-----
 tests/data/good_maps/text_rotation.xml             | 14 +++++++-------
 tests/python_tests/object_test.py                  | 13 +++----------
 11 files changed, 45 insertions(+), 52 deletions(-)

diff --git a/bindings/python/mapnik/printing.py b/bindings/python/mapnik/printing.py
index 58f18b653..5e6456bd9 100644
--- a/bindings/python/mapnik/printing.py
+++ b/bindings/python/mapnik/printing.py
@@ -593,7 +593,7 @@ class PDFPrinter:
         
         for l in m.layers:
             # extract the layer names for naming layers if we use OCG
-            self._layer_names.append(l.title or l.name)
+            self._layer_names.append(l.name)
         
             layer_map = Map(m.width,m.height,m.srs)
             layer_map.layers.append(l)
@@ -884,7 +884,7 @@ class PDFPrinter:
             for l in reversed(m.layers):
                 have_layer_header = False
                 added_styles={}
-                layer_title = l.title or l.name
+                layer_title = l.name
                 if layer_title in processed_layers:
                     continue
                 processed_layers.append(layer_title)
@@ -906,8 +906,8 @@ class PDFPrinter:
                                     if r.filter and str(r.filter) != "true":
                                         if len(rule_text) > 0:
                                             rule_text += " AND "
-                                        if r.title:
-                                            rule_text += r.title
+                                        if r.name:
+                                            rule_text += r.name
                                         else:
                                             rule_text += str(r.filter)
                         active_rules = tuple(active_rules)
diff --git a/tests/data/good_maps/markers_symbolizer_lines.xml b/tests/data/good_maps/markers_symbolizer_lines.xml
index d3adaefb6..1336f56bc 100644
--- a/tests/data/good_maps/markers_symbolizer_lines.xml
+++ b/tests/data/good_maps/markers_symbolizer_lines.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE Map>
 <Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
     <Style name="1">
-        <Rule title="foo">
+        <Rule>
             <MarkersSymbolizer stroke="green" stroke-width="1.3" fill="yellow"/>
             <LineSymbolizer stroke-width=".2" stroke="grey"/>
         </Rule>
diff --git a/tests/data/good_maps/markers_symbolizer_points.xml b/tests/data/good_maps/markers_symbolizer_points.xml
index 14c53a285..9381ec866 100644
--- a/tests/data/good_maps/markers_symbolizer_points.xml
+++ b/tests/data/good_maps/markers_symbolizer_points.xml
@@ -2,31 +2,31 @@
 <Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
 
     <Style name="1">
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='CHILE')</Filter>
              <MarkersSymbolizer fill="darkgreen" opacity=".7" width="15" height="10" stroke="green" stroke-width="7" stroke-opacity=".2" placement="point" marker-type="ellipse"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='Australia')</Filter>
              <MarkersSymbolizer fill="darkblue" opacity=".7" width="10" height="20" stroke="blue" stroke-width="7" stroke-opacity=".2" placement="point" marker-type="ellipse"/>
         </Rule>
-        <Rule title="foo1">
+        <Rule>
             <Filter>([name]='Brazil')</Filter>
              <MarkersSymbolizer fill="darkorange" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="point" marker-type="ellipse"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='Mongolia')</Filter>
              <MarkersSymbolizer fill="darkgoldenrod" opacity=".7" width="25" height="10" stroke="yellow" stroke-width="7" stroke-opacity=".2" placement="point" marker-type="ellipse"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='Sudan')</Filter>
              <MarkersSymbolizer fill="darkcyan" opacity=".7" width="15" height="10" stroke="cadetblue" stroke-width="7" stroke-opacity=".2" placement="point" marker-type="ellipse"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='United States')</Filter>
              <MarkersSymbolizer fill="#cc3344" opacity=".7" width="15" height="10" stroke="#cc3344" stroke-width="7" stroke-opacity=".2" placement="point" marker-type="ellipse"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <ElseFilter/>
             <PointSymbolizer file="../svg/ellipses.svg"/>
         </Rule>
diff --git a/tests/data/good_maps/point_csv.xml b/tests/data/good_maps/point_csv.xml
index fc36de8c7..a174ab551 100644
--- a/tests/data/good_maps/point_csv.xml
+++ b/tests/data/good_maps/point_csv.xml
@@ -1,17 +1,17 @@
 <!DOCTYPE Map>
 <Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
     <Style name="1">
-        <Rule title="foo">
+        <Rule>
             <Filter>([x]=0)</Filter>
             <TextSymbolizer size="10" dy="-10" face-name="DejaVu Sans Book" halo-radius="1" allow-overlap="true">[label]</TextSymbolizer>
             <PointSymbolizer/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([y]=0)</Filter>
             <TextSymbolizer size="10" dy="5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
             <PointSymbolizer/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <ElseFilter/>
             <TextSymbolizer size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
             <PointSymbolizer/>
diff --git a/tests/data/good_maps/point_json.xml b/tests/data/good_maps/point_json.xml
index a7da41c61..09dd44647 100644
--- a/tests/data/good_maps/point_json.xml
+++ b/tests/data/good_maps/point_json.xml
@@ -1,17 +1,17 @@
 <!DOCTYPE Map>
 <Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
     <Style name="1">
-        <Rule title="foo">
+        <Rule>
             <Filter>([x]=0)</Filter>
             <TextSymbolizer size="10" dy="-10" face-name="DejaVu Sans Book" halo-radius="1" allow-overlap="true">[label]</TextSymbolizer>
             <PointSymbolizer/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([y]=0)</Filter>
             <TextSymbolizer size="10" dy="5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
             <PointSymbolizer/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <ElseFilter/>
             <TextSymbolizer size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
             <PointSymbolizer/>
diff --git a/tests/data/good_maps/point_json_inline.xml b/tests/data/good_maps/point_json_inline.xml
index 38bcfb9d8..1f067cdf0 100644
--- a/tests/data/good_maps/point_json_inline.xml
+++ b/tests/data/good_maps/point_json_inline.xml
@@ -1,17 +1,17 @@
 <!DOCTYPE Map>
 <Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
     <Style name="1">
-        <Rule title="foo">
+        <Rule>
             <Filter>([x]=0)</Filter>
             <TextSymbolizer size="10" dy="-10" face-name="DejaVu Sans Book" halo-radius="1" allow-overlap="true">[label]</TextSymbolizer>
             <PointSymbolizer/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([y]=0)</Filter>
             <TextSymbolizer size="10" dy="5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
             <PointSymbolizer/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <ElseFilter/>
             <TextSymbolizer size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
             <PointSymbolizer/>
diff --git a/tests/data/good_maps/point_symbolizer.xml b/tests/data/good_maps/point_symbolizer.xml
index 9251e9776..7119e1093 100644
--- a/tests/data/good_maps/point_symbolizer.xml
+++ b/tests/data/good_maps/point_symbolizer.xml
@@ -1,38 +1,38 @@
 <!DOCTYPE Map>
 <Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
     <Style name="1">
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='CHILE')</Filter>
             <TextSymbolizer size="10" dy="5" face-name="DejaVu Sans Book" text-transform="lowercase" wrap-width="10" wrap-character=" " halo-radius="1">[name] + ' (default OGC pixel)'</TextSymbolizer>
             <PointSymbolizer/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='Australia')</Filter>
             <TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (png)'</TextSymbolizer>
             <PointSymbolizer file="../images/dummy.png" allow-overlap="true"/>
         </Rule>
-        <Rule title="foo1">
+        <Rule>
             <Filter>([name]='Brazil')</Filter>
             <TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (svg &amp; tif)'</TextSymbolizer>
             <PointSymbolizer file="../images/dummy.tif" allow-overlap="true"/>
             <PointSymbolizer file="../svg/ellipses.svg" allow-overlap="true"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='Mongolia')</Filter>
             <TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (tiff)'</TextSymbolizer>
             <PointSymbolizer file="../images/dummy.tiff" allow-overlap="true"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='Sudan')</Filter>
             <TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (jpeg)'</TextSymbolizer>
             <PointSymbolizer file="../images/dummy.jpeg"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='United States')</Filter>
             <TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (jpg)'</TextSymbolizer>
             <PointSymbolizer file="../images/dummy.jpg"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <ElseFilter/>
             <TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
             <PointSymbolizer file="../images/bogus_will_fail.png"/>
diff --git a/tests/data/good_maps/point_symbolizer_ignore_placements.xml b/tests/data/good_maps/point_symbolizer_ignore_placements.xml
index 91cec190c..2f254da84 100644
--- a/tests/data/good_maps/point_symbolizer_ignore_placements.xml
+++ b/tests/data/good_maps/point_symbolizer_ignore_placements.xml
@@ -1,11 +1,11 @@
 <!DOCTYPE Map>
 <Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
     <Style name="1">
-        <Rule title="foo1">
+        <Rule>
             <Filter>([name]='Brazil' or [name]='Mongolia' or [name]='Sudan')</Filter>
             <PointSymbolizer file="../svg/point_sm.svg" allow-overlap="true"/>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <ElseFilter/>
             <PointSymbolizer file="../svg/point_sm.svg" ignore-placement="true"/>
             <PointSymbolizer/>
diff --git a/tests/data/good_maps/point_symbolizer_on_polygon_map.xml b/tests/data/good_maps/point_symbolizer_on_polygon_map.xml
index 00d1130fe..529a884f7 100644
--- a/tests/data/good_maps/point_symbolizer_on_polygon_map.xml
+++ b/tests/data/good_maps/point_symbolizer_on_polygon_map.xml
@@ -1,26 +1,26 @@
 <!DOCTYPE Map>
 <Map background-color="#b5d0d0" minimum-version="0.7.2">
     <Style name="test">
-        <Rule title="asia">
+        <Rule name="asia">
             <Filter>([REGION]=142)</Filter>
             <PointSymbolizer file="../images/dummy.png" allow-overlap="true"/>
         </Rule>
-        <Rule title="europe">
+        <Rule name="europe">
             <Filter>([REGION]=150)</Filter>
             <!-- requires at least Mapnik 0.7.1 to work due to http://trac.mapnik.org/ticket/508 -->
             <PolygonPatternSymbolizer file="../images/dummy.png"/>
         </Rule>
-        <Rule title="americas">
+        <Rule name="americas">
             <Filter>([REGION]=19)</Filter>
             <!-- requires at least Mapnik 0.7.1 to work due to http://trac.mapnik.org/ticket/508 -->
             <LinePatternSymbolizer file="../images/dummy.png"/>
         </Rule>
-        <Rule title="Africa">
+        <Rule name="Africa">
             <Filter>([REGION]=2)</Filter>
             <ShieldSymbolizer placement="vertex" size="10" fill="#000000" file="../images/dummy.png" face-name="DejaVu Sans Bold">[NAME]</ShieldSymbolizer>
         </Rule>
 
-        <Rule title="rest">
+        <Rule name="rest">
             <ElseFilter/>
             <LineSymbolizer stroke-width="1"/>
         </Rule>
diff --git a/tests/data/good_maps/text_rotation.xml b/tests/data/good_maps/text_rotation.xml
index df1d8202f..f37dbf5af 100644
--- a/tests/data/good_maps/text_rotation.xml
+++ b/tests/data/good_maps/text_rotation.xml
@@ -1,31 +1,31 @@
 <Map srs="+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 +nadgrids=@null +wktext +no_defs +over" background-color="steelblue" minimum-version="0.7.2">
 
     <Style name="labels">
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='CHILE')</Filter>
             <TextSymbolizer size="15" orientation="45" face-name="DejaVu Sans Book" halo-radius="1">'45˚ angle'</TextSymbolizer>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='Australia')</Filter>
             <TextSymbolizer size="15" orientation="-45" face-name="DejaVu Sans Book" halo-radius="1">'- 45˚ angle'</TextSymbolizer>
         </Rule>
-        <Rule title="foo1">
+        <Rule>
             <Filter>([name]='Brazil')</Filter>
             <TextSymbolizer size="15" orientation="90" face-name="DejaVu Sans Book" halo-radius="1">'90˚ angle'</TextSymbolizer>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='Mongolia')</Filter>
             <TextSymbolizer size="15" orientation="-90" face-name="DejaVu Sans Book" halo-radius="1">'- 90˚ angle'</TextSymbolizer>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='South Sudan')</Filter>
             <TextSymbolizer size="15" orientation="180" face-name="DejaVu Sans Book" halo-radius="1">'180&#730; angle'</TextSymbolizer>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <Filter>([name]='United States')</Filter>
             <TextSymbolizer size="15" face-name="DejaVu Sans Book" halo-radius="1">'no rotation of text'</TextSymbolizer>
         </Rule>
-        <Rule title="foo">
+        <Rule>
             <ElseFilter/>
             <TextSymbolizer size="15" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
         </Rule>
diff --git a/tests/python_tests/object_test.py b/tests/python_tests/object_test.py
index 1e60bfafd..ef05d8281 100644
--- a/tests/python_tests/object_test.py
+++ b/tests/python_tests/object_test.py
@@ -213,12 +213,10 @@ def test_layer_init():
     eq_(l.clear_label_cache,False)
     eq_(l.cache_features,False)
     eq_(l.visible(1),True)
-    eq_(l.abstract,'')
     eq_(l.active,True)
     eq_(l.datasource,None)
     eq_(l.queryable,False)
     eq_(l.srs,'+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
-    eq_(l.title,'')
 
 # Map initialization
 def test_map_init():
@@ -399,7 +397,6 @@ def test_rule_init():
     r = mapnik.Rule()
    
     eq_(r.name, '')
-    eq_(r.title, '')
     eq_(r.min_scale, 0)
     eq_(r.max_scale, float('inf'))
     eq_(r.has_else(), False)
@@ -420,34 +417,30 @@ def test_rule_init():
     r = mapnik.Rule("Name")
     
     eq_(r.name, 'Name')
-    eq_(r.title, '')
     eq_(r.min_scale, 0)
     eq_(r.max_scale, float('inf'))
     eq_(r.has_else(), False)
     eq_(r.has_also(), False)
     
-    r = mapnik.Rule("Name", "Title")
+    r = mapnik.Rule("Name")
     
     eq_(r.name, 'Name')
-    eq_(r.title, 'Title')
     eq_(r.min_scale, 0)
     eq_(r.max_scale, float('inf'))
     eq_(r.has_else(), False)
     eq_(r.has_also(), False)
     
-    r = mapnik.Rule("Name", "Title", min_scale)
+    r = mapnik.Rule("Name", min_scale)
     
     eq_(r.name, 'Name')
-    eq_(r.title, 'Title')
     eq_(r.min_scale, min_scale)
     eq_(r.max_scale, float('inf'))
     eq_(r.has_else(), False)
     eq_(r.has_also(), False)
     
-    r = mapnik.Rule("Name", "Title", min_scale, max_scale)
+    r = mapnik.Rule("Name", min_scale, max_scale)
     
     eq_(r.name, 'Name')
-    eq_(r.title, 'Title')
     eq_(r.min_scale, min_scale)
     eq_(r.max_scale, max_scale)
     eq_(r.has_else(), False)

From a8aef1f92ccb8f3516c54943fa7d2bfd3ad7b2ac Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 07:41:36 -0800
Subject: [PATCH 04/12] update as per #992

---
 utils/xml/mapnik2.dtd | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/utils/xml/mapnik2.dtd b/utils/xml/mapnik2.dtd
index 8cc7997b7..52b8b5a60 100644
--- a/utils/xml/mapnik2.dtd
+++ b/utils/xml/mapnik2.dtd
@@ -69,7 +69,6 @@
 <!ELEMENT Layer (StyleName|Datasource)*>
 <!-- FIXME: queryable true/false ? -->
 <!ATTLIST Layer
-        abstract            CDATA    #IMPLIED
         clear_label_cache    (yes|1|no|0)    #IMPLIED
         minzoom                CDATA    "0"
         maxzoom                CDATA    #IMPLIED
@@ -77,7 +76,6 @@
         queryable            (true|on|1|false|off|0)    "0"
         srs                    CDATA    #IMPLIED
         status                (on|1|off|0)    "1"
-        title                CDATA    ""
         tolerance            CDATA    #IMPLIED
         toleranceunits        CDATA    #IMPLIED
 >
@@ -90,7 +88,6 @@
 <!-- FIXME: MapnikXMLDescription.pdf specified name is required?  -->
 <!ATTLIST Rule
           name        CDATA    #IMPLIED
-          title        CDATA    #IMPLIED
 >
 
 <!ELEMENT Filter (#PCDATA)>

From 0ebf79e5eae2a72f91a28459dedd7026a9f0e870 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 07:48:02 -0800
Subject: [PATCH 05/12] sqlite: improve the error message when geometry_field
 could not be autodetected

---
 plugins/input/sqlite/sqlite_datasource.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp
index 477208aca..2ae5e3b67 100644
--- a/plugins/input/sqlite/sqlite_datasource.cpp
+++ b/plugins/input/sqlite/sqlite_datasource.cpp
@@ -224,7 +224,12 @@ void sqlite_datasource::bind() const
 
     if (geometry_field_.empty())
     {
-        throw datasource_exception("Sqlite Plugin: cannot detect geometry_field, please supply the name of the geometry_field to use.");
+        std::ostringstream s;
+        s << "Sqlite Plugin: unable to detect the column "
+          << "containing a valid geometry on table '" << geometry_table_ << "'. "
+          << "Please provide a column name by passing the 'geometry_field' option "
+          << "or indicate a different spatial table to use by passing the 'geometry_table' option";
+        throw datasource_exception(s.str());
     }
 
     if (index_table_.empty())

From b51840268648b3a060ed1310f6ef7c01b695811c Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 08:14:08 -0800
Subject: [PATCH 06/12] sqlite: when building rtree sql, only try WHERE
 substitution if not doing join

---
 plugins/input/sqlite/sqlite_datasource.cpp | 30 +++-------------------
 plugins/input/sqlite/sqlite_utils.hpp      | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp
index 2ae5e3b67..256600cc7 100644
--- a/plugins/input/sqlite/sqlite_datasource.cpp
+++ b/plugins/input/sqlite/sqlite_datasource.cpp
@@ -469,19 +469,8 @@ featureset_ptr sqlite_datasource::features(query const& q) const
 
         if (! key_field_.empty() && has_spatial_index_)
         {
-            std::ostringstream spatial_sql;
-            spatial_sql << std::setprecision(16);
-            spatial_sql << " WHERE " << key_field_ << " IN (SELECT pkid FROM " << index_table_;
-            spatial_sql << " WHERE xmax>=" << e.minx() << " AND xmin<=" << e.maxx() ;
-            spatial_sql << " AND ymax>=" << e.miny() << " AND ymin<=" << e.maxy() << ")";
-            if (boost::algorithm::ifind_first(query, "WHERE"))
-            {
-                boost::algorithm::ireplace_first(query, "WHERE", spatial_sql.str() + " AND ");
-            }
-            else if (boost::algorithm::ifind_first(query, geometry_table_))
-            {
-                boost::algorithm::ireplace_first(query, table_, table_ + " " + spatial_sql.str());
-            }
+            // TODO - debug warn if fails
+            sqlite_utils::apply_spatial_filter(query,e,table_,key_field_,index_table_,geometry_table_);
         }
 
         s << query ;
@@ -544,19 +533,8 @@ featureset_ptr sqlite_datasource::features_at_point(coord2d const& pt) const
 
         if (! key_field_.empty() && has_spatial_index_)
         {
-            std::ostringstream spatial_sql;
-            spatial_sql << std::setprecision(16);
-            spatial_sql << " WHERE " << key_field_ << " IN (SELECT pkid FROM " << index_table_;
-            spatial_sql << " WHERE xmax>=" << e.minx() << " AND xmin<=" << e.maxx() ;
-            spatial_sql << " AND ymax>=" << e.miny() << " AND ymin<=" << e.maxy() << ")";
-            if (boost::algorithm::ifind_first(query, "WHERE"))
-            {
-                boost::algorithm::ireplace_first(query, "WHERE", spatial_sql.str() + " AND ");
-            }
-            else if (boost::algorithm::ifind_first(query, geometry_table_))
-            {
-                boost::algorithm::ireplace_first(query, table_, table_ + " " + spatial_sql.str());
-            }
+            // TODO - debug warn if fails
+            sqlite_utils::apply_spatial_filter(query,e,table_,key_field_,index_table_,geometry_table_);
         }
 
         s << query ;
diff --git a/plugins/input/sqlite/sqlite_utils.hpp b/plugins/input/sqlite/sqlite_utils.hpp
index 8e17db80b..2558c0d27 100644
--- a/plugins/input/sqlite/sqlite_utils.hpp
+++ b/plugins/input/sqlite/sqlite_utils.hpp
@@ -108,6 +108,33 @@ public:
         //}
     }
 
+    static bool apply_spatial_filter(std::string & query,
+                                     mapnik::box2d<double> const& e,
+                                     std::string const& table,
+                                     std::string const& key_field,
+                                     std::string const& index_table,
+                                     std::string const& geometry_table)
+    {
+        std::ostringstream spatial_sql;
+        spatial_sql << std::setprecision(16);
+        spatial_sql << " WHERE " << key_field << " IN (SELECT pkid FROM " << index_table;
+        spatial_sql << " WHERE xmax>=" << e.minx() << " AND xmin<=" << e.maxx() ;
+        spatial_sql << " AND ymax>=" << e.miny() << " AND ymin<=" << e.maxy() << ")";
+        // substitute first WHERE found if not using JOIN (because we can't know the WHERE is on the right table)
+        if (boost::algorithm::ifind_first(query, "WHERE") && !boost::algorithm::ifind_first(query, "JOIN"))
+        {
+            boost::algorithm::ireplace_first(query, "WHERE", spatial_sql.str() + " AND ");
+            return true;
+        }
+        // fallback to appending spatial filter at end of query
+        else if (boost::algorithm::ifind_first(query, geometry_table))
+        {
+            boost::algorithm::ireplace_first(query, table, table + " " + spatial_sql.str());
+            return true;
+        }
+        return false;
+    }
+
     static void get_tables(boost::shared_ptr<sqlite_connection> ds,
                            std::vector<std::string> & tables)
     {

From ea1e5cabb7e5d11b5f7e09c7baf5aaf217feeb3e Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 09:58:09 -0800
Subject: [PATCH 07/12] more robust sqlite subquery tests and first tests of
 \!intersects\! token - refs #809

---
 tests/python_tests/sqlite_test.py | 133 +++++++++++++++++++++++++-----
 1 file changed, 114 insertions(+), 19 deletions(-)

diff --git a/tests/python_tests/sqlite_test.py b/tests/python_tests/sqlite_test.py
index 8a2b84dc8..d1f50983d 100644
--- a/tests/python_tests/sqlite_test.py
+++ b/tests/python_tests/sqlite_test.py
@@ -15,7 +15,7 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
     def test_attachdb_with_relative_file():
         # The point table and index is in the qgis_spatiallite.sqlite
         # database.  If either is not found, then this fails
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='point',
             attachdb='scratch@qgis_spatiallite.sqlite'
             )
@@ -24,7 +24,7 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
         eq_(feature['pkuid'],1)
     
     def test_attachdb_with_multiple_files():
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='attachedtest',
             attachdb='scratch1@:memory:,scratch2@:memory:',
             initdb='''
@@ -50,7 +50,7 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
         eq_(feature['pkuid'],1)
     
     def test_attachdb_with_index():
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='attachedtest',
             attachdb='scratch@:memory:',
             initdb='''
@@ -64,7 +64,7 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
         eq_(feature,None)
         
     def test_attachdb_with_explicit_index():
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='attachedtest',
             index_table='myindex',
             attachdb='scratch@:memory:',
@@ -79,10 +79,13 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
         eq_(feature,None)
     
     def test_attachdb_with_sql_join():
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='(select * from world_merc INNER JOIN business on world_merc.iso3 = business.ISO3 limit 100)',
             attachdb='busines@business.sqlite'
             )
+        eq_(len(ds.fields()),29)
+        eq_(ds.fields(),['OGC_FID', 'fips', 'iso2', 'iso3', 'un', 'name', 'area', 'pop2005', 'region', 'subregion', 'lon', 'lat', 'ISO3:1', '1995', '1996', '1997', '1998', '1999', '2000', '2001', '2002', '2003', '2004', '2005', '2006', '2007', '2008', '2009', '2010'])
+        eq_(ds.field_types(),['int', 'str', 'str', 'str', 'int', 'str', 'int', 'int', 'int', 'int', 'float', 'float', 'str', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'])
         fs = ds.featureset()
         feature = fs.next()
         eq_(feature.id(),1)
@@ -125,9 +128,74 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
             except:
                 #import pdb;pdb.set_trace()
                 print 'invalid key/v %s/%s for: %s' % (k,v,feature) 
+
+    def test_attachdb_with_sql_join_count():
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
+            table='(select * from world_merc INNER JOIN business on world_merc.iso3 = business.ISO3 limit 100)',
+            attachdb='busines@business.sqlite'
+            )
+        eq_(len(ds.fields()),29)
+        eq_(ds.fields(),['OGC_FID', 'fips', 'iso2', 'iso3', 'un', 'name', 'area', 'pop2005', 'region', 'subregion', 'lon', 'lat', 'ISO3:1', '1995', '1996', '1997', '1998', '1999', '2000', '2001', '2002', '2003', '2004', '2005', '2006', '2007', '2008', '2009', '2010'])
+        eq_(ds.field_types(),['int', 'str', 'str', 'str', 'int', 'str', 'int', 'int', 'int', 'int', 'float', 'float', 'str', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'])
+        eq_(len(ds.all_features()),100)
+
+    def test_attachdb_with_sql_join_count2():
+        '''
+        sqlite3 world.sqlite
+        attach database 'business.sqlite' as business;
+        select count(*) from world_merc INNER JOIN business on world_merc.iso3 = business.ISO3;
+        '''
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
+            table='(select * from world_merc INNER JOIN business on world_merc.iso3 = business.ISO3)',
+            attachdb='busines@business.sqlite'
+            )
+        eq_(len(ds.fields()),29)
+        eq_(ds.fields(),['OGC_FID', 'fips', 'iso2', 'iso3', 'un', 'name', 'area', 'pop2005', 'region', 'subregion', 'lon', 'lat', 'ISO3:1', '1995', '1996', '1997', '1998', '1999', '2000', '2001', '2002', '2003', '2004', '2005', '2006', '2007', '2008', '2009', '2010'])
+        eq_(ds.field_types(),['int', 'str', 'str', 'str', 'int', 'str', 'int', 'int', 'int', 'int', 'float', 'float', 'str', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'])
+        eq_(len(ds.all_features()),192)
+
+    def test_attachdb_with_sql_join_count3():
+        '''
+        select count(*) from (select * from world_merc where 1=1) as world_merc INNER JOIN business on world_merc.iso3 = business.ISO3;
+        '''
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
+            table='(select * from (select * from world_merc where !intersects!) as world_merc INNER JOIN business on world_merc.iso3 = business.ISO3)',
+            attachdb='busines@business.sqlite'
+            )
+        eq_(len(ds.fields()),29)
+        eq_(ds.fields(),['OGC_FID', 'fips', 'iso2', 'iso3', 'un', 'name', 'area', 'pop2005', 'region', 'subregion', 'lon', 'lat', 'ISO3:1', '1995', '1996', '1997', '1998', '1999', '2000', '2001', '2002', '2003', '2004', '2005', '2006', '2007', '2008', '2009', '2010'])
+        eq_(ds.field_types(),['int', 'str', 'str', 'str', 'int', 'str', 'int', 'int', 'int', 'int', 'float', 'float', 'str', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'])
+        eq_(len(ds.all_features()),192)
+
+    def test_attachdb_with_sql_join_count4():
+        '''
+        select count(*) from (select * from world_merc where 1=1) as world_merc INNER JOIN business on world_merc.iso3 = business.ISO3;
+        '''
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
+            table='(select * from (select * from world_merc where !intersects! limit 1) as world_merc INNER JOIN business on world_merc.iso3 = business.ISO3)',
+            attachdb='busines@business.sqlite'
+            )
+        eq_(len(ds.fields()),29)
+        eq_(ds.fields(),['OGC_FID', 'fips', 'iso2', 'iso3', 'un', 'name', 'area', 'pop2005', 'region', 'subregion', 'lon', 'lat', 'ISO3:1', '1995', '1996', '1997', '1998', '1999', '2000', '2001', '2002', '2003', '2004', '2005', '2006', '2007', '2008', '2009', '2010'])
+        eq_(ds.field_types(),['int', 'str', 'str', 'str', 'int', 'str', 'int', 'int', 'int', 'int', 'float', 'float', 'str', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'])
+        eq_(len(ds.all_features()),1)
+
+    def test_attachdb_with_sql_join_count5():
+        '''
+        select count(*) from (select * from world_merc where 1=1) as world_merc INNER JOIN business on world_merc.iso3 = business.ISO3;
+        '''
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
+            table='(select * from (select * from world_merc where !intersects! and 1=2) as world_merc INNER JOIN business on world_merc.iso3 = business.ISO3)',
+            attachdb='busines@business.sqlite'
+            )
+        # nothing is able to join to business so we don't pick up business schema
+        eq_(len(ds.fields()),12)
+        eq_(ds.fields(),['OGC_FID', 'fips', 'iso2', 'iso3', 'un', 'name', 'area', 'pop2005', 'region', 'subregion', 'lon', 'lat'])
+        eq_(ds.field_types(),['int', 'str', 'str', 'str', 'int', 'str', 'int', 'int', 'int', 'int', 'float', 'float'])
+        eq_(len(ds.all_features()),0)
     
     def test_subqueries():
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='world_merc',
             )
         fs = ds.featureset()
@@ -145,7 +213,7 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
         eq_(feature['lon'],-61.783)
         eq_(feature['lat'],17.078)
     
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='(select * from world_merc)',
             )
         fs = ds.featureset()
@@ -163,7 +231,7 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
         eq_(feature['lon'],-61.783)
         eq_(feature['lat'],17.078)
         
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='(select OGC_FID,GEOMETRY from world_merc)',
             )
         fs = ds.featureset()
@@ -171,24 +239,26 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
         eq_(feature['OGC_FID'],1)
         eq_(len(feature),1)
     
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='(select GEOMETRY,OGC_FID,fips from world_merc)',
             )
         fs = ds.featureset()
         feature = fs.next()
         eq_(feature['OGC_FID'],1)
         eq_(feature['fips'],u'AC')
+
+        # same as above, except with alias like postgres requires
+        # TODO - should we try to make this work?
+        #ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
+        #    table='(select GEOMETRY,rowid as aliased_id,fips from world_merc) as table',
+        #    key_field='aliased_id'
+        #    )
+        #fs = ds.featureset()
+        #feature = fs.next()
+        #eq_(feature['aliased_id'],1)
+        #eq_(feature['fips'],u'AC')
     
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
-            table='(select GEOMETRY,rowid as aliased_id,fips from world_merc)',
-            key_field='aliased_id'
-            )
-        fs = ds.featureset()
-        feature = fs.next()
-        eq_(feature['aliased_id'],1)
-        eq_(feature['fips'],u'AC')
-    
-        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', 
+        ds = mapnik.SQLite(file='../data/sqlite/world.sqlite',
             table='(select GEOMETRY,OGC_FID,OGC_FID as rowid,fips from world_merc)',
             )
         fs = ds.featureset()
@@ -220,6 +290,31 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
         query.add_property_name('bogus')
         fs = ds.features(query)
 
+    def test_intersects_token1():
+        ds = mapnik.SQLite(file='../data/sqlite/empty.db',
+            table='(select * from empty where !intersects!)',
+            )
+        fs = ds.featureset()
+        feature = fs.next()
+        eq_(feature,None)
+
+    def test_intersects_token1():
+        ds = mapnik.SQLite(file='../data/sqlite/empty.db',
+            table='(select * from empty where "a"!="b" and !intersects!)',
+            )
+        fs = ds.featureset()
+        feature = fs.next()
+        eq_(feature,None)
+
+    def test_intersects_token1():
+        ds = mapnik.SQLite(file='../data/sqlite/empty.db',
+            table='(select * from empty where "a"!="b" and !intersects!)',
+            )
+        fs = ds.featureset()
+        feature = fs.next()
+        eq_(feature,None)
+
+
 if __name__ == "__main__":
     setup()
     [eval(run)() for run in dir() if 'test_' in run]

From 04dd46315e16b466870d1772ff75984d51626e12 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 10:05:54 -0800
Subject: [PATCH 08/12] add support for 'intersects' token in sqlite plugin -
 closes #809

---
 CHANGELOG                                  |  2 +
 plugins/input/sqlite/sqlite_datasource.cpp | 43 +++++++++++++++++++---
 plugins/input/sqlite/sqlite_datasource.hpp |  3 ++
 plugins/input/sqlite/sqlite_utils.hpp      | 21 ++++++++---
 4 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ba2380754..49aa4e399 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,8 @@ For a complete change history, see the SVN log.
 Mapnik 2.1.0
 ------------
 
+- SQLite - Added support for !intersects! token in sql subselects (#809) allow custom positioning of rtree spatial filter.
+
 - New CSV plugin - reads tabular files - autodetecting geo columns, newlines, and delimiters. Uses in-memory featureset for fast rendering and is not designed for large files (#902)
 
 - Fixed bug in shield line placement when dx/dy are used to shift the label relative to the placement point (Matt Amos) (#908)
diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp
index 256600cc7..14b6a068c 100644
--- a/plugins/input/sqlite/sqlite_datasource.cpp
+++ b/plugins/input/sqlite/sqlite_datasource.cpp
@@ -62,6 +62,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params, bool bind)
     key_field_(*params_.get<std::string>("key_field", "")),
     row_offset_(*params_.get<int>("row_offset", 0)),
     row_limit_(*params_.get<int>("row_limit", 0)),
+    intersects_token_("!intersects!"),
     desc_(*params_.get<std::string>("type"), *params_.get<std::string>("encoding", "utf-8")),
     format_(mapnik::wkbAuto)
 {
@@ -185,7 +186,8 @@ void sqlite_datasource::bind() const
     if (using_subquery_)
     {
         std::ostringstream s;
-        s << "SELECT " << fields_ << " FROM (" << table_ << ") LIMIT 1";
+        std::string query = populate_tokens(table_);
+        s << "SELECT " << fields_ << " FROM (" << query << ") LIMIT 1";
         found_types_via_subquery = sqlite_utils::detect_types_from_subquery(s.str(),geometry_field_,desc_,dataset_);
     }
 
@@ -306,6 +308,7 @@ void sqlite_datasource::bind() const
     {
 
         // TODO - clean this up - reducing arguments
+        std::string query = populate_tokens(table_);
         if (!sqlite_utils::detect_extent(dataset_,
                                          has_spatial_index_,
                                          extent_,
@@ -314,7 +317,7 @@ void sqlite_datasource::bind() const
                                          geometry_field_,
                                          geometry_table_,
                                          key_field_,
-                                         table_))
+                                         query))
         {
             std::ostringstream s;
             s << "Sqlite Plugin: extent could not be determined for table '"
@@ -328,6 +331,17 @@ void sqlite_datasource::bind() const
     is_bound_ = true;
 }
 
+std::string sqlite_datasource::populate_tokens(const std::string& sql) const
+{
+    std::string populated_sql = sql;
+    if (boost::algorithm::ifind_first(populated_sql, intersects_token_))
+    {
+        // replace with dummy comparison that is true
+        boost::algorithm::ireplace_first(populated_sql, intersects_token_, "1=1");
+    }
+    return populated_sql;
+}
+
 sqlite_datasource::~sqlite_datasource()
 {
 }
@@ -465,12 +479,21 @@ featureset_ptr sqlite_datasource::features(query const& q) const
 
         s << " FROM ";
 
-        std::string query (table_);
+        std::string query(table_);
 
         if (! key_field_.empty() && has_spatial_index_)
         {
             // TODO - debug warn if fails
-            sqlite_utils::apply_spatial_filter(query,e,table_,key_field_,index_table_,geometry_table_);
+            sqlite_utils::apply_spatial_filter(query,
+                                               e,
+                                               table_,
+                                               key_field_,
+                                               index_table_,
+                                               geometry_table_,
+                                               intersects_token_);        }
+        else
+        {
+            query = populate_tokens(table_);
         }
 
         s << query ;
@@ -534,7 +557,17 @@ featureset_ptr sqlite_datasource::features_at_point(coord2d const& pt) const
         if (! key_field_.empty() && has_spatial_index_)
         {
             // TODO - debug warn if fails
-            sqlite_utils::apply_spatial_filter(query,e,table_,key_field_,index_table_,geometry_table_);
+            sqlite_utils::apply_spatial_filter(query,
+                                               e,
+                                               table_,
+                                               key_field_,
+                                               index_table_,
+                                               geometry_table_,
+                                               intersects_token_);
+        }
+        else
+        {
+            query = populate_tokens(table_);
         }
 
         s << query ;
diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp
index 85c67fdba..f705f762d 100644
--- a/plugins/input/sqlite/sqlite_datasource.hpp
+++ b/plugins/input/sqlite/sqlite_datasource.hpp
@@ -70,6 +70,8 @@ private:
     mutable std::string key_field_;
     mutable int row_offset_;
     mutable int row_limit_;
+    // TODO - also add to postgis.input
+    const std::string intersects_token_;
     mutable mapnik::layer_descriptor desc_;
     mutable mapnik::wkbFormat format_;
     mutable bool use_spatial_index_;
@@ -80,6 +82,7 @@ private:
     // Fill init_statements with any statements
     // needed to attach auxillary databases
     void parse_attachdb(std::string const& attachdb) const;
+    std::string populate_tokens(const std::string& sql) const;
 };
 
 #endif // MAPNIK_SQLITE_DATASOURCE_HPP
diff --git a/plugins/input/sqlite/sqlite_utils.hpp b/plugins/input/sqlite/sqlite_utils.hpp
index 2558c0d27..6021d26ca 100644
--- a/plugins/input/sqlite/sqlite_utils.hpp
+++ b/plugins/input/sqlite/sqlite_utils.hpp
@@ -113,23 +113,32 @@ public:
                                      std::string const& table,
                                      std::string const& key_field,
                                      std::string const& index_table,
-                                     std::string const& geometry_table)
+                                     std::string const& geometry_table,
+                                     std::string const& intersects_token)
     {
         std::ostringstream spatial_sql;
         spatial_sql << std::setprecision(16);
-        spatial_sql << " WHERE " << key_field << " IN (SELECT pkid FROM " << index_table;
+        spatial_sql << key_field << " IN (SELECT pkid FROM " << index_table;
         spatial_sql << " WHERE xmax>=" << e.minx() << " AND xmin<=" << e.maxx() ;
         spatial_sql << " AND ymax>=" << e.miny() << " AND ymin<=" << e.maxy() << ")";
-        // substitute first WHERE found if not using JOIN (because we can't know the WHERE is on the right table)
-        if (boost::algorithm::ifind_first(query, "WHERE") && !boost::algorithm::ifind_first(query, "JOIN"))
+        if (boost::algorithm::ifind_first(query,  intersects_token))
         {
-            boost::algorithm::ireplace_first(query, "WHERE", spatial_sql.str() + " AND ");
+            boost::algorithm::ireplace_all(query, intersects_token, spatial_sql.str());
+            return true;
+        }
+        // substitute first WHERE found if not using JOIN
+        // (because we can't know the WHERE is on the right table)
+        else if (boost::algorithm::ifind_first(query, "WHERE")
+                 && !boost::algorithm::ifind_first(query, "JOIN"))
+        {
+            std::string replace(" WHERE " + spatial_sql.str() + " AND ");
+            boost::algorithm::ireplace_first(query, "WHERE", replace);
             return true;
         }
         // fallback to appending spatial filter at end of query
         else if (boost::algorithm::ifind_first(query, geometry_table))
         {
-            boost::algorithm::ireplace_first(query, table, table + " " + spatial_sql.str());
+            query = table + " WHERE " + spatial_sql.str();
             return true;
         }
         return false;

From 4b2873927462705d4952a16ed6c36c6486a112ea Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 10:06:18 -0800
Subject: [PATCH 09/12] c++ style cast

---
 include/mapnik/util/geometry_wkt_generator.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/util/geometry_wkt_generator.hpp b/include/mapnik/util/geometry_wkt_generator.hpp
index 6c2df624b..dfb191e72 100644
--- a/include/mapnik/util/geometry_wkt_generator.hpp
+++ b/include/mapnik/util/geometry_wkt_generator.hpp
@@ -57,7 +57,7 @@ struct get_type
 
     int operator() (geometry_type const& geom) const
     {
-        return (int)geom.type();
+        return static_cast<int>(geom.type());
     }
 };
 

From 05a09de211e526e0e103e4d7bbd5b3d1cccc3ca0 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 10:07:30 -0800
Subject: [PATCH 10/12] temporarily comment to_wkt until we can fix compile
 with g++ (only works currently with clang++)

---
 include/mapnik/util/geometry_to_wkt.hpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/util/geometry_to_wkt.hpp b/include/mapnik/util/geometry_to_wkt.hpp
index 42735c3a2..80c77fec1 100644
--- a/include/mapnik/util/geometry_to_wkt.hpp
+++ b/include/mapnik/util/geometry_to_wkt.hpp
@@ -42,8 +42,9 @@ bool to_wkt(std::string & wkt, mapnik::geometry_type const& geom)
 {
     typedef std::back_insert_iterator<std::string> sink_type;
     sink_type sink(wkt);
-    wkt_generator<sink_type> generator(true);
-    bool result = karma::generate(sink, generator, geom);
+    // disable temporarily until compile works with g++
+    //wkt_generator<sink_type> generator(true);
+    bool result = false;//karma::generate(sink, generator, geom);
     return result;
 }
 
@@ -51,8 +52,9 @@ bool to_wkt(std::string & wkt, mapnik::geometry_container const& geom)
 {
     typedef std::back_insert_iterator<std::string> sink_type;
     sink_type sink(wkt);
-    wkt_multi_generator<sink_type> generator;
-    bool result = karma::generate(sink, generator, geom);
+    // disable temporarily until compile works with g++
+    //wkt_multi_generator<sink_type> generator;
+    bool result = false;//karma::generate(sink, generator, geom);
     return result;
 }
 

From 224f75ff565d58fe84fd3b1c0ae5b2b65c12f5cf Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 10:57:05 -0800
Subject: [PATCH 11/12] scons: python 2.5 compatibility

---
 bindings/python/build.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bindings/python/build.py b/bindings/python/build.py
index caea79ce0..7ad2385a1 100644
--- a/bindings/python/build.py
+++ b/bindings/python/build.py
@@ -142,7 +142,11 @@ paths += "__all__ = [mapniklibpath,inputpluginspath,fontscollectionpath]\n"
 
 if not os.path.exists('mapnik'):
     os.mkdir('mapnik')
-file('mapnik/paths.py','w').write(paths % (os.path.relpath(env['MAPNIK_LIB_DIR'],target_path)))
+
+if hasattr(os.path,'relpath'): # python 2.6 and above
+    file('mapnik/paths.py','w').write(paths % (os.path.relpath(env['MAPNIK_LIB_DIR'],target_path)))
+else:
+    file('mapnik/paths.py','w').write(paths % (env['MAPNIK_LIB_DIR']))
 
 # force open perms temporarily so that `sudo scons install`
 # does not later break simple non-install non-sudo rebuild

From 8ae1518351e9d4784ffe865353e4be9811fc9113 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 16 Dec 2011 18:24:38 -0800
Subject: [PATCH 12/12] clear out the config.cache on reset

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 73e45ffd8..a9bd8775b 100755
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ clean:
 reset:
 	if test -e ".sconf_temp/"; then rm -r ".sconf_temp/"; fi
 	if test -e ".sconsign.dblite"; then rm ".sconsign.dblite"; fi
+	if test -e "config.cache"; then rm "config.cache"; fi
 
 uninstall:
 	python scons/scons.py uninstall