Merge pull request #2602 from mapycz/standalone-tests

Standalone visual tests

bindings/python/mapnik_parameters.cpp

@@ -196,6 +196,12 @@ std::shared_ptr<mapnik::parameter> create_parameter(mapnik::value_unicode_string
     return std::make_shared<mapnik::parameter>(key_utf8,value);
 }
 
+bool contains(mapnik::parameters const& p, std::string const& key)
+{
+    parameters::const_iterator pos = p.find(key);
+    return pos != p.end();
+}
+
 // needed for Python_Unicode to std::string (utf8) conversion
 
 std::shared_ptr<mapnik::parameter> create_parameter_from_string(mapnik::value_unicode_string const& key, mapnik::value_unicode_string const& ustr)
@@ -233,6 +239,7 @@ void export_parameters()
         .def("__getitem__",get_params_by_key2)
         .def("__getitem__",get_params_by_index)
         .def("__len__",get_params_size)
+        .def("__contains__",contains)
         .def("append",add_parameter)
         .def("iteritems",iterator<parameters>())
         ;

tests/visual_tests/styles/building-symbolizer-opacity.xml

@@ -4,6 +4,9 @@
   background-image-opacity=".5"
   background-image-comp-op="soft-light"
   >
+    <Parameters>
+        <Parameter name="sizes">512, 512</Parameter>
+    </Parameters>
     <Style name="ellipse">
         <Rule>
             <BuildingSymbolizer fill="white" fill-opacity=".5" />
@@ -17,5 +20,4 @@
             <Parameter name="file">../data/marker-multi-policy.csv</Parameter>
         </Datasource>
     </Layer>
-    
+</Map>
-</Map>

tests/visual_tests/styles/charspacing-lines.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">300, 300</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>

tests/visual_tests/styles/charspacing.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">200, 400</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
+                <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>

tests/visual_tests/styles/collision.xml

@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
   <Style name="line">
     <Rule>

tests/visual_tests/styles/colorize-alpha1.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries">
     <Rule>
@@ -46,4 +49,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/colorize-alpha2.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries">
     <Rule>
@@ -46,4 +49,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/colorize-alpha3.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries">
     <Rule>
@@ -46,4 +49,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/colorize-alpha4.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map>
+  <Parameters>
+    <Parameter name="sizes">256,256</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
   <Style name="countries">
     <Rule>
@@ -46,4 +50,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/dst-over-compositing.xml

@@ -1,6 +1,9 @@
 <Map 
   background-color="#808080"
   srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
 
     <Style name="My Style" comp-op="src-over">
         <Rule>
@@ -16,4 +19,4 @@
         </Datasource>
     </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/expressionformat.xml

@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/formatting-1.xml

@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/formatting-2.xml

@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/formatting-3.xml

@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/formatting-4.xml

@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/formatting-5.xml

@@ -9,6 +9,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/formatting-6.xml

@@ -12,6 +12,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/formatting-7.xml

@@ -9,6 +9,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/formatting-8.xml

@@ -9,6 +9,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/formatting-expr-alignment.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">500, 500</Parameter>
+  </Parameters>
   <FontSet name="book">
     <Font face-name="DejaVu Sans Book"/>
   </FontSet>
@@ -9,6 +12,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.5, -0.5, 0.5, 0.5</Parameter>
 <Parameter name="inline">
 lat,long,horizontal_alignment,vertical_alignment,dy,text
  0.25,-0.35,left,top,0

tests/visual_tests/styles/formatting.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+  <Parameters>
+    <Parameter name="sizes">256,256</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>

tests/visual_tests/styles/functional-expressions-length.xml

@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">512, 512</Parameter>
+  </Parameters>
   <FontSet name="book-fonts">
     <Font face-name="DejaVu Sans Book"/>
   </FontSet>
@@ -23,6 +26,7 @@
     <StyleName>frame</StyleName>
     <Datasource>
       <Parameter name="type">ogr</Parameter>
+      <Parameter name="extent">-15,-15,15,15</Parameter>
       <Parameter name="layer_by_index">0</Parameter>
       <Parameter name="inline"><![CDATA[
       {

tests/visual_tests/styles/functional-expressions.xml

@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="frame" filter-mode="first">
         <Rule>
@@ -26,6 +29,7 @@
         <StyleName>frame</StyleName>
         <Datasource>
             <Parameter name="type">ogr</Parameter>
+            <Parameter name="extent">-10,-10,10,10</Parameter>
             <Parameter name="layer_by_index">0</Parameter>
             <Parameter name="inline"><![CDATA[
                 {
@@ -61,4 +65,4 @@
                 }]]></Parameter>
         </Datasource>
     </Layer>
-</Map>
+</Map>

tests/visual_tests/styles/gdal-filter-factor.xml

@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="white">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
 <Style name="test">
   <Rule>
@@ -14,4 +17,4 @@
     </Datasource>
 </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/geometry-transform-scale-patterns.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">500,500</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>polygon</StyleName>

tests/visual_tests/styles/geometry-transform-scale.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">500,500</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>polygon</StyleName>

tests/visual_tests/styles/geometry-transform-translate-patterns-svg.xml

@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">200,200</Parameter>
+    </Parameters>
 
     <Style name="polygon">
         <Rule>

tests/visual_tests/styles/geometry-transform-translate-patterns.xml

@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">200,200</Parameter>
+    </Parameters>
 
     <Style name="polygon">
         <Rule>

tests/visual_tests/styles/geometry-transform-translate.xml

@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">200,200</Parameter>
+    </Parameters>
 
     <Style name="polygon">
         <Rule>

tests/visual_tests/styles/group-symbolizer-1.xml

@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>points</StyleName>

tests/visual_tests/styles/group-symbolizer-2.xml

@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Layer name="obstacle" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>obstacle</StyleName>

tests/visual_tests/styles/group-symbolizer-3.xml

@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,256</Parameter>
+  </Parameters>
 
   <Layer name="obstacle" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>obstacle</StyleName>

tests/visual_tests/styles/group-symbolizer-line-1.xml

@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Layer name="alpha" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>alpha</StyleName>

tests/visual_tests/styles/group-symbolizer-line-2.xml

@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <!-- the aim here is to test the "repeat-key" parameter. it is
      supposed to stop collidable / placeable items from being

tests/visual_tests/styles/halo-comp-op-on-satellite.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">450,450</Parameter>
+  </Parameters>
 
 <Style name="raster">
   <Rule>
@@ -99,4 +102,4 @@
     </Datasource>
 </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/harfbuzz.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 200</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
+                <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
-                <Parameter name="extent">-1,-1,1,1</Parameter>
             </Datasource>
     </Layer>
 

tests/visual_tests/styles/hb-fontsets.xml

@@ -2,13 +2,16 @@
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84"
      font-directory="../fonts/KhmerOS/">
+    <Parameters>
+        <Parameter name="sizes">800, 200</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
-                <Parameter name="file">../data/points.csv</Parameter>
                 <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
+                <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
 

tests/visual_tests/styles/image-filters-galore.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map background-color="#b8dee6" buffer-size="256" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries-mask" filter-mode="first" comp-op="difference">
     <Rule>
@@ -28,4 +31,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/image-filters-multi-blur-inflate.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map background-color="#b8dee6" buffer-size="256" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries-over" filter-mode="first">
     <Rule>
@@ -28,4 +31,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/image-filters-multi-blur.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map background-color="#b8dee6" buffer-size="256" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries-over" filter-mode="first">
     <Rule>
@@ -28,4 +31,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/jalign-auto.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">200, 200</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
@@ -17,7 +21,7 @@
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="-30" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="0" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="30" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
-            
+
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="30" dy="0" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="-30" dy="0" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
 

tests/visual_tests/styles/khmer.xml

@@ -2,11 +2,15 @@
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84"
      font-directory="../fonts/KhmerOS/">
+    <Parameters>
+        <Parameter name="sizes">800, 200</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
+                <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>

tests/visual_tests/styles/line-offset.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">900, 250</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-5.192, 50.189, -5.174, 50.195</Parameter>
             <Parameter name="file">../data/line-offset.csv</Parameter>
         </Datasource>
     </Layer>
@@ -26,4 +30,4 @@
             <TextSymbolizer size="10" fill="#000" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
         </Rule>
     </Style>
-</Map>
+</Map>

tests/visual_tests/styles/line-opacity-multi-render.xml

@@ -1,4 +1,7 @@
 <Map srs="+init=epsg:3857" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="polygon" filter-mode="first" >
       <Rule>
         <LineSymbolizer stroke-width="50" stroke-opacity="0.01" />
@@ -77,4 +80,4 @@ wkt
         </Datasource>
     </Layer>
     
-</Map>
+</Map>

tests/visual_tests/styles/line-pattern-smooth-and-offset.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Map background-color="white">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
 
     <Style name="style">
         <Rule>

tests/visual_tests/styles/line-pattern-symbolizer-opacity.xml

@@ -4,6 +4,9 @@
     background-image-opacity=".5"
     background-image-comp-op="soft-light"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>

tests/visual_tests/styles/line-pattern-symbolizer.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">900, 250</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-5.192, 50.189, -5.174, 50.195</Parameter>
             <Parameter name="file">../data/line-offset.csv</Parameter>
         </Datasource>
     </Layer>

tests/visual_tests/styles/line-smooth-and-offset.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Map background-color="white">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
 
     <Style name="style">
         <Rule>

tests/visual_tests/styles/line-symbolizer-expressions-all.xml

@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>

tests/visual_tests/styles/line-symbolizer-expressions.xml

@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>

tests/visual_tests/styles/line_break.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
+                <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>

tests/visual_tests/styles/lines-1.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>

tests/visual_tests/styles/lines-2.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>

tests/visual_tests/styles/lines-3.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>

tests/visual_tests/styles/lines-4.xml

@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>

tests/visual_tests/styles/lines-5.xml

@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- dy and multi lines test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>
@@ -11,7 +15,7 @@
             <Parameter name="file">../data/lines2.csv</Parameter>
         </Datasource>
     </Layer>
-    
+
     <Style name="lines">
         <Rule>
             <LineSymbolizer stroke-width="12" stroke="green"/>

tests/visual_tests/styles/lines-6.xml

@@ -3,6 +3,10 @@
 <!-- complex script on line test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84"
      font-directory="../fonts/KhmerOS/">
+     <Parameters>
+         <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+         <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+     </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>

tests/visual_tests/styles/lines-7.xml

@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- dy and multi lines test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-1.2, -1.2, 1.2, 1.2</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>
@@ -14,7 +18,7 @@ wkt,nr
 </Parameter>
         </Datasource>
     </Layer>
-    
+
     <Style name="lines">
         <Rule>
             <LineSymbolizer stroke-width="1" stroke="green"/>

tests/visual_tests/styles/lines-multi-layout-1.xml

@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>

tests/visual_tests/styles/lines-multi-layout-2.xml

@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-1.2, -1.2, 1.2, 1.2</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>

tests/visual_tests/styles/lines-multi-layout-shield.xml

@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>

tests/visual_tests/styles/lines-shield.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>

tests/visual_tests/styles/list.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">800, 100; 600, 100; 400, 100; 300, 100; 250, 100; 150, 100; 100, 100</Parameter>
+  </Parameters>
 
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>

tests/visual_tests/styles/map-background-image-compositing.xml

@@ -3,6 +3,9 @@
   background-image-opacity=".8"
   background-image-comp-op="screen"
   background-image="../data/pattern.png">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
 
     <Style name="ellipse">
         <Rule>
@@ -50,5 +53,5 @@ x,y
             </Parameter>
         </Datasource>
     </Layer>
-    
+
-</Map>
+</Map>

tests/visual_tests/styles/marker-collide.xml

@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="line">
     <Rule>
@@ -49,4 +52,4 @@ i|wkt
     </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/marker-interior-position.xml

@@ -1,7 +1,10 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
+
     <Style name="poly">
         <Rule>
             <PolygonSymbolizer />
@@ -10,7 +13,7 @@
             <DebugSymbolizer />
         </Rule>
     </Style>
-    
+
     <Layer name="bug" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>poly</StyleName>
         <Datasource>
@@ -22,4 +25,4 @@
             </Parameter>
         </Datasource>
     </Layer>
-</Map>
+</Map>

tests/visual_tests/styles/marker-line-placement-many-vertices.xml

@@ -1,6 +1,9 @@
 <?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.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="white">
+    <Parameters>
+        <Parameter name="sizes">600, 400</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
         <StyleName>My Style</StyleName>
         <Datasource>

tests/visual_tests/styles/marker-multi-policy.xml

@@ -1,4 +1,7 @@
 <Map maximum-extent="0,0,190,180">
+  <Parameters>
+     <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 <Style name="each">
   <Rule>
     <Filter>[i] = 1</Filter>

tests/visual_tests/styles/marker-on-hex-grid.xml

@@ -1,5 +1,8 @@
 <!DOCTYPE Map>
 <Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
+    <Parameters>
+        <Parameter name="sizes">600,400; 400,600; 257,256</Parameter>
+    </Parameters>
     <Style name="1">
         <Rule>
             <LineSymbolizer stroke-width=".2" stroke="grey"/>

tests/visual_tests/styles/marker-on-line-and-avoid-edges.xml

@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 <Style name="line" filter-mode="first" >
   <Rule>
     <LineSymbolizer stroke="#000000" />

tests/visual_tests/styles/marker-on-line-and-line-placement.xml

@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+     <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 <Style name="line" filter-mode="first" >
   <Rule>
     <LineSymbolizer stroke="red"/>
@@ -21,6 +24,7 @@
     <StyleName>point-placement</StyleName>
     <Datasource>
        <Parameter name="type">csv</Parameter>
+       <Parameter name="extent">-10, 0, 15, 20</Parameter>
        <Parameter name="file">../data/marker-on-line.csv</Parameter>
        <Parameter name="separator">|</Parameter>
     </Datasource>

tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map>
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
     <Style name="lines">
         <Rule>
             <LineSymbolizer stroke="#000000" />
@@ -17,6 +20,7 @@
         <StyleName>markers</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-1, -1, 11, 4</Parameter>
             <Parameter name="inline">
             wkt, placement
             "LINESTRING(0 0)", "vertex-first"

tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map>
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
     <Style name="lines">
         <Rule>
             <LineSymbolizer stroke="#000000" />
@@ -17,6 +20,7 @@
         <StyleName>markers</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-1, -1, 11, 4</Parameter>
             <Parameter name="inline">
             wkt, placement
             "LINESTRING(0 0)", "vertex-last"

tests/visual_tests/styles/marker-on-line-spacing-eq-width-overlap.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>alpha</StyleName>
         <Datasource>
@@ -51,4 +54,4 @@
             <DebugSymbolizer />
         </Rule>
     </Style>
-</Map>
+</Map>

tests/visual_tests/styles/marker-on-line-spacing-eq-width.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>alpha</StyleName>
         <Datasource>
@@ -50,4 +53,4 @@
             <LineSymbolizer stroke-width="0.2" stroke="#ff0000" />
         </Rule>
     </Style>
-</Map>
+</Map>

tests/visual_tests/styles/marker-on-line.xml

@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+     <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 <Style name="line" filter-mode="first" >
   <Rule>
     <LineSymbolizer stroke="#000000" />
@@ -15,6 +18,7 @@
     <StyleName>point-placement</StyleName>
     <Datasource>
        <Parameter name="type">csv</Parameter>
+       <Parameter name="extent">-10, 0, 15, 20</Parameter>
        <Parameter name="file">../data/marker-on-line.csv</Parameter>
        <Parameter name="separator">|</Parameter>
     </Datasource>

tests/visual_tests/styles/marker-recenter-collide.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+  <Parameters>
+    <Parameter name="sizes">256,128</Parameter>
+  </Parameters>
+
     <Style name="point">
         <Rule>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" dx="[offset]" dy="[offset]">"I"</TextSymbolizer>
@@ -14,6 +17,7 @@
         <StyleName>point</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-1,-0.5,1,0.5</Parameter>
             <Parameter name="inline">
                 lat,lon,offset
                 0,-0.35,10

tests/visual_tests/styles/marker-symbolizer-expressions-all.xml

@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>

tests/visual_tests/styles/marker-vs-point.xml

@@ -3,7 +3,10 @@
      background-image-opacity="0.8"
      background-image-comp-op="screen"
      background-image="../data/pattern.png">
-  
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
+
   <Style name="markers">
     <Rule>
       <MarkersSymbolizer
@@ -34,7 +37,7 @@ x,y
       </Parameter>
     </Datasource>
   </Layer>
-  
+
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>points</StyleName>
     <Datasource>
@@ -47,16 +50,16 @@ x,y
       </Parameter>
     </Datasource>
   </Layer>
-  
+
   <!-- points to frame data view -->
-  
+
   <Style name="frame">
     <Rule>
       <PointSymbolizer />
       <DebugSymbolizer />
     </Rule>
   </Style>
-  
+
   <Layer name="frame" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>frame</StyleName>
     <Datasource>
@@ -71,4 +74,4 @@ x,y
     </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/marker-whole-multi-polygon.xml

@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="style">
         <Rule>
             <PolygonSymbolizer fill="white"/>
@@ -14,4 +17,4 @@
             <Parameter name="type">shape</Parameter>
         </Datasource>
     </Layer>
-</Map>
+</Map>

tests/visual_tests/styles/marker-with-background-image-and-hsla-transform.xml

@@ -1,4 +1,7 @@
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-image="../../data/images/checker.jpg">
+    <Parameters>
+        <Parameter name="sizes">600,400; 400,600; 257,256</Parameter>
+    </Parameters>
 
     <Style name="ellipse"
       direct-image-filters="scale-hsla(0,1,0,1,0,1,0,.5)"
@@ -65,5 +68,5 @@ x,y
             </Parameter>
         </Datasource>
     </Layer>
-    
+
-</Map>
+</Map>

tests/visual_tests/styles/marker-with-background-image.xml

@@ -1,4 +1,7 @@
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-image="../../data/images/checker.jpg">
+    <Parameters>
+        <Parameter name="sizes">600,400; 400,600; 257,256</Parameter>
+    </Parameters>
 
     <Style name="ellipse">
         <Rule>
@@ -63,4 +66,4 @@ x,y
         </Datasource>
     </Layer>
     
-</Map>
+</Map>

tests/visual_tests/styles/orientation.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 200</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
@@ -14,7 +18,7 @@
         <Rule>
             <Filter>[nr] = 1</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="45">"XYZ"</TextSymbolizer>
-            <PointSymbolizer allow-overlap="true"/> 
+            <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
             <Filter>[nr] = 2</Filter>

tests/visual_tests/styles/point-symbolizer-expressions-all.xml

@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>

tests/visual_tests/styles/point-symbolizer-expressions.xml

@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>

tests/visual_tests/styles/point-symbolizer-overlap-placement-expr.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">500, 500</Parameter>
+  </Parameters>
   <FontSet name="book">
     <Font face-name="DejaVu Sans Book"/>
   </FontSet>
@@ -9,6 +12,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.5, -0.5, 0.5, 0.5</Parameter>
 <Parameter name="inline">
 lat,long,overlap,placement
  0.33,-0.36,noexpr-true,noexpr-false

tests/visual_tests/styles/polygon-symbolizer-expressions-all.xml

@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>

tests/visual_tests/styles/polygon-symbolizer-expressions.xml

@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>

tests/visual_tests/styles/polygon-winding-order.xml

@@ -1,6 +1,9 @@
 <Map
     background-color="#000"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">300,300</Parameter>
+    </Parameters>
 
     <Style name="polygon">
         <Rule>
@@ -58,4 +61,4 @@ Polygon((-75.0 -75.0, -75.0 75.0, 35.0 75.0, 35.0 -75.0, -75.0 -75.0))|bounds
 }</Parameter>
         </Datasource>
     </Layer>
-</Map>
+</Map>

tests/visual_tests/styles/postgis-inline.xml

@@ -1,4 +1,7 @@
 <Map srs="+init=epsg:3857" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 <Style name="carto_tests" filter-mode="first" >
     <Rule>
         <LineSymbolizer stroke="[stroke]" />

tests/visual_tests/styles/raster-color-to-alpha1.xml

@@ -1,5 +1,8 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over"
 >
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <Style name="style" image-filters="color-to-alpha(#00BDFF)">
   <Rule>
@@ -16,4 +19,4 @@
     </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/raster-color-to-alpha2.xml

@@ -1,6 +1,9 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over"
  background-color="steelblue"
 >
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <Style name="style" image-filters="color-to-alpha(#BCDAF5)">
   <Rule>
@@ -17,4 +20,4 @@
     </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/raster-color-to-alpha3.xml

@@ -1,6 +1,9 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over"
  background-color="steelblue"
 >
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <Style name="style" image-filters="color-to-alpha(black)">
   <Rule>
@@ -17,4 +20,4 @@
     </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/raster-color-to-alpha4.xml

@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+init=epsg:32630" minimum-version="0.7.2">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="DISCRETE RAINBOW" direct-image-filters="color-to-alpha(white)" image-filters="color-to-alpha(yellow),color-to-alpha(blue)">
     <Rule>
@@ -24,4 +27,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/raster-color-to-alpha5.xml

@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+init=epsg:32630" minimum-version="0.7.2">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="DISCRETE RAINBOW" image-filters="color-to-alpha(black)">
     <Rule>
@@ -24,4 +27,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/raster_colorizer.xml

@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+init=epsg:32630" minimum-version="0.7.2">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <!-- blue yellow orange indigo green red transparent black white -->
 
@@ -68,4 +71,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/raster_symbolizer.xml

@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+init=epsg:32630" minimum-version="0.7.2">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="two-value">
     <Rule>
@@ -32,4 +35,4 @@
       </Datasource>
   </Layer>
 
-</Map>
+</Map>

tests/visual_tests/styles/repeat-labels-1.xml

@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+    <Parameters>
+        <Parameter name="sizes">750,250</Parameter>
+    </Parameters>
+
     <Style name="line">
         <Rule>
             <LineSymbolizer stroke-width="8" stroke="orange"/>
         </Rule>
     </Style>
-    
+
     <Style name="marker">
         <Rule>
             <Filter>[type] = 'poi'</Filter>
             <MarkersSymbolizer />
         </Rule>
     </Style>
-    
+
     <Style name="shield">
         <Rule>
             <Filter>[type] = 'motorway'</Filter>
@@ -36,6 +39,7 @@
         <StyleName>text</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-12, -4, 12, 4</Parameter>
             <Parameter name="file">../data/repeat-labels.csv</Parameter>
         </Datasource>
     </Layer>

tests/visual_tests/styles/repeat-labels-2.xml

@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+    <Parameters>
+        <Parameter name="sizes">750,250</Parameter>
+    </Parameters>
+
     <Style name="line">
         <Rule>
             <LineSymbolizer stroke-width="8" stroke="orange"/>
         </Rule>
     </Style>
-    
+
     <Style name="marker">
         <Rule>
             <Filter>[type] = 'poi'</Filter>
             <MarkersSymbolizer />
         </Rule>
     </Style>
-    
+
     <Style name="shield">
         <Rule>
             <Filter>[type] = 'motorway'</Filter>
@@ -36,6 +39,7 @@
         <StyleName>text</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-12, -4, 12, 4</Parameter>
             <Parameter name="file">../data/repeat-labels.csv</Parameter>
         </Datasource>
     </Layer>

tests/visual_tests/styles/repeat-labels-3.xml

@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+    <Parameters>
+        <Parameter name="sizes">750,250</Parameter>
+    </Parameters>
+
     <Style name="line">
         <Rule>
             <LineSymbolizer stroke-width="8" stroke="orange"/>
         </Rule>
     </Style>
-    
+
     <Style name="marker">
         <Rule>
             <Filter>[type] = 'poi'</Filter>
             <MarkersSymbolizer />
         </Rule>
     </Style>
-    
+
     <Style name="shield">
         <Rule>
             <Filter>[type] = 'motorway'</Filter>
@@ -36,6 +39,7 @@
         <StyleName>text</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-12, -4, 12, 4</Parameter>
             <Parameter name="file">../data/repeat-labels.csv</Parameter>
         </Datasource>
     </Layer>