From ad3e214beb3f8671219466f050079e5708578010 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 9 Jan 2015 10:26:20 -0800
Subject: [PATCH] stop using deprecated marker-type in visual tests

---
 tests/visual_tests/styles/marker-collide.xml           |  4 ++--
 .../styles/marker-on-line-and-line-placement.xml       | 10 +++++-----
 .../marker-on-line-and-vertex-first-placement.xml      |  2 +-
 .../marker-on-line-and-vertex-last-placement.xml       |  2 +-
 tests/visual_tests/styles/marker-on-line.xml           |  2 +-
 .../styles/marker_line_placement_on_points.xml         |  6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/visual_tests/styles/marker-collide.xml b/tests/visual_tests/styles/marker-collide.xml
index 8115bfc8a..ffec1841c 100644
--- a/tests/visual_tests/styles/marker-collide.xml
+++ b/tests/visual_tests/styles/marker-collide.xml
@@ -17,8 +17,8 @@
 
   <Style name="point-placement">
     <Rule>
-      <MarkersSymbolizer placement="line" marker-type="ellipse" fill="blue" transform="scale(1.5,.3)" spacing="1" allow-overlap="false"/>
-      <MarkersSymbolizer placement="line" marker-type="ellipse" fill="blue" transform="scale(.3,1.5)" spacing="1" allow-overlap="false"/>
+      <MarkersSymbolizer placement="line" file="shape://ellipse" fill="blue" transform="scale(1.5,.3)" spacing="1" allow-overlap="false"/>
+      <MarkersSymbolizer placement="line" file="shape://ellipse" fill="blue" transform="scale(.3,1.5)" spacing="1" allow-overlap="false"/>
     </Rule>
   </Style>
 
diff --git a/tests/visual_tests/styles/marker-on-line-and-line-placement.xml b/tests/visual_tests/styles/marker-on-line-and-line-placement.xml
index 86808053a..936ff7a9e 100644
--- a/tests/visual_tests/styles/marker-on-line-and-line-placement.xml
+++ b/tests/visual_tests/styles/marker-on-line-and-line-placement.xml
@@ -12,11 +12,11 @@
 </Style>
 <Style name="point-placement" filter-mode="first" >
   <Rule>
-    <MarkersSymbolizer stroke-width="0" allow-overlap="true" placement="line" marker-type="ellipse" fill="red" />
-    <MarkersSymbolizer stroke-width="0" offset="-10" transform="translate(0,-10)" allow-overlap="true" placement="line" marker-type="ellipse" fill="darkred" />
-    <MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth=".5" transform="translate(10,10) translate(-10,-10)" placement="line" marker-type="ellipse" fill="blue" />
-    <MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth="1" placement="line" marker-type="ellipse" fill="orange" />
-    <MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth="1" geometry-transform="translate(10,10)" placement="line" marker-type="ellipse" fill="darkgreen" />
+    <MarkersSymbolizer stroke-width="0" allow-overlap="true" placement="line" file="shape://ellipse" fill="red" />
+    <MarkersSymbolizer stroke-width="0" offset="-10" transform="translate(0,-10)" allow-overlap="true" placement="line" file="shape://ellipse" fill="darkred" />
+    <MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth=".5" transform="translate(10,10) translate(-10,-10)" placement="line" file="shape://ellipse" fill="blue" />
+    <MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth="1" placement="line" file="shape://ellipse" fill="orange" />
+    <MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth="1" geometry-transform="translate(10,10)" placement="line" file="shape://ellipse" fill="darkgreen" />
   </Rule>
 </Style>
 <Layer name="carto_tests">
diff --git a/tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml b/tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml
index 58b1d2508..9e1084f9d 100644
--- a/tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml
+++ b/tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml
@@ -11,7 +11,7 @@
     </Style>
     <Style name="markers">
         <Rule>
-            <MarkersSymbolizer marker-type="ellipse" placement="[placement]" />
+            <MarkersSymbolizer file="shape://ellipse" placement="[placement]" />
             <DebugSymbolizer />
         </Rule>
     </Style>
diff --git a/tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml b/tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml
index 5afaa3f6a..fd89c57d2 100644
--- a/tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml
+++ b/tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml
@@ -11,7 +11,7 @@
     </Style>
     <Style name="markers">
         <Rule>
-            <MarkersSymbolizer marker-type="ellipse" placement="[placement]" />
+            <MarkersSymbolizer file="shape://ellipse" placement="[placement]" />
             <DebugSymbolizer />
         </Rule>
     </Style>
diff --git a/tests/visual_tests/styles/marker-on-line.xml b/tests/visual_tests/styles/marker-on-line.xml
index 87d22f1f9..6c8732435 100644
--- a/tests/visual_tests/styles/marker-on-line.xml
+++ b/tests/visual_tests/styles/marker-on-line.xml
@@ -9,7 +9,7 @@
 </Style>
 <Style name="point-placement" filter-mode="first" >
   <Rule>
-    <MarkersSymbolizer placement="point" marker-type="ellipse" fill="blue" />
+    <MarkersSymbolizer placement="point" file="shape://ellipse" fill="blue" />
     <DebugSymbolizer />
   </Rule>
 </Style>
diff --git a/tests/visual_tests/styles/marker_line_placement_on_points.xml b/tests/visual_tests/styles/marker_line_placement_on_points.xml
index cd6f6eece..6fe866689 100644
--- a/tests/visual_tests/styles/marker_line_placement_on_points.xml
+++ b/tests/visual_tests/styles/marker_line_placement_on_points.xml
@@ -4,15 +4,15 @@
     <Style name="1">
         <Rule>
           <Filter>[id]=1</Filter>
-          <MarkersSymbolizer fill="darkgreen" opacity=".7" width="15" height="10" stroke="green" stroke-width="7" stroke-opacity=".2" placement="line" marker-type="ellipse"/>
+          <MarkersSymbolizer fill="darkgreen" opacity=".7" width="15" height="10" stroke="green" stroke-width="7" stroke-opacity=".2" placement="line" file="shape://ellipse"/>
         </Rule>
         <Rule>
           <Filter>[id]=2</Filter>
-             <MarkersSymbolizer fill="darkorange" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="line" marker-type="ellipse"/>
+             <MarkersSymbolizer fill="darkorange" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="line" file="shape://ellipse"/>
         </Rule>
         <Rule>
           <Filter>[id]=3</Filter>
-             <MarkersSymbolizer fill="darkred" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="line" marker-type="ellipse"/>
+             <MarkersSymbolizer fill="darkred" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="line" file="shape://ellipse"/>
         </Rule>
     </Style>
     <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">