From 26c596cbf18c34e67380768c0ec59b5a14b202a4 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 23 Feb 2010 02:39:45 +0000
Subject: [PATCH] add tests for optional attr of symbolizers with images from
 0.7.1-dev branch

---
 tests/data/good_maps/point_symbolizer.xml     | 19 ++++++++-
 .../point_symbolizer_on_polygon_map.xml       | 39 +++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 tests/data/good_maps/point_symbolizer_on_polygon_map.xml

diff --git a/tests/data/good_maps/point_symbolizer.xml b/tests/data/good_maps/point_symbolizer.xml
index b6cb927f7..00b4b06c4 100644
--- a/tests/data/good_maps/point_symbolizer.xml
+++ b/tests/data/good_maps/point_symbolizer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map  >
-<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs" paths_from_xml="false">
+<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs" min_version="0.7.1">
     <Style name="test 1">
         <Rule name="rule t1">
             <Filter>[landuse] = 'meadow' or [landuse] = 'wood' or [landuse] = 'forest'</Filter>
@@ -12,7 +12,22 @@
         <Rule title="foo">
             <ElseFilter/>
             <MaxScaleDenominator>1000000</MaxScaleDenominator>
-            <PointSymbolizer file="../data/images/dummy.png" type="png" width="16" height="16"/>
+            <PointSymbolizer file="../images/dummy.png" type="png" width="16" height="16"/>
+        </Rule>
+    </Style>
+    <Style name="test 3">
+        <Rule title="foo">
+            <PointSymbolizer file="../images/dummy.png" type="png"/>
+        </Rule>
+    </Style>
+    <Style name="test 4">
+        <Rule title="foo">
+            <PointSymbolizer file="../images/dummy.png" width="16" height="16"/>
+        </Rule>
+    </Style>
+    <Style name="test 5">
+        <Rule title="foo">
+            <PointSymbolizer file="../images/dummy.png"/>
         </Rule>
     </Style>
 </Map>
diff --git a/tests/data/good_maps/point_symbolizer_on_polygon_map.xml b/tests/data/good_maps/point_symbolizer_on_polygon_map.xml
new file mode 100644
index 000000000..3caff1170
--- /dev/null
+++ b/tests/data/good_maps/point_symbolizer_on_polygon_map.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map  >
+<Map bgcolor="#b5d0d0" min_version="0.7.1">
+    <Style name="test">
+        <Rule title="asia">
+            <Filter>([REGION]=142)</Filter>
+            <PointSymbolizer file="../images/dummy.png" allow_overlap="true"/>
+        </Rule>
+        <Rule title="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">
+            <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">
+            <Filter>([REGION]=2)</Filter>
+            <ShieldSymbolizer name="NAME" placement="vertex" face_name="DejaVu Sans Bold" size="10" fill="#000000" file="../images/dummy.png" />
+        </Rule>
+
+        <Rule title="rest">
+            <ElseFilter />
+            <LineSymbolizer>
+                    <CssParameter name="stroke-width">.1</CssParameter>
+            </LineSymbolizer>
+        </Rule>
+    </Style>
+
+    <Layer name="world_merc">
+        <StyleName>test</StyleName>
+        <Datasource>
+            <Parameter name="file">../../data/shp/world_merc</Parameter>
+            <Parameter name="type">shape</Parameter>
+        </Datasource>
+    </Layer>
+</Map>