From c8eb8e5775ef9b8d5a018ec88325259f87e463f3 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Wed, 22 Aug 2012 00:05:48 +0200
Subject: [PATCH] Switch tests from shapefile to osm. Closes #1121.

---
 tests/visual_tests/data/points.dbf               | Bin 889 -> 0 bytes
 tests/visual_tests/data/points.shp               | Bin 380 -> 0 bytes
 tests/visual_tests/styles/expressionformat.xml   |   4 ++--
 tests/visual_tests/styles/formating.xml          |   4 ++--
 tests/visual_tests/styles/formatting-1.xml       |   4 ++--
 tests/visual_tests/styles/formatting-2.xml       |   4 ++--
 tests/visual_tests/styles/formatting-3.xml       |   4 ++--
 tests/visual_tests/styles/formatting-4.xml       |   4 ++--
 tests/visual_tests/styles/jalign-auto.xml        |   4 ++--
 tests/visual_tests/styles/list.xml               |   5 +----
 tests/visual_tests/styles/rtl-point.xml          |   8 ++------
 tests/visual_tests/styles/shieldsymbolizer-1.xml |   4 ++--
 tests/visual_tests/styles/simple-E.xml           |   4 ++--
 tests/visual_tests/styles/simple-N.xml           |   4 ++--
 tests/visual_tests/styles/simple-NE.xml          |   4 ++--
 tests/visual_tests/styles/simple-NW.xml          |   4 ++--
 tests/visual_tests/styles/simple-S.xml           |   4 ++--
 tests/visual_tests/styles/simple-SE.xml          |   4 ++--
 tests/visual_tests/styles/simple-SW.xml          |   4 ++--
 tests/visual_tests/styles/simple-W.xml           |   4 ++--
 tests/visual_tests/styles/simple-shield.xml      |   4 ++--
 tests/visual_tests/styles/simple.xml             |   4 ++--
 22 files changed, 39 insertions(+), 46 deletions(-)
 delete mode 100644 tests/visual_tests/data/points.dbf
 delete mode 100644 tests/visual_tests/data/points.shp

diff --git a/tests/visual_tests/data/points.dbf b/tests/visual_tests/data/points.dbf
deleted file mode 100644
index ca544e92a08c9bbb634df1471ce88de35dc1280f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 889
zcma))O$)*x7{`SUK@oKB<QI5g?tSO3(W(0gvhpy6ZLO|-^O}Y_!_tHMzdZg>*sPv!
z76_py+P(MhCAy|&Cz<cZed&zwV?#gDcKk+e-|9g2Yi*TSVZDGHXxC%GsgC{#;_V@p
zto|;%BTf-J-dIQ!>)O)5n<eJ3qac;6v$(ZR<Fl!+z>p~x8v?I|Ge0Yrtd2drBTkV!
z-dHFUiw=~V^p`5UC6tmy+2z`MhbBciakha<vN#L=!7BT>t${?6)rY<iV-nc_j9<BX
Bf3g4o

diff --git a/tests/visual_tests/data/points.shp b/tests/visual_tests/data/points.shp
deleted file mode 100644
index e2fb4a604d7ac56c58e6b4c968a7b504c686e425..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmZQzQ0HR64)(oZW?*0h%FUVy0z2(t%Fdnvfj4kIOdJmlGKLF8U;#`(F|ZuEJwS1w
z3y|ebBHPIVlQRZ`%gA!9Fgb{sH<9JoU~)hj2p%BIu>%FbZh@Hj7+H=3CYJ^V&yeLf
TVR8`rULwnZ!WV2Ndbj}qP8u%M

diff --git a/tests/visual_tests/styles/expressionformat.xml b/tests/visual_tests/styles/expressionformat.xml
index 5c66ab54c..a140d35be 100644
--- a/tests/visual_tests/styles/expressionformat.xml
+++ b/tests/visual_tests/styles/expressionformat.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/formating.xml b/tests/visual_tests/styles/formating.xml
index acef45dd7..ec6e059ec 100644
--- a/tests/visual_tests/styles/formating.xml
+++ b/tests/visual_tests/styles/formating.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osms</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/formatting-1.xml b/tests/visual_tests/styles/formatting-1.xml
index a044f662c..318380b18 100644
--- a/tests/visual_tests/styles/formatting-1.xml
+++ b/tests/visual_tests/styles/formatting-1.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/formatting-2.xml b/tests/visual_tests/styles/formatting-2.xml
index 285646515..b1acbcc4e 100644
--- a/tests/visual_tests/styles/formatting-2.xml
+++ b/tests/visual_tests/styles/formatting-2.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/formatting-3.xml b/tests/visual_tests/styles/formatting-3.xml
index 159ef880c..9be283038 100644
--- a/tests/visual_tests/styles/formatting-3.xml
+++ b/tests/visual_tests/styles/formatting-3.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/formatting-4.xml b/tests/visual_tests/styles/formatting-4.xml
index 551cd09d5..ace1ebc26 100644
--- a/tests/visual_tests/styles/formatting-4.xml
+++ b/tests/visual_tests/styles/formatting-4.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/jalign-auto.xml b/tests/visual_tests/styles/jalign-auto.xml
index 8956751e5..09fdabe71 100644
--- a/tests/visual_tests/styles/jalign-auto.xml
+++ b/tests/visual_tests/styles/jalign-auto.xml
@@ -5,8 +5,8 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">shape</Parameter>
-            <Parameter name="file">../data/points.shp</Parameter>
+            <Parameter name="type">osm</Parameter>
+            <Parameter name="file">../data/points.osm</Parameter>
         </Datasource>
     </Layer>
 
diff --git a/tests/visual_tests/styles/list.xml b/tests/visual_tests/styles/list.xml
index e146ded22..ce4cf0a1f 100644
--- a/tests/visual_tests/styles/list.xml
+++ b/tests/visual_tests/styles/list.xml
@@ -5,11 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-	<!--
       <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>-->
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/rtl-point.xml b/tests/visual_tests/styles/rtl-point.xml
index 54edac854..f0e0539db 100644
--- a/tests/visual_tests/styles/rtl-point.xml
+++ b/tests/visual_tests/styles/rtl-point.xml
@@ -5,12 +5,8 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <!--
-                <Parameter name="type">osm</Parameter>
-                <Parameter name="file">points.osm</Parameter>
-            -->
-            <Parameter name="type">shape</Parameter>
-            <Parameter name="file">../data/points.shp</Parameter>
+            <Parameter name="type">osm</Parameter>
+            <Parameter name="file">../data/points.osm</Parameter>
         </Datasource>
     </Layer>
 
diff --git a/tests/visual_tests/styles/shieldsymbolizer-1.xml b/tests/visual_tests/styles/shieldsymbolizer-1.xml
index 329343461..4aa4b164b 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-1.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-1.xml
@@ -5,8 +5,8 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">shape</Parameter>
-            <Parameter name="file">../data/points.shp</Parameter>
+            <Parameter name="type">osm</Parameter>
+            <Parameter name="file">../data/points.osm</Parameter>
         </Datasource>
     </Layer>
 
diff --git a/tests/visual_tests/styles/simple-E.xml b/tests/visual_tests/styles/simple-E.xml
index 9a0668bd0..750322cd6 100644
--- a/tests/visual_tests/styles/simple-E.xml
+++ b/tests/visual_tests/styles/simple-E.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-N.xml b/tests/visual_tests/styles/simple-N.xml
index 74265ec5a..f6784152a 100644
--- a/tests/visual_tests/styles/simple-N.xml
+++ b/tests/visual_tests/styles/simple-N.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-NE.xml b/tests/visual_tests/styles/simple-NE.xml
index df1095195..4ce95278f 100644
--- a/tests/visual_tests/styles/simple-NE.xml
+++ b/tests/visual_tests/styles/simple-NE.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-NW.xml b/tests/visual_tests/styles/simple-NW.xml
index 120e26fcb..fe12935eb 100644
--- a/tests/visual_tests/styles/simple-NW.xml
+++ b/tests/visual_tests/styles/simple-NW.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-S.xml b/tests/visual_tests/styles/simple-S.xml
index e738ab8b4..5d555a2bc 100644
--- a/tests/visual_tests/styles/simple-S.xml
+++ b/tests/visual_tests/styles/simple-S.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-SE.xml b/tests/visual_tests/styles/simple-SE.xml
index ae43761b0..53613841a 100644
--- a/tests/visual_tests/styles/simple-SE.xml
+++ b/tests/visual_tests/styles/simple-SE.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-SW.xml b/tests/visual_tests/styles/simple-SW.xml
index 7b206417c..524eedd4a 100644
--- a/tests/visual_tests/styles/simple-SW.xml
+++ b/tests/visual_tests/styles/simple-SW.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-W.xml b/tests/visual_tests/styles/simple-W.xml
index cd0708a7a..6ce3b6055 100644
--- a/tests/visual_tests/styles/simple-W.xml
+++ b/tests/visual_tests/styles/simple-W.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-shield.xml b/tests/visual_tests/styles/simple-shield.xml
index ac39ee1f8..820690782 100644
--- a/tests/visual_tests/styles/simple-shield.xml
+++ b/tests/visual_tests/styles/simple-shield.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple.xml b/tests/visual_tests/styles/simple.xml
index 61bb07748..d77b1d2cd 100644
--- a/tests/visual_tests/styles/simple.xml
+++ b/tests/visual_tests/styles/simple.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">shape</Parameter>
-      <Parameter name="file">../data/points.shp</Parameter>
+      <Parameter name="type">osm</Parameter>
+      <Parameter name="file">../data/points.osm</Parameter>
     </Datasource>
   </Layer>