[fusion-commits] r2762 - in trunk: layers/MapGuide/php lib/Proj4js

[svn_fusion at osgeo.org]

Author: liuar
Date: 2013-08-06 00:37:05 -0700 (Tue, 06 Aug 2013)
New Revision: 2762

Modified:
   trunk/layers/MapGuide/php/CsMap2Proj.php
   trunk/lib/Proj4js/proj4js-combined.js
Log:
Submit on behalf of Andy Zhang. 
#589, Add EPSG:3857 to proj4js.

Modified: trunk/layers/MapGuide/php/CsMap2Proj.php
===================================================================
--- trunk/layers/MapGuide/php/CsMap2Proj.php	2013-08-05 06:10:56 UTC (rev 2761)
+++ trunk/layers/MapGuide/php/CsMap2Proj.php	2013-08-06 07:37:05 UTC (rev 2762)
@@ -77,7 +77,7 @@
 						continue;
 					}
 
-					if ($epsg == 3785 || $epsg == 4269 || $epsg == 4326 || $epsg == 102113 || $epsg == 900913) {
+					if ($epsg == 3785 || $epsg == 4269 || $epsg == 4326 || $epsg == 102113 || $epsg == 900913 || $epsg == 3857) {
 						echo "Skipping $csCode: EPSG code already defined by Proj4js - $epsg\n";
 						continue;
 					}

Modified: trunk/lib/Proj4js/proj4js-combined.js
===================================================================
--- trunk/lib/Proj4js/proj4js-combined.js	2013-08-05 06:10:56 UTC (rev 2761)
+++ trunk/lib/Proj4js/proj4js-combined.js	2013-08-06 07:37:05 UTC (rev 2762)
@@ -1055,6 +1055,7 @@
 Proj4js.defs['GOOGLE'] = Proj4js.defs['EPSG:3875'];
 Proj4js.defs['EPSG:900913'] = Proj4js.defs['EPSG:3875'];
 Proj4js.defs['EPSG:102113'] = Proj4js.defs['EPSG:3875'];
+Proj4js.defs['EPSG:3857'] = Proj4js.defs['EPSG:3875'];
 
 Proj4js.common = {
   PI : 3.141592653589793238, //Math.PI,