From be3cfd5159c22274cd299cf782ca3fbebf51011f Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 28 Jan 2013 14:03:32 -0500
Subject: [PATCH] fix more mercator proj4 strings

---
 tests/data/good_maps/wgs842merc_reprojection.xml | 2 +-
 tests/python_tests/render_test.py                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/data/good_maps/wgs842merc_reprojection.xml b/tests/data/good_maps/wgs842merc_reprojection.xml
index f841e4904..50075d9f4 100644
--- a/tests/data/good_maps/wgs842merc_reprojection.xml
+++ b/tests/data/good_maps/wgs842merc_reprojection.xml
@@ -1,4 +1,4 @@
-<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over" background-color="lightsteelblue">
+<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="lightsteelblue">
   <Style name="My Style">
     <Rule>
       <PolygonSymbolizer fill="#f2eff9"/><LineSymbolizer stroke="rgb(50%,50%,50%)" stroke-width="0.1"/></Rule>
diff --git a/tests/python_tests/render_test.py b/tests/python_tests/render_test.py
index f29e3213b..9a74e6804 100644
--- a/tests/python_tests/render_test.py
+++ b/tests/python_tests/render_test.py
@@ -130,7 +130,7 @@ def test_render_points():
     projs = { 
         'latlon': '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs',
         'merc': '+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs',
-        'google': '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over',
+        'google': '+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',
         'utm': '+proj=utm +zone=54 +datum=WGS84'
         }
     for projdescr in projs.iterkeys():