From 3bd44e909fd62ba0dcd9729b82d1b48c12a90978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <github@kkaefer.com>
Date: Mon, 31 Jan 2011 12:11:17 -0500
Subject: [PATCH] move afghanistan to renderer test, as it is no longer a
 benchmark :)

---
 test/benchmark/afghanistan_votes.result       | 300 ------------------
 .../afghanistan_votes.mml                     |   0
 .../afghanistan_votes.mss                     |   0
 test/rendering/afghanistan_votes.result       | 174 ++++++++++
 4 files changed, 174 insertions(+), 300 deletions(-)
 delete mode 100644 test/benchmark/afghanistan_votes.result
 rename test/{benchmark => rendering}/afghanistan_votes.mml (100%)
 rename test/{benchmark => rendering}/afghanistan_votes.mss (100%)
 create mode 100644 test/rendering/afghanistan_votes.result

diff --git a/test/benchmark/afghanistan_votes.result b/test/benchmark/afghanistan_votes.result
deleted file mode 100644
index 090f0a9..0000000
--- a/test/benchmark/afghanistan_votes.result
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE Map[]>
-<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 +no_defs">
-
-
-<Style name="data-markers">
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 312547.80000000005) and ([votes_total] &lt;= 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="29"
-      width="29"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 277820.60000000003) and ([votes_total] &lt;= 312547.80000000005) and ([votes_total] &lt; 312547.80000000005)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="26"
-      width="26"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 277820.60000000003) and ([votes_total] &lt;= 312547.80000000005) and ([votes_total] &gt; 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="26"
-      width="26"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 243093.40000000002) and ([votes_total] &lt;= 277820.60000000003) and ([votes_total] &lt; 312547.80000000005)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="23"
-      width="23"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 243093.40000000002) and ([votes_total] &lt;= 277820.60000000003) and ([votes_total] &gt; 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="23"
-      width="23"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 208366.2) and ([votes_total] &lt;= 243093.40000000002) and ([votes_total] &lt; 312547.80000000005)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="20"
-      width="20"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 208366.2) and ([votes_total] &lt;= 243093.40000000002) and ([votes_total] &gt; 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="20"
-      width="20"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 173639) and ([votes_total] &lt;= 208366.2) and ([votes_total] &lt; 312547.80000000005)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="17"
-      width="17"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 173639) and ([votes_total] &lt;= 208366.2) and ([votes_total] &gt; 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="17"
-      width="17"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 138911.8) and ([votes_total] &lt;= 173639) and ([votes_total] &lt; 312547.80000000005)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="14"
-      width="14"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 138911.8) and ([votes_total] &lt;= 173639) and ([votes_total] &gt; 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="14"
-      width="14"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 104184.59999999999) and ([votes_total] &lt;= 138911.8) and ([votes_total] &lt; 312547.80000000005)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="11"
-      width="11"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 104184.59999999999) and ([votes_total] &lt;= 138911.8) and ([votes_total] &gt; 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="11"
-      width="11"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 69457.4) and ([votes_total] &lt;= 104184.59999999999) and ([votes_total] &lt; 312547.80000000005)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="8"
-      width="8"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 69457.4) and ([votes_total] &lt;= 104184.59999999999) and ([votes_total] &gt; 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="8"
-      width="8"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 34730.2) and ([votes_total] &lt;= 69457.4) and ([votes_total] &lt; 312547.80000000005)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="5"
-      width="5"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 34730.2) and ([votes_total] &lt;= 69457.4) and ([votes_total] &gt; 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="5"
-      width="5"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 3) and ([votes_total] &lt;= 34730.2) and ([votes_total] &lt; 312547.80000000005)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="2"
-      width="2"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 3) and ([votes_total] &lt;= 34730.2) and ([votes_total] &gt; 347275)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#222222"
-      stroke-width="0"
-      opacity="0.8"
-      fill="#222222"
-      height="2"
-      width="2"
-      allow_overlap="true"/>
-  </Rule>
-  <Rule>
-    <Filter>([_votes_total_null] = 1)</Filter>
-    <MarkersSymbolizer meta-output="votes_name, votes_description"
-      meta-writer="meta1"
-      type="ellipse"
-      stroke-opacity="0.8"
-      stroke="#444444"
-      stroke-width="2"
-      opacity="0.8"
-      fill="#ffffff"
-      height="4"
-      width="4"
-      allow_overlap="true"/>
-  </Rule>
-</Style>
-<Layer
-   id="data"
-   name="data"
-   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 +no_defs">
-    <StyleName>data-markers</StyleName>
-    <Datasource>
-       <Parameter name="file">[absolute path]</Parameter>
-       <Parameter name="type">ogr</Parameter>
-       <Parameter name="layer">OGRGeoJSON</Parameter>
-    </Datasource>
-  </Layer>
-
-</Map>
diff --git a/test/benchmark/afghanistan_votes.mml b/test/rendering/afghanistan_votes.mml
similarity index 100%
rename from test/benchmark/afghanistan_votes.mml
rename to test/rendering/afghanistan_votes.mml
diff --git a/test/benchmark/afghanistan_votes.mss b/test/rendering/afghanistan_votes.mss
similarity index 100%
rename from test/benchmark/afghanistan_votes.mss
rename to test/rendering/afghanistan_votes.mss
diff --git a/test/rendering/afghanistan_votes.result b/test/rendering/afghanistan_votes.result
new file mode 100644
index 0000000..4df2c69
--- /dev/null
+++ b/test/rendering/afghanistan_votes.result
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map[]>
+<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 +no_defs">
+
+
+<Style name="data-markers">
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 312547.80000000005) and ([votes_total] &lt;= 347275)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="29"
+      width="29"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 277820.60000000003) and ([votes_total] &lt; 312547.80000000005)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="26"
+      width="26"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 243093.40000000002) and ([votes_total] &lt; 277820.60000000003)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="23"
+      width="23"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 208366.2) and ([votes_total] &lt; 243093.40000000002)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="20"
+      width="20"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 173639) and ([votes_total] &lt; 208366.2)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="17"
+      width="17"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 138911.8) and ([votes_total] &lt; 173639)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="14"
+      width="14"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 104184.59999999999) and ([votes_total] &lt; 138911.8)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="11"
+      width="11"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 69457.4) and ([votes_total] &lt; 104184.59999999999)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="8"
+      width="8"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 34730.2) and ([votes_total] &lt; 69457.4)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="5"
+      width="5"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 3) and ([votes_total] &lt; 34730.2)</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#222222"
+      stroke-width="0"
+      opacity="0.8"
+      fill="#222222"
+      height="2"
+      width="2"
+      allow_overlap="true"/>
+  </Rule>
+  <Rule>
+    <Filter>([_votes_total_null] = '1')</Filter>
+    <MarkersSymbolizer meta-output="votes_name, votes_description"
+      meta-writer="meta1"
+      type="ellipse"
+      stroke-opacity="0.8"
+      stroke="#444444"
+      stroke-width="2"
+      opacity="0.8"
+      fill="#ffffff"
+      height="4"
+      width="4"
+      allow_overlap="true"/>
+  </Rule>
+</Style>
+<Layer
+   id="data"
+   name="data"
+   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 +no_defs">
+    <StyleName>data-markers</StyleName>
+    <Datasource>
+       <Parameter name="file">[absolute path]</Parameter>
+       <Parameter name="type">ogr</Parameter>
+       <Parameter name="layer">OGRGeoJSON</Parameter>
+    </Datasource>
+  </Layer>
+
+</Map>
\ No newline at end of file