aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2007-09-28 23:04:05 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2007-09-28 23:04:05 +0000
commitf14b424fd69930e181f8db5ff853fc0bd06af4b4 (patch)
treeea138464922289e9fa62cfa8eba56d43a0de533a
parent22c31eb8c350a7586a7a69d22441e014bd76861c (diff)
downloadPROJ-f14b424fd69930e181f8db5ff853fc0bd06af4b4.tar.gz
PROJ-f14b424fd69930e181f8db5ff853fc0bd06af4b4.zip
added 900913 google mercator code
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1405 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rw-r--r--ChangeLog4
-rw-r--r--nad/esri.extra4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c9e9974f..73c70727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-28 Frank Warmerdam <warmerdam@pobox.com>
+
+ * nad/esri.extra: Add "900913" code for google mercator.
+
2007-09-11 Frank Warmerdam <warmerdam@pobox.com>
* src/gencent.c/h, src/pj_transform.c: Restructure so geocentric code
diff --git a/nad/esri.extra b/nad/esri.extra
index 611dd660..2514b33c 100644
--- a/nad/esri.extra
+++ b/nad/esri.extra
@@ -946,3 +946,7 @@
<104304> +proj=longlat +a=6378249.2 +b=6356514.999904194 no_defs <>
# GCS Voirol Unifie 1960 Degree
<104305> +proj=longlat +ellps=clrk80 no_defs <>
+#
+# Chris' funny epsgish code for the google mercator
+#
+<900913> +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 <>