From f5fee15c91a00bec12288999fa59ec793f4a0e76 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 12 May 2011 11:33:58 -0700
Subject: [PATCH] add +wktext to all spherical mercator proj4 strings

---
 README.md                                       | 2 +-
 lib/carto/renderer.js                           | 4 +---
 test/benchmark/opened.mml                       | 4 ++--
 test/benchmark/opened.result                    | 4 ++--
 test/errorhandling/invalid_property.mml         | 4 ++--
 test/errorhandling/invalid_value.mml            | 4 ++--
 test/errorhandling/undefined_variable.mml       | 4 ++--
 test/rendering/afghanistan_votes.mml            | 4 ++--
 test/rendering/afghanistan_votes.result         | 4 ++--
 test/rendering/background_attributes.mml        | 4 ++--
 test/rendering/background_attributes.result     | 4 ++--
 test/rendering/color_variable.mml               | 4 ++--
 test/rendering/color_variable.result            | 4 ++--
 test/rendering/complex_cascades.mml             | 6 +++---
 test/rendering/complex_cascades.result          | 6 +++---
 test/rendering/complexfontset.mml               | 6 +++---
 test/rendering/complexfontset.result            | 6 +++---
 test/rendering/cross_stylesheet_variable.mml    | 4 ++--
 test/rendering/cross_stylesheet_variable.result | 4 ++--
 test/rendering/external_image.mml               | 4 ++--
 test/rendering/external_image.result            | 4 ++--
 test/rendering/filters.mml                      | 4 ++--
 test/rendering/filters.result                   | 4 ++--
 test/rendering/partial_overrides.mml            | 4 ++--
 test/rendering/partial_overrides.result         | 4 ++--
 test/rendering/raster.mml                       | 4 ++--
 test/rendering/raster.result                    | 4 ++--
 test/rendering/simplefontset.mml                | 4 ++--
 test/rendering/simplefontset.result             | 4 ++--
 test/rendering/simplevariabletest.mml           | 4 ++--
 test/rendering/simplevariabletest.result        | 4 ++--
 test/rendering/symbolizer_order.mml             | 4 ++--
 test/rendering/symbolizer_order.result          | 4 ++--
 test/rendering/text_property_overrides.mml      | 4 ++--
 test/rendering/text_property_overrides.result   | 4 ++--
 test/rendering/weird_comments.mml               | 4 ++--
 test/rendering/weird_comments.result            | 4 ++--
 test/rendering/zoomlevels.mml                   | 6 +++---
 38 files changed, 79 insertions(+), 81 deletions(-)

diff --git a/README.md b/README.md
index c4b47f9..28b5c1a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ _incompatibility_
 carto.js MML:
 
     {
-        "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",
+        "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 +wktext +no_defs +over",
         "Stylesheet": [{"id":"style.mss","data":"Map {\n  background-color: #fff;\n}\n\n#world {\n  line-color: #ccc;\n  line-width: 0.5;\n  polygon-fill: #eee;\n}"}],
         "Layer": [{
             "id": "world",
diff --git a/lib/carto/renderer.js b/lib/carto/renderer.js
index ad6cd1b..9e36778 100644
--- a/lib/carto/renderer.js
+++ b/lib/carto/renderer.js
@@ -409,9 +409,7 @@ carto.Renderer = function Renderer(env) {
 
 
                     if (!map_properties.srs) {
-                        map_properties.srs = '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"';
+                        map_properties.srs = '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 +wktext +no_defs +over"';
                     }
 
                     // The only_validate flag can be set to prevent
diff --git a/test/benchmark/opened.mml b/test/benchmark/opened.mml
index fc46e7d..b9fa3f5 100644
--- a/test/benchmark/opened.mml
+++ b/test/benchmark/opened.mml
@@ -1,12 +1,12 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "opened.mss"
     ],
     "Layer": [{
         "id": "data",
         "name": "data",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://client-data.s3.amazonaws.com/ndi-afghanistan/district_boundaries.zip",
             "type": "shape"
diff --git a/test/benchmark/opened.result b/test/benchmark/opened.result
index 81fddd5..a0676bd 100644
--- a/test/benchmark/opened.result
+++ b/test/benchmark/opened.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="data-polygon" filter-mode="first">
@@ -2003,7 +2003,7 @@
 <Layer
    id="data"
    name="data"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>data-polygon</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/errorhandling/invalid_property.mml b/test/errorhandling/invalid_property.mml
index 1920134..f1c3bd0 100644
--- a/test/errorhandling/invalid_property.mml
+++ b/test/errorhandling/invalid_property.mml
@@ -1,12 +1,12 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "invalid_property.mss"
     ],
     "Layer": [{
         "id": "world",
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/errorhandling/invalid_value.mml b/test/errorhandling/invalid_value.mml
index bb80111..cfdb640 100644
--- a/test/errorhandling/invalid_value.mml
+++ b/test/errorhandling/invalid_value.mml
@@ -1,12 +1,12 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "invalid_value.mss"
     ],
     "Layer": [{
         "id": "world",
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/errorhandling/undefined_variable.mml b/test/errorhandling/undefined_variable.mml
index 024e52a..5b0d40a 100644
--- a/test/errorhandling/undefined_variable.mml
+++ b/test/errorhandling/undefined_variable.mml
@@ -1,12 +1,12 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "undefined_variable.mss"
     ],
     "Layer": [{
         "id": "world",
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/afghanistan_votes.mml b/test/rendering/afghanistan_votes.mml
index 577cbf8..1a4bc06 100644
--- a/test/rendering/afghanistan_votes.mml
+++ b/test/rendering/afghanistan_votes.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "afghanistan_votes.mss"
     ],
     "Layer": [{
         "name": "data",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/district.geojson",
             "type": "ogr",
diff --git a/test/rendering/afghanistan_votes.result b/test/rendering/afghanistan_votes.result
index 88991a9..fffce62 100644
--- a/test/rendering/afghanistan_votes.result
+++ b/test/rendering/afghanistan_votes.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="data" filter-mode="first">
@@ -161,7 +161,7 @@
 </Style>
 <Layer
    name="data"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>data</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/background_attributes.mml b/test/rendering/background_attributes.mml
index 2543214..de04175 100644
--- a/test/rendering/background_attributes.mml
+++ b/test/rendering/background_attributes.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "background_attributes.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/background_attributes.result b/test/rendering/background_attributes.result
index c958a0e..2f1301a 100644
--- a/test/rendering/background_attributes.result
+++ b/test/rendering/background_attributes.result
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
-<Map background-color="#ffffff" 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">
+<Map background-color="#ffffff" 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 +wktext +no_defs +over">
 
 
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/color_variable.mml b/test/rendering/color_variable.mml
index 1fa4c5a..c9fe39a 100644
--- a/test/rendering/color_variable.mml
+++ b/test/rendering/color_variable.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "color_variable.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/color_variable.result b/test/rendering/color_variable.result
index 55c3559..42174a8 100644
--- a/test/rendering/color_variable.result
+++ b/test/rendering/color_variable.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="world" filter-mode="first">
@@ -10,7 +10,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/complex_cascades.mml b/test/rendering/complex_cascades.mml
index b212735..d9b326d 100644
--- a/test/rendering/complex_cascades.mml
+++ b/test/rendering/complex_cascades.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "complex_cascades.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
@@ -14,7 +14,7 @@
     {
         "class": "new",
         "name": "countries",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/complex_cascades.result b/test/rendering/complex_cascades.result
index 018778d..d2c58d1 100644
--- a/test/rendering/complex_cascades.result
+++ b/test/rendering/complex_cascades.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 <Style name="world" filter-mode="first">
   <Rule>
@@ -27,7 +27,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
@@ -62,7 +62,7 @@
 
 <Layer
    name="countries"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>countries</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/complexfontset.mml b/test/rendering/complexfontset.mml
index 0ac4c12..d4e9203 100644
--- a/test/rendering/complexfontset.mml
+++ b/test/rendering/complexfontset.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "complexfontset.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
@@ -14,7 +14,7 @@
     {
         "class": "new",
         "name": "countries",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/complexfontset.result b/test/rendering/complexfontset.result
index 6e2fcd9..6bb01fb 100644
--- a/test/rendering/complexfontset.result
+++ b/test/rendering/complexfontset.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 <FontSet name="fontset-0">
   <Font face-name="Georgia Regular"/>
@@ -13,7 +13,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
@@ -28,7 +28,7 @@
 </Style>
 <Layer
    name="countries"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>countries</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/cross_stylesheet_variable.mml b/test/rendering/cross_stylesheet_variable.mml
index 3e7547a..945b24c 100644
--- a/test/rendering/cross_stylesheet_variable.mml
+++ b/test/rendering/cross_stylesheet_variable.mml
@@ -1,12 +1,12 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "cross_stylesheet_variable_a.mss",
         "cross_stylesheet_variable_b.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/cross_stylesheet_variable.result b/test/rendering/cross_stylesheet_variable.result
index ce063e5..0368ab4 100644
--- a/test/rendering/cross_stylesheet_variable.result
+++ b/test/rendering/cross_stylesheet_variable.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="world" filter-mode="first">
@@ -10,7 +10,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/external_image.mml b/test/rendering/external_image.mml
index fc43ad2..324131b 100644
--- a/test/rendering/external_image.mml
+++ b/test/rendering/external_image.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "external_image.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/external_image.result b/test/rendering/external_image.result
index d369bce..64ebf24 100644
--- a/test/rendering/external_image.result
+++ b/test/rendering/external_image.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="world" filter-mode="first">
@@ -10,7 +10,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/filters.mml b/test/rendering/filters.mml
index c7a6e07..118bdde 100644
--- a/test/rendering/filters.mml
+++ b/test/rendering/filters.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "filters.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/filters.result b/test/rendering/filters.result
index cdf82de..b8376b9 100644
--- a/test/rendering/filters.result
+++ b/test/rendering/filters.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="world" filter-mode="first">
@@ -13,7 +13,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/partial_overrides.mml b/test/rendering/partial_overrides.mml
index 962e9ed..0a1b4d6 100644
--- a/test/rendering/partial_overrides.mml
+++ b/test/rendering/partial_overrides.mml
@@ -1,12 +1,12 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "partial_overrides.mss"
     ],
     "Layer": [{
         "name": "world",
         "class": "m_0 m_1 m_2 m_3 m_4 m_5 m_6 m_7 m_8 m_9",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/partial_overrides.result b/test/rendering/partial_overrides.result
index a8193d8..bd1da57 100644
--- a/test/rendering/partial_overrides.result
+++ b/test/rendering/partial_overrides.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="world" filter-mode="first">
@@ -112,7 +112,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/raster.mml b/test/rendering/raster.mml
index c32fec9..b500924 100644
--- a/test/rendering/raster.mml
+++ b/test/rendering/raster.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "raster.mss"
     ],
     "Layer": [{
         "name": "data",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/nasa_raster/lasvegas_tm5_12jan09_crop_geo_merc.tif",
             "type": "gdal"
diff --git a/test/rendering/raster.result b/test/rendering/raster.result
index b0cf4d2..9125b5f 100644
--- a/test/rendering/raster.result
+++ b/test/rendering/raster.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="data" filter-mode="first">
@@ -10,7 +10,7 @@
 </Style>
 <Layer
    name="data"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>data</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/simplefontset.mml b/test/rendering/simplefontset.mml
index 9489dac..ac49cd9 100644
--- a/test/rendering/simplefontset.mml
+++ b/test/rendering/simplefontset.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "simplefontset.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/simplefontset.result b/test/rendering/simplefontset.result
index 6fa8a08..25e8f76 100644
--- a/test/rendering/simplefontset.result
+++ b/test/rendering/simplefontset.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 <FontSet name="fontset-0">
   <Font face-name="Georgia Regular"/>
@@ -13,7 +13,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/simplevariabletest.mml b/test/rendering/simplevariabletest.mml
index 7d29406..014547c 100644
--- a/test/rendering/simplevariabletest.mml
+++ b/test/rendering/simplevariabletest.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "simplevariabletest.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/simplevariabletest.result b/test/rendering/simplevariabletest.result
index 2b537a7..644131e 100644
--- a/test/rendering/simplevariabletest.result
+++ b/test/rendering/simplevariabletest.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="world" filter-mode="first">
@@ -10,7 +10,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/symbolizer_order.mml b/test/rendering/symbolizer_order.mml
index bc358fc..9cb0982 100644
--- a/test/rendering/symbolizer_order.mml
+++ b/test/rendering/symbolizer_order.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "symbolizer_order.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/symbolizer_order.result b/test/rendering/symbolizer_order.result
index 14463ce..e3f3bb5 100644
--- a/test/rendering/symbolizer_order.result
+++ b/test/rendering/symbolizer_order.result
@@ -1,6 +1,6 @@
 <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="world" filter-mode="first">
@@ -11,7 +11,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/text_property_overrides.mml b/test/rendering/text_property_overrides.mml
index f35669b..6823ee0 100644
--- a/test/rendering/text_property_overrides.mml
+++ b/test/rendering/text_property_overrides.mml
@@ -1,12 +1,12 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "text_property_overrides.mss"
     ],
     "Layer": [{
         "name": "world",
         "class": "m_0 m_1 m_2 m_3 m_4 m_5 m_6 m_7 m_8 m_9",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/text_property_overrides.result b/test/rendering/text_property_overrides.result
index 5ad981e..6a8594f 100644
--- a/test/rendering/text_property_overrides.result
+++ b/test/rendering/text_property_overrides.result
@@ -1,6 +1,6 @@
   <?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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="world" filter-mode="first">
@@ -26,7 +26,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/weird_comments.mml b/test/rendering/weird_comments.mml
index bd9ca98..7234634 100644
--- a/test/rendering/weird_comments.mml
+++ b/test/rendering/weird_comments.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "weird_comments.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
diff --git a/test/rendering/weird_comments.result b/test/rendering/weird_comments.result
index ace2a4c..db8c363 100644
--- a/test/rendering/weird_comments.result
+++ b/test/rendering/weird_comments.result
@@ -1,5 +1,5 @@
 <!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 +k=1.0 +units=m +nadgrids=@null +no_defs +over">
+<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 +wktext +no_defs +over">
 
 
 <Style name="world" filter-mode="first">
@@ -9,7 +9,7 @@
 </Style>
 <Layer
    name="world"
-   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">
+   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 +wktext +no_defs +over">
     <StyleName>world</StyleName>
     <Datasource>
        <Parameter name="file">[absolute path]</Parameter>
diff --git a/test/rendering/zoomlevels.mml b/test/rendering/zoomlevels.mml
index a99179b..31bbf54 100644
--- a/test/rendering/zoomlevels.mml
+++ b/test/rendering/zoomlevels.mml
@@ -1,11 +1,11 @@
 {
-    "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",
+    "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 +wktext +no_defs +over",
     "Stylesheet": [
         "zoomlevels.mss"
     ],
     "Layer": [{
         "name": "world",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"
@@ -13,7 +13,7 @@
     },
     {
         "name": "countries",
-        "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",
+        "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 +wktext +no_defs +over",
         "Datasource": {
             "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
             "type": "shape"