From ae5f4d26d1afb0c37e703a460c4abd2e86d8d979 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 25 Jan 2013 00:49:55 -0800
Subject: [PATCH] tests: make consistent the proj4 string for epsg:4326

---
 plugins/input/python/README.md                            | 4 ++--
 plugins/input/python/examples/simple_xml.xml              | 4 ++--
 plugins/input/templates/helloworld/README.md              | 4 ++--
 plugins/input/templates/helloworld/test.xml               | 4 ++--
 tests/data/good_maps/interior_point.xml                   | 4 ++--
 tests/data/good_maps/layer_buffer_size_reduction.xml      | 4 ++--
 tests/data/good_maps/line_symbolizer2.xml                 | 6 +++---
 tests/data/good_maps/marker_ellipse_transform.xml         | 6 +++---
 tests/data/good_maps/marker_ellipse_transform2.xml        | 6 +++---
 tests/data/good_maps/markers_symbolizer_lines.xml         | 4 ++--
 tests/data/good_maps/markers_symbolizer_lines_file.xml    | 4 ++--
 tests/data/good_maps/markers_symbolizer_points.xml        | 6 +++---
 tests/data/good_maps/markers_symbolizer_points_file.xml   | 6 +++---
 .../data/good_maps/markers_symbolizer_points_gradient.xml | 4 ++--
 .../data/good_maps/markers_symbolizer_points_stacked.xml  | 4 ++--
 tests/data/good_maps/osm_nodes_ways.xml                   | 6 +++---
 tests/data/good_maps/point_csv.xml                        | 4 ++--
 tests/data/good_maps/point_json.xml                       | 4 ++--
 tests/data/good_maps/point_json_inline.xml                | 4 ++--
 tests/data/good_maps/point_symbolizer.xml                 | 4 ++--
 .../data/good_maps/point_symbolizer_ignore_placements.xml | 4 ++--
 tests/data/good_maps/rtl_text_map.xml                     | 4 ++--
 tests/data/good_maps/shield_symbolizer.xml                | 6 +++---
 tests/data/good_maps/sqlite.xml                           | 6 +++---
 tests/data/good_maps/text_breaks.xml                      | 4 ++--
 tests/data/good_maps/text_halo_and_collision.xml          | 6 +++---
 tests/data/good_maps/text_rotation.xml                    | 2 +-
 tests/data/good_maps/xinclude/map.xml                     | 2 +-
 .../good_maps/xinclude/map_with_entities_and_includes.xml | 2 +-
 tests/data/python_plugin/python_circle_datasource.xml     | 8 ++++----
 tests/data/python_plugin/python_point_datasource.xml      | 4 ++--
 tests/visual_tests/styles/expressionformat.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/line-offset.xml                 | 4 ++--
 tests/visual_tests/styles/lines-1.xml                     | 4 ++--
 tests/visual_tests/styles/lines-2.xml                     | 4 ++--
 tests/visual_tests/styles/lines-3.xml                     | 4 ++--
 tests/visual_tests/styles/lines-shield.xml                | 4 ++--
 tests/visual_tests/styles/list.xml                        | 4 ++--
 .../styles/marker-on-line-spacing-eq-width-overlap.xml    | 8 ++++----
 .../styles/marker-on-line-spacing-eq-width.xml            | 8 ++++----
 .../styles/marker_line_placement_on_points.xml            | 4 ++--
 tests/visual_tests/styles/rtl-point.xml                   | 4 ++--
 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 ++--
 tests/visual_tests/styles/tiff-opaque-edge-gdal.xml       | 4 ++--
 tests/visual_tests/styles/tiff-opaque-edge-raster.xml     | 4 ++--
 60 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/plugins/input/python/README.md b/plugins/input/python/README.md
index 575e0d7c5..f1a4c57e3 100644
--- a/plugins/input/python/README.md
+++ b/plugins/input/python/README.md
@@ -97,14 +97,14 @@ In XML:
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
-<Map srs="+init=epsg:4326" background-color="white">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white">
     <Style name="style">
         <Rule>
             <PointSymbolizer />
             <TextSymbolizer name="[label]" face_name="DejaVu Sans Book" size="10" dx="5" dy="5"/>
         </Rule>
     </Style>
-    <Layer name="test" srs="+init=epsg:4326">
+    <Layer name="test" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>style</StyleName>
         <Datasource>
             <Parameter name="type">python</Parameter>
diff --git a/plugins/input/python/examples/simple_xml.xml b/plugins/input/python/examples/simple_xml.xml
index d7e3c3b8e..a745f5f55 100644
--- a/plugins/input/python/examples/simple_xml.xml
+++ b/plugins/input/python/examples/simple_xml.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Map srs="+init=epsg:4326" background-color="white">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white">
     <Style name="style">
         <Rule>
             <PointSymbolizer />
             <TextSymbolizer name="[label]" face-name="DejaVu Sans Book" size="10" dx="5" dy="5"/>
         </Rule>
     </Style>
-    <Layer name="test" srs="+init=epsg:4326">
+    <Layer name="test" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>style</StyleName>
         <Datasource>
             <Parameter name="type">python</Parameter>
diff --git a/plugins/input/templates/helloworld/README.md b/plugins/input/templates/helloworld/README.md
index 0b8e4520c..5a5b50975 100644
--- a/plugins/input/templates/helloworld/README.md
+++ b/plugins/input/templates/helloworld/README.md
@@ -15,14 +15,14 @@ the center of any query. This means that it should place a point in
 the middle of any map tile and display a "hello world!" label if used like:
 
 <?xml version="1.0" encoding="utf-8"?>
-<Map srs="+init=epsg:4326" background-color="white">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white">
     <Style name="style">
         <Rule>
             <PointSymbolizer />
             <TextSymbolizer name="[key]" face_name="DejaVu Sans Book" size="10" dx="5" dy="5"/>
         </Rule>
     </Style>
-    <Layer name="test" srs="+init=epsg:4326">
+    <Layer name="test" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>style</StyleName>
         <Datasource>
             <Parameter name="type">hello</Parameter>
diff --git a/plugins/input/templates/helloworld/test.xml b/plugins/input/templates/helloworld/test.xml
index a23792c16..3bfe7754d 100644
--- a/plugins/input/templates/helloworld/test.xml
+++ b/plugins/input/templates/helloworld/test.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="white" minimum-version="0.7.2">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white" minimum-version="0.7.2">
     <Style name="style">
         <Rule>
             <PointSymbolizer/>
@@ -8,7 +8,7 @@
         </Rule>
     </Style>
     <!-- this example only works in EPSG:4326 -->
-    <Layer name="test" srs="+init=epsg:4326">
+    <Layer name="test" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>style</StyleName>
         <Datasource>
             <!-- here we create a 'hello' type datasource which simply
diff --git a/tests/data/good_maps/interior_point.xml b/tests/data/good_maps/interior_point.xml
index 98613e023..bfc03980f 100644
--- a/tests/data/good_maps/interior_point.xml
+++ b/tests/data/good_maps/interior_point.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="rgb(233,233,233)" minimum-version="0.7.2">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgb(233,233,233)" minimum-version="0.7.2">
 
     <Style name="multipolygon_style">
         <Rule>
@@ -19,7 +19,7 @@
         </Rule>
     </Style>
     
-    <Layer name="multipolygon" srs="+init=epsg:4326">
+    <Layer name="multipolygon" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>multipolygon_style</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/layer_buffer_size_reduction.xml b/tests/data/good_maps/layer_buffer_size_reduction.xml
index e016ce35b..a6f93fd76 100644
--- a/tests/data/good_maps/layer_buffer_size_reduction.xml
+++ b/tests/data/good_maps/layer_buffer_size_reduction.xml
@@ -1,11 +1,11 @@
-<Map srs="+init=epsg:4326" background-color="lightsteelblue" buffer-size="256">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="lightsteelblue" buffer-size="256">
     <Style name="point_style">
         <Rule>
             <PointSymbolizer file="../svg/point_sm.svg"/>
             <TextSymbolizer size="12" dy="-5" face-name="DejaVu Sans Book" halo-fill="rgba(255,255,255,.5)" halo-radius=".5">[name]</TextSymbolizer>
         </Rule>
     </Style>
-    <Layer name="point" srs="+init=epsg:4326" buffer-size="-150">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" buffer-size="-150">
         <StyleName>point_style</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/line_symbolizer2.xml b/tests/data/good_maps/line_symbolizer2.xml
index 7133720fa..fbcdd0b4e 100644
--- a/tests/data/good_maps/line_symbolizer2.xml
+++ b/tests/data/good_maps/line_symbolizer2.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="rgb(233,233,233)" minimum-version="0.7.2">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgb(233,233,233)" minimum-version="0.7.2">
 
     <Datasource name="sqlite">
         <Parameter name="type">sqlite</Parameter>
@@ -12,7 +12,7 @@
         </Rule>
     </Style>
 
-    <Layer name="polygons" srs="+init=epsg:4326">
+    <Layer name="polygons" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>polygon_style</StyleName>
         <Datasource base="sqlite">
             <Parameter name="table">multipolygon</Parameter>
@@ -26,7 +26,7 @@
         </Rule>
     </Style>
     
-    <Layer name="lines" srs="+init=epsg:4326">
+    <Layer name="lines" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>line_style</StyleName>
         <Datasource base="sqlite">
             <Parameter name="table">lines</Parameter>
diff --git a/tests/data/good_maps/marker_ellipse_transform.xml b/tests/data/good_maps/marker_ellipse_transform.xml
index e96595619..a5c7ffeac 100644
--- a/tests/data/good_maps/marker_ellipse_transform.xml
+++ b/tests/data/good_maps/marker_ellipse_transform.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="rgba(255,255,255,.5)">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgba(255,255,255,.5)">
 
     <Style name="ellipse">
         <Rule>
@@ -30,7 +30,7 @@
         </Rule>
     </Style>
 
-    <Layer name="layer" srs="+init=epsg:4326">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>ellipse</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
@@ -49,7 +49,7 @@ x,y
         </Rule>
     </Style>
 
-    <Layer name="frame" srs="+init=epsg:4326">
+    <Layer name="frame" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>frame</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
diff --git a/tests/data/good_maps/marker_ellipse_transform2.xml b/tests/data/good_maps/marker_ellipse_transform2.xml
index 048353adf..5449009a5 100644
--- a/tests/data/good_maps/marker_ellipse_transform2.xml
+++ b/tests/data/good_maps/marker_ellipse_transform2.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="rgba(255,255,255,.5)">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgba(255,255,255,.5)">
 
     <Style name="ellipse">
         <Rule>
@@ -30,7 +30,7 @@
         </Rule>
     </Style>
 
-    <Layer name="layer" srs="+init=epsg:4326">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>ellipse</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
@@ -49,7 +49,7 @@ x,y
         </Rule>
     </Style>
 
-    <Layer name="frame" srs="+init=epsg:4326">
+    <Layer name="frame" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>frame</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
diff --git a/tests/data/good_maps/markers_symbolizer_lines.xml b/tests/data/good_maps/markers_symbolizer_lines.xml
index e1f879ad9..6cfc5ad46 100644
--- a/tests/data/good_maps/markers_symbolizer_lines.xml
+++ b/tests/data/good_maps/markers_symbolizer_lines.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <LineSymbolizer stroke-width=".2" stroke="grey"/>
@@ -14,7 +14,7 @@
         </Rule>
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/markers_symbolizer_lines_file.xml b/tests/data/good_maps/markers_symbolizer_lines_file.xml
index e08621485..1df88426a 100644
--- a/tests/data/good_maps/markers_symbolizer_lines_file.xml
+++ b/tests/data/good_maps/markers_symbolizer_lines_file.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <LineSymbolizer offset="-2" stroke-width="2" stroke="red"/>
@@ -14,7 +14,7 @@
         </Rule>
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/markers_symbolizer_points.xml b/tests/data/good_maps/markers_symbolizer_points.xml
index 9381ec866..81d7cec17 100644
--- a/tests/data/good_maps/markers_symbolizer_points.xml
+++ b/tests/data/good_maps/markers_symbolizer_points.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
 
     <Style name="1">
         <Rule>
@@ -31,7 +31,7 @@
             <PointSymbolizer file="../svg/ellipses.svg"/>
         </Rule>
     </Style>
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
@@ -46,7 +46,7 @@
     </Rule>
   </Style>
 
-  <Layer name="points" status="on" srs="+proj=latlong +datum=WGS84">
+  <Layer name="points" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>meta_point_bboxs</StyleName>
     <Datasource>
       <Parameter name="type">ogr</Parameter>
diff --git a/tests/data/good_maps/markers_symbolizer_points_file.xml b/tests/data/good_maps/markers_symbolizer_points_file.xml
index 304adc572..107467c70 100644
--- a/tests/data/good_maps/markers_symbolizer_points_file.xml
+++ b/tests/data/good_maps/markers_symbolizer_points_file.xml
@@ -1,12 +1,12 @@
 <!DOCTYPE Map>
-<Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
 
     <Style name="1">
         <Rule>
             <MarkersSymbolizer file="../svg/ellipses.svg"/>
         </Rule>
     </Style>
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
@@ -21,7 +21,7 @@
     </Rule>
   </Style>
 
-  <Layer name="points" status="on" srs="+proj=latlong +datum=WGS84">
+  <Layer name="points" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>meta_point_bboxs</StyleName>
     <Datasource>
       <Parameter name="type">ogr</Parameter>
diff --git a/tests/data/good_maps/markers_symbolizer_points_gradient.xml b/tests/data/good_maps/markers_symbolizer_points_gradient.xml
index 062aad479..06ca8183c 100644
--- a/tests/data/good_maps/markers_symbolizer_points_gradient.xml
+++ b/tests/data/good_maps/markers_symbolizer_points_gradient.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="white" minimum-version="0.7.2">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white" minimum-version="0.7.2">
 
     <Style name="1">
         <Rule>
@@ -15,7 +15,7 @@
         </Rule>
     </Style>
     
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/markers_symbolizer_points_stacked.xml b/tests/data/good_maps/markers_symbolizer_points_stacked.xml
index deaa7bbcb..10c71a0bf 100644
--- a/tests/data/good_maps/markers_symbolizer_points_stacked.xml
+++ b/tests/data/good_maps/markers_symbolizer_points_stacked.xml
@@ -1,4 +1,4 @@
-<Map background-color="lightgrey" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="lightgrey" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
 
     <Style name="1">
         <Rule>
@@ -17,7 +17,7 @@
              <MarkersSymbolizer fill="white" stroke-width=".3" stroke="green" stroke-opacity=".5" allow-overlap="true"/>
         </Rule>
     </Style>
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/osm_nodes_ways.xml b/tests/data/good_maps/osm_nodes_ways.xml
index 9b8620a14..814396aa2 100644
--- a/tests/data/good_maps/osm_nodes_ways.xml
+++ b/tests/data/good_maps/osm_nodes_ways.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map srs="+proj=latlong +datum=WGS84" background-color="steelblue" minimum-version="0.7.2">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="steelblue" minimum-version="0.7.2">
 
   <Style name="red">
     <Rule>
@@ -15,7 +15,7 @@
     </Rule>
   </Style>
 
-  <Layer name="red" status="on" srs="+proj=latlong +datum=WGS84">
+  <Layer name="red" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>red</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
@@ -23,7 +23,7 @@
     </Datasource>
   </Layer>
 
-  <Layer name="green" status="on" srs="+proj=latlong +datum=WGS84">
+  <Layer name="green" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>green</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/data/good_maps/point_csv.xml b/tests/data/good_maps/point_csv.xml
index a174ab551..7949a7b1b 100644
--- a/tests/data/good_maps/point_csv.xml
+++ b/tests/data/good_maps/point_csv.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <Filter>([x]=0)</Filter>
@@ -19,7 +19,7 @@
         
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="file">../vrt/points.vrt</Parameter>
diff --git a/tests/data/good_maps/point_json.xml b/tests/data/good_maps/point_json.xml
index 09dd44647..1e9146dc4 100644
--- a/tests/data/good_maps/point_json.xml
+++ b/tests/data/good_maps/point_json.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <Filter>([x]=0)</Filter>
@@ -19,7 +19,7 @@
         
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="file">../json/points.json</Parameter>
diff --git a/tests/data/good_maps/point_json_inline.xml b/tests/data/good_maps/point_json_inline.xml
index 1f067cdf0..add0547f1 100644
--- a/tests/data/good_maps/point_json_inline.xml
+++ b/tests/data/good_maps/point_json_inline.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <Filter>([x]=0)</Filter>
@@ -19,7 +19,7 @@
         
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="string">
diff --git a/tests/data/good_maps/point_symbolizer.xml b/tests/data/good_maps/point_symbolizer.xml
index e09e790cb..314a461ec 100644
--- a/tests/data/good_maps/point_symbolizer.xml
+++ b/tests/data/good_maps/point_symbolizer.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <Filter>([name]='CHILE')</Filter>
@@ -34,7 +34,7 @@
         </Rule>
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/point_symbolizer_ignore_placements.xml b/tests/data/good_maps/point_symbolizer_ignore_placements.xml
index 2f254da84..b56ebfe99 100644
--- a/tests/data/good_maps/point_symbolizer_ignore_placements.xml
+++ b/tests/data/good_maps/point_symbolizer_ignore_placements.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <Filter>([name]='Brazil' or [name]='Mongolia' or [name]='Sudan')</Filter>
@@ -14,7 +14,7 @@
         </Rule>
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/rtl_text_map.xml b/tests/data/good_maps/rtl_text_map.xml
index 38f46aca1..22da9eb96 100644
--- a/tests/data/good_maps/rtl_text_map.xml
+++ b/tests/data/good_maps/rtl_text_map.xml
@@ -1,4 +1,4 @@
-<Map background-color="#eee" srs="+init=epsg:4326" minimum-version="0.7.2" font-directory="../fonts/XB Zar.ttf">
+<Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2" font-directory="../fonts/XB Zar.ttf">
   
 <!-- nik2img.py -b 60 46 80 28 rtl_text_map.xml text_styles.png -->
 
@@ -9,7 +9,7 @@
     </Rule>
   </Style>
 
-  <Layer srs="+init=epsg:4326">
+  <Layer srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>custom_font</StyleName>
     <Datasource>
       <Parameter name="file">../shp/farsi-labels</Parameter>
diff --git a/tests/data/good_maps/shield_symbolizer.xml b/tests/data/good_maps/shield_symbolizer.xml
index e0221fa64..51882658e 100644
--- a/tests/data/good_maps/shield_symbolizer.xml
+++ b/tests/data/good_maps/shield_symbolizer.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <ShieldSymbolizer file="../images/dummy.png" size="10" transform="scale(5) translate(15, 15) rotate(20) skewX(20) skewY(5)" dy="-5" dx="-5" opacity=".5" text-opacity=".3" face-name="DejaVu Sans Book" halo-radius="1" shield-dx="10" shield-dy="10" allow-overlap="true" avoid-edges="false">[label]</ShieldSymbolizer>
@@ -17,7 +17,7 @@
         </Rule>
     </Style>
 
-    <Layer name="line" srs="+init=epsg:4326">
+    <Layer name="line" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>2</StyleName>
         <Datasource>
             <Parameter name="file">../json/lines.json</Parameter>
@@ -26,7 +26,7 @@
         </Datasource>
     </Layer>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="file">../json/points.json</Parameter>
diff --git a/tests/data/good_maps/sqlite.xml b/tests/data/good_maps/sqlite.xml
index a8270c32e..014506998 100644
--- a/tests/data/good_maps/sqlite.xml
+++ b/tests/data/good_maps/sqlite.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="rgb(255,255,255)" minimum-version="0.7.2">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgb(255,255,255)" minimum-version="0.7.2">
 
     <Style name="world_borders_style1">
         <Rule>
@@ -14,7 +14,7 @@
     </Style>
 
     <!-- layer created by ogr like: ogr2ogr -t_srs EPSG:4326 -f SQLite ../sqlite/world.sqlite world_merc.shp -->
-    <Layer name="world_borders2" srs="+init=epsg:4326">
+    <Layer name="world_borders2" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>world_borders_style1</StyleName>
         <StyleName>world_borders_style2</StyleName>
         <Datasource>
@@ -32,7 +32,7 @@
     </Style>
 
     <!-- file created by QGIS read with native sqlite plugin -->
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>point_style</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/text_breaks.xml b/tests/data/good_maps/text_breaks.xml
index 215043357..0f89661a7 100644
--- a/tests/data/good_maps/text_breaks.xml
+++ b/tests/data/good_maps/text_breaks.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <Filter>([label]='center')</Filter>
@@ -15,7 +15,7 @@ three'</TextSymbolizer>
         </Rule>        
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="string">
diff --git a/tests/data/good_maps/text_halo_and_collision.xml b/tests/data/good_maps/text_halo_and_collision.xml
index b44b3e2dd..63daf2fbd 100644
--- a/tests/data/good_maps/text_halo_and_collision.xml
+++ b/tests/data/good_maps/text_halo_and_collision.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="steelblue">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="steelblue">
 <!-- test case for https://github.com/mapnik/mapnik/issues/1354 -->
 
     <Style name="labels">
@@ -15,7 +15,7 @@
     </Style>
 
 
-    <Layer name="points" srs="+init=epsg:4326">
+    <Layer name="points" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>labels</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
@@ -35,7 +35,7 @@ x,y
         </Rule>
     </Style>
 
-    <Layer name="frame" srs="+init=epsg:4326">
+    <Layer name="frame" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>frame</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
diff --git a/tests/data/good_maps/text_rotation.xml b/tests/data/good_maps/text_rotation.xml
index f37dbf5af..eb2b8c7d5 100644
--- a/tests/data/good_maps/text_rotation.xml
+++ b/tests/data/good_maps/text_rotation.xml
@@ -31,7 +31,7 @@
         </Rule>
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>labels</StyleName>
         <Datasource>
             <Parameter name="type">sqlite</Parameter>
diff --git a/tests/data/good_maps/xinclude/map.xml b/tests/data/good_maps/xinclude/map.xml
index 02eb9f3dc..add6415ac 100644
--- a/tests/data/good_maps/xinclude/map.xml
+++ b/tests/data/good_maps/xinclude/map.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map  >
-<Map xmlns:xi="http://www.w3.org/2001/XInclude" srs="+init=epsg:4326" background-color="rgb(255,255,255)" >
+<Map xmlns:xi="http://www.w3.org/2001/XInclude" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgb(255,255,255)" >
 
 <!-- http://www.oreillynet.com/xml/blog/2004/05/transclude_with_xinclude_and_x.html -->
 
diff --git a/tests/data/good_maps/xinclude/map_with_entities_and_includes.xml b/tests/data/good_maps/xinclude/map_with_entities_and_includes.xml
index 6226ff0d7..a2d51664a 100644
--- a/tests/data/good_maps/xinclude/map_with_entities_and_includes.xml
+++ b/tests/data/good_maps/xinclude/map_with_entities_and_includes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map  >
-<Map xmlns:xi="http://www.w3.org/2001/XInclude" srs="+init=epsg:4326" background-color="rgb(255,255,255)" >
+<Map xmlns:xi="http://www.w3.org/2001/XInclude" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgb(255,255,255)" >
 
 <!-- http://www.oreillynet.com/xml/blog/2004/05/transclude_with_xinclude_and_x.html -->
 
diff --git a/tests/data/python_plugin/python_circle_datasource.xml b/tests/data/python_plugin/python_circle_datasource.xml
index 0d19d45c2..c8d7d8b17 100644
--- a/tests/data/python_plugin/python_circle_datasource.xml
+++ b/tests/data/python_plugin/python_circle_datasource.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <LineSymbolizer stroke="rgb(80%,0%,0%)" />
@@ -18,7 +18,7 @@
         </Rule>
     </Style>
 
-    <Layer name="circles1" srs="+init=epsg:4326">
+    <Layer name="circles1" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">python</Parameter>
@@ -26,7 +26,7 @@
         </Datasource>
     </Layer>
 
-    <Layer name="circles2" srs="+init=epsg:4326">
+    <Layer name="circles2" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>2</StyleName>
         <Datasource>
             <Parameter name="type">python</Parameter>
@@ -36,7 +36,7 @@
         </Datasource>
     </Layer>
 
-    <Layer name="circles3" srs="+init=epsg:4326">
+    <Layer name="circles3" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>3</StyleName>
         <Datasource>
             <Parameter name="type">python</Parameter>
diff --git a/tests/data/python_plugin/python_point_datasource.xml b/tests/data/python_plugin/python_point_datasource.xml
index 3f311d746..249e5ce33 100644
--- a/tests/data/python_plugin/python_point_datasource.xml
+++ b/tests/data/python_plugin/python_point_datasource.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
             <TextSymbolizer size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
@@ -7,7 +7,7 @@
         </Rule>
     </Style>
 
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">python</Parameter>
diff --git a/tests/visual_tests/styles/expressionformat.xml b/tests/visual_tests/styles/expressionformat.xml
index c724a262a..919430f97 100644
--- a/tests/visual_tests/styles/expressionformat.xml
+++ b/tests/visual_tests/styles/expressionformat.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/formatting-1.xml b/tests/visual_tests/styles/formatting-1.xml
index a028bfeb3..15f512abf 100644
--- a/tests/visual_tests/styles/formatting-1.xml
+++ b/tests/visual_tests/styles/formatting-1.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/formatting-2.xml b/tests/visual_tests/styles/formatting-2.xml
index b1acbcc4e..635af6a39 100644
--- a/tests/visual_tests/styles/formatting-2.xml
+++ b/tests/visual_tests/styles/formatting-2.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/formatting-3.xml b/tests/visual_tests/styles/formatting-3.xml
index 9be283038..97a5fb1f2 100644
--- a/tests/visual_tests/styles/formatting-3.xml
+++ b/tests/visual_tests/styles/formatting-3.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/formatting-4.xml b/tests/visual_tests/styles/formatting-4.xml
index ace1ebc26..b09f59a26 100644
--- a/tests/visual_tests/styles/formatting-4.xml
+++ b/tests/visual_tests/styles/formatting-4.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/jalign-auto.xml b/tests/visual_tests/styles/jalign-auto.xml
index 09fdabe71..f59f31cba 100644
--- a/tests/visual_tests/styles/jalign-auto.xml
+++ b/tests/visual_tests/styles/jalign-auto.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/line-offset.xml b/tests/visual_tests/styles/line-offset.xml
index ed738555d..64fe9e797 100644
--- a/tests/visual_tests/styles/line-offset.xml
+++ b/tests/visual_tests/styles/line-offset.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/lines-1.xml b/tests/visual_tests/styles/lines-1.xml
index 5b8fe6a58..dfd534efb 100644
--- a/tests/visual_tests/styles/lines-1.xml
+++ b/tests/visual_tests/styles/lines-1.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/lines-2.xml b/tests/visual_tests/styles/lines-2.xml
index 9b32abb73..2f541ff43 100644
--- a/tests/visual_tests/styles/lines-2.xml
+++ b/tests/visual_tests/styles/lines-2.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/lines-3.xml b/tests/visual_tests/styles/lines-3.xml
index 13f5cc332..9aa10b2fc 100644
--- a/tests/visual_tests/styles/lines-3.xml
+++ b/tests/visual_tests/styles/lines-3.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/lines-shield.xml b/tests/visual_tests/styles/lines-shield.xml
index 4402411a7..f255936d3 100644
--- a/tests/visual_tests/styles/lines-shield.xml
+++ b/tests/visual_tests/styles/lines-shield.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/list.xml b/tests/visual_tests/styles/list.xml
index ce4cf0a1f..61401dd90 100644
--- a/tests/visual_tests/styles/list.xml
+++ b/tests/visual_tests/styles/list.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/marker-on-line-spacing-eq-width-overlap.xml b/tests/visual_tests/styles/marker-on-line-spacing-eq-width-overlap.xml
index 51e0ac59c..af4e087e3 100644
--- a/tests/visual_tests/styles/marker-on-line-spacing-eq-width-overlap.xml
+++ b/tests/visual_tests/styles/marker-on-line-spacing-eq-width-overlap.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>alpha</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
@@ -11,7 +11,7 @@
             </Parameter>
         </Datasource>
     </Layer>
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>beta</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
@@ -21,7 +21,7 @@
             </Parameter>
         </Datasource>
     </Layer>
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>gamma</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
diff --git a/tests/visual_tests/styles/marker-on-line-spacing-eq-width.xml b/tests/visual_tests/styles/marker-on-line-spacing-eq-width.xml
index b6325f2cd..c4ad7d961 100644
--- a/tests/visual_tests/styles/marker-on-line-spacing-eq-width.xml
+++ b/tests/visual_tests/styles/marker-on-line-spacing-eq-width.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>alpha</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
@@ -11,7 +11,7 @@
             </Parameter>
         </Datasource>
     </Layer>
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>beta</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
@@ -21,7 +21,7 @@
             </Parameter>
         </Datasource>
     </Layer>
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>gamma</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
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 db11328c6..cd6f6eece 100644
--- a/tests/visual_tests/styles/marker_line_placement_on_points.xml
+++ b/tests/visual_tests/styles/marker_line_placement_on_points.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Map>
-<Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
 
     <Style name="1">
         <Rule>
@@ -15,7 +15,7 @@
              <MarkersSymbolizer fill="darkred" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="line" marker-type="ellipse"/>
         </Rule>
     </Style>
-    <Layer name="point" srs="+init=epsg:4326">
+    <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>1</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
diff --git a/tests/visual_tests/styles/rtl-point.xml b/tests/visual_tests/styles/rtl-point.xml
index f0e0539db..ac765b488 100644
--- a/tests/visual_tests/styles/rtl-point.xml
+++ b/tests/visual_tests/styles/rtl-point.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-1.xml b/tests/visual_tests/styles/shieldsymbolizer-1.xml
index 4aa4b164b..815f22920 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-1.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-1.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="green" srs="+proj=latlong +datum=WGS84" minimum-version="2.0.0">
+<Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
 
-    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple-E.xml b/tests/visual_tests/styles/simple-E.xml
index 750322cd6..10504cacb 100644
--- a/tests/visual_tests/styles/simple-E.xml
+++ b/tests/visual_tests/styles/simple-E.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple-N.xml b/tests/visual_tests/styles/simple-N.xml
index f6784152a..5511aa537 100644
--- a/tests/visual_tests/styles/simple-N.xml
+++ b/tests/visual_tests/styles/simple-N.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple-NE.xml b/tests/visual_tests/styles/simple-NE.xml
index 4ce95278f..7d1da73fb 100644
--- a/tests/visual_tests/styles/simple-NE.xml
+++ b/tests/visual_tests/styles/simple-NE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple-NW.xml b/tests/visual_tests/styles/simple-NW.xml
index fe12935eb..fe27a7852 100644
--- a/tests/visual_tests/styles/simple-NW.xml
+++ b/tests/visual_tests/styles/simple-NW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple-S.xml b/tests/visual_tests/styles/simple-S.xml
index 5d555a2bc..657e83c86 100644
--- a/tests/visual_tests/styles/simple-S.xml
+++ b/tests/visual_tests/styles/simple-S.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple-SE.xml b/tests/visual_tests/styles/simple-SE.xml
index 53613841a..06d816a04 100644
--- a/tests/visual_tests/styles/simple-SE.xml
+++ b/tests/visual_tests/styles/simple-SE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple-SW.xml b/tests/visual_tests/styles/simple-SW.xml
index 524eedd4a..2821a59a4 100644
--- a/tests/visual_tests/styles/simple-SW.xml
+++ b/tests/visual_tests/styles/simple-SW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple-W.xml b/tests/visual_tests/styles/simple-W.xml
index 6ce3b6055..1fc96d7cf 100644
--- a/tests/visual_tests/styles/simple-W.xml
+++ b/tests/visual_tests/styles/simple-W.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple-shield.xml b/tests/visual_tests/styles/simple-shield.xml
index 820690782..43503a570 100644
--- a/tests/visual_tests/styles/simple-shield.xml
+++ b/tests/visual_tests/styles/simple-shield.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/simple.xml b/tests/visual_tests/styles/simple.xml
index d77b1d2cd..ef03765a0 100644
--- a/tests/visual_tests/styles/simple.xml
+++ b/tests/visual_tests/styles/simple.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
-<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">osm</Parameter>
diff --git a/tests/visual_tests/styles/tiff-opaque-edge-gdal.xml b/tests/visual_tests/styles/tiff-opaque-edge-gdal.xml
index b1c3b3b43..336e9f3d0 100644
--- a/tests/visual_tests/styles/tiff-opaque-edge-gdal.xml
+++ b/tests/visual_tests/styles/tiff-opaque-edge-gdal.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="white">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white">
 
 <Style name="test">
   <Rule>
@@ -6,7 +6,7 @@
   </Rule>
 </Style>
 
-<Layer name="test" srs="+init=epsg:4326">
+<Layer name="test" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>test</StyleName>
     <Datasource>
        <!-- https://github.com/mapnik/mapnik/issues/1508 -->
diff --git a/tests/visual_tests/styles/tiff-opaque-edge-raster.xml b/tests/visual_tests/styles/tiff-opaque-edge-raster.xml
index c7cbac762..580c8d460 100644
--- a/tests/visual_tests/styles/tiff-opaque-edge-raster.xml
+++ b/tests/visual_tests/styles/tiff-opaque-edge-raster.xml
@@ -1,4 +1,4 @@
-<Map srs="+init=epsg:4326" background-color="white">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white">
 
 <Style name="test">
   <Rule>
@@ -6,7 +6,7 @@
   </Rule>
 </Style>
 
-<Layer name="test" srs="+init=epsg:4326">
+<Layer name="test" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>test</StyleName>
     <Datasource>
         <Parameter name="file">../../data/raster/river_wgs.tiff</Parameter>