From 714ecf803df89deb69701b3fd0f46d4298515c5b Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 25 Jan 2013 01:04:51 -0800
Subject: [PATCH] tests: more fixes to make epsg:4326 proj4 string consistent

---
 tests/data/good_maps/merc2wgs84_reprojection.xml  | 2 +-
 tests/data/good_maps/style_level_comp_op.xml      | 2 +-
 tests/data/good_maps/style_level_image_filter.xml | 2 +-
 tests/data/good_maps/wgs842merc_reprojection.xml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/data/good_maps/merc2wgs84_reprojection.xml b/tests/data/good_maps/merc2wgs84_reprojection.xml
index df53e6e28..00c9ff16a 100644
--- a/tests/data/good_maps/merc2wgs84_reprojection.xml
+++ b/tests/data/good_maps/merc2wgs84_reprojection.xml
@@ -1,4 +1,4 @@
-<Map srs="+proj=lonlat +ellps=WGS84 +datum=WGS84 +no_defs +over" background-color="lightsteelblue">
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="lightsteelblue">
   <Style name="My Style">
     <Rule>
       <PolygonSymbolizer fill="#f2eff9"/><LineSymbolizer stroke="rgb(50%,50%,50%)" stroke-width="0.1"/>
diff --git a/tests/data/good_maps/style_level_comp_op.xml b/tests/data/good_maps/style_level_comp_op.xml
index 0e9860b95..fa4a0fe87 100644
--- a/tests/data/good_maps/style_level_comp_op.xml
+++ b/tests/data/good_maps/style_level_comp_op.xml
@@ -1,4 +1,4 @@
-<Map srs="+proj=lonlat +ellps=WGS84 +datum=WGS84 +no_defs +over"
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"
      background-color="lightsteelblue">
 
   <Style name="land">
diff --git a/tests/data/good_maps/style_level_image_filter.xml b/tests/data/good_maps/style_level_image_filter.xml
index d45427c19..32d58876f 100644
--- a/tests/data/good_maps/style_level_image_filter.xml
+++ b/tests/data/good_maps/style_level_image_filter.xml
@@ -1,4 +1,4 @@
-<Map srs="+proj=lonlat +ellps=WGS84 +datum=WGS84 +no_defs +over"
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"
      background-color="lightsteelblue">
 
   <Style name="land">
diff --git a/tests/data/good_maps/wgs842merc_reprojection.xml b/tests/data/good_maps/wgs842merc_reprojection.xml
index a18b65f29..f841e4904 100644
--- a/tests/data/good_maps/wgs842merc_reprojection.xml
+++ b/tests/data/good_maps/wgs842merc_reprojection.xml
@@ -4,7 +4,7 @@
       <PolygonSymbolizer fill="#f2eff9"/><LineSymbolizer stroke="rgb(50%,50%,50%)" stroke-width="0.1"/></Rule>
   </Style>
 
-  <Layer name="world" srs="+proj=lonlat +ellps=WGS84 +datum=WGS84 +no_defs +over">
+  <Layer name="world" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>