[mapguide-commits] r5498 - in sandbox/adsk/2.3r:
Server/src/Services/Kml Server/src/Services/Mapping
Web/src/HttpHandler
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Jan 17 22:10:17 EST 2011
Author: liuar
Date: 2011-01-17 19:10:17 -0800 (Mon, 17 Jan 2011)
New Revision: 5498
Modified:
sandbox/adsk/2.3r/Server/src/Services/Kml/ServerKmlService.cpp
sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.cpp
sandbox/adsk/2.3r/Web/src/HttpHandler/WmsMapUtil.cpp
Log:
Port the fix of ticket #1586 (Incorrect LL84 wkt string existed in MapGuide code) to adsk branch.
Modified: sandbox/adsk/2.3r/Server/src/Services/Kml/ServerKmlService.cpp
===================================================================
--- sandbox/adsk/2.3r/Server/src/Services/Kml/ServerKmlService.cpp 2011-01-18 03:10:13 UTC (rev 5497)
+++ sandbox/adsk/2.3r/Server/src/Services/Kml/ServerKmlService.cpp 2011-01-18 03:10:17 UTC (rev 5498)
@@ -32,7 +32,7 @@
//Zip support from DWF toolkit
#include "dwfcore/ZipFileDescriptor.h"
-const STRING LL84_WKT = L"GEOGCS[\"LL84\",DATUM[\"WGS 84\",SPHEROID[\"WGS 84\",6378137,298.25722293287],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
+const STRING LL84_WKT = L"GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137,298.25722293287],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
const STRING GOOGLE_EARTH_WKT = LL84_WKT;
IMPLEMENT_CREATE_SERVICE(MgServerKmlService)
Modified: sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.cpp 2011-01-18 03:10:13 UTC (rev 5497)
+++ sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.cpp 2011-01-18 03:10:17 UTC (rev 5498)
@@ -45,7 +45,7 @@
//for use by observation mesh transformation
-const STRING SRS_LL84 = L"GEOGCS[\"LL84\",DATUM[\"WGS 84\",SPHEROID[\"WGS 84\",6378137,298.25722293287],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
+const STRING SRS_LL84 = L"GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137,298.25722293287],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
IMPLEMENT_CREATE_SERVICE(MgServerMappingService)
Modified: sandbox/adsk/2.3r/Web/src/HttpHandler/WmsMapUtil.cpp
===================================================================
--- sandbox/adsk/2.3r/Web/src/HttpHandler/WmsMapUtil.cpp 2011-01-18 03:10:13 UTC (rev 5497)
+++ sandbox/adsk/2.3r/Web/src/HttpHandler/WmsMapUtil.cpp 2011-01-18 03:10:17 UTC (rev 5498)
@@ -31,8 +31,8 @@
//Declare mappings between supported SRS strings and their WKT equivalents
//WGS84
- srsMappings[L"CRS:84"] = L"GEOGCS[\"LL84\",DATUM[\"WGS 84\",SPHEROID[\"WGS 84\",6378137,0],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
- srsMappings[L"EPSG:4326"] = L"GEOGCS[\"LL84\",DATUM[\"WGS 84\",SPHEROID[\"WGS 84\",6378137,0],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
+ srsMappings[L"CRS:84"] = L"GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137,0],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
+ srsMappings[L"EPSG:4326"] = L"GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137,0],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
//NAD83
srsMappings[L"CRS:83"] = L"GEOGCS[\"LL83\",DATUM[\"NAD 83\",SPHEROID[\"GRS 80\",6378137,298.25722210089],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
More information about the mapguide-commits
mailing list