[mapguide-commits] r1216 - in trunk/MgDev/Web/src: HttpHandler viewerfiles

[svn_mapguide at osgeo.org]

Author: brucedechant
Date: 2007-03-13 18:40:48 -0400 (Tue, 13 Mar 2007)
New Revision: 1216

Modified:
   trunk/MgDev/Web/src/HttpHandler/HttpGetTileImage.cpp
   trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
Log:
Update GetTileImage API version from 2.0.0 to 1.2.0.

Modified: trunk/MgDev/Web/src/HttpHandler/HttpGetTileImage.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpGetTileImage.cpp	2007-03-13 22:07:08 UTC (rev 1215)
+++ trunk/MgDev/Web/src/HttpHandler/HttpGetTileImage.cpp	2007-03-13 22:40:48 UTC (rev 1216)
@@ -36,22 +36,10 @@
 
     Ptr<MgHttpRequestParam> params = hRequest->GetRequestParam();
 
-    STRING version = params->GetParameterValue(MgHttpResourceStrings::reqVersion);
+    m_version = params->GetParameterValue(MgHttpResourceStrings::reqVersion);
 
-    size_t pos1;
-
-    pos1 = version.find(L".");
-    if (pos1 != string::npos)
+    if (m_version == L"1.0.0")
     {
-        m_version = version.substr(0, pos1);
-    }
-    else
-    {
-        m_version = version;
-    }
-
-    if (m_version == L"1")
-    {
         // Get the map name
         m_mapName = params->GetParameterValue(MgHttpResourceStrings::reqRenderingMapName);
 
@@ -64,7 +52,7 @@
         // Get the tile row index and convert to integer
         m_tileRow = MgUtil::StringToInt32(params->GetParameterValue(MgHttpResourceStrings::reqRenderingTileRow));
     }
-    else if (m_version == L"2")
+    else if (m_version == L"1.2.0")
     {
         // Get the map name
         m_mapName = params->GetParameterValue(MgHttpResourceStrings::reqTileMapDefinition);
@@ -114,7 +102,7 @@
             __LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
     }
 
-    if (m_version == L"1")
+    if (m_version == L"1.0.0")
     {
         // Get Proxy Resource Service instance
         Ptr<MgResourceService> resourceService = (MgResourceService*)CreateService(MgServiceType::ResourceService);
@@ -132,7 +120,7 @@
         // Set the result
         hResult->SetResultObject(tileImage, tileImage->GetMimeType());
     }
-    else
+    else if (m_version == L"1.2.0")
     {
         Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(m_mapName);
 

Modified: trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ	2007-03-13 22:07:08 UTC (rev 1215)
+++ trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ	2007-03-13 22:40:48 UTC (rev 1216)
@@ -3074,7 +3074,7 @@
         if(cell.loaded == "1")
             return 0;
         cell.loaded = "1";
-        url = webAgent + "?OPERATION=GETTILEIMAGE&VERSION=2.0.0&SESSION=" + sessionId + "&MAPDEFINITION=" + encodeComponent(mapDefinitionName) + "&BASEMAPLAYERGROUPNAME=" + encodeComponent(baseGroups[k]) + "&TILECOL=" + tilex + "&TILEROW=" + tiley + "&SCALEINDEX=" + sci;
+        url = webAgent + "?OPERATION=GETTILEIMAGE&VERSION=1.2.0&SESSION=" + sessionId + "&MAPDEFINITION=" + encodeComponent(mapDefinitionName) + "&BASEMAPLAYERGROUPNAME=" + encodeComponent(baseGroups[k]) + "&TILECOL=" + tilex + "&TILEROW=" + tiley + "&SCALEINDEX=" + sci;
         tag = '<img id="' + (imgId) + '" width=' + TILECX + ' height=' + TILECY + ' border=0 vspace=0 hspace=0 src="' + url + '" style="visibility: hidden; width: 300px; height: 300px;" onload="OnTileLoaded(\'' + imgId + '\')">';
         imgId ++;
         cell.innerHTML = tag;