Switch tests from shapefile to osm.

Closes #1121.
2012-08-22 00:05:48 +02:00 · 2012-08-22 00:05:48 +02:00 · c8eb8e5775
commit c8eb8e5775
parent d1d782254b
22 changed files with 39 additions and 46 deletions
--- a/tests/visual_tests/data/points.dbf
+++ b/tests/visual_tests/data/points.dbf
--- a/tests/visual_tests/data/points.shp
+++ b/tests/visual_tests/data/points.shp
--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>