[mapguide-commits] r6795 - in trunk/MgDev: . Common/Stylization Desktop Server/src/Services/Feature Server/src/Services/Mapping Web/src/mapadmin/HelpDocs Web/src/mapviewerjava Web/src/mapviewernet Web/src/mapviewerphp Web/src/viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jun 19 07:57:54 PDT 2012
Author: jng
Date: 2012-06-19 07:57:53 -0700 (Tue, 19 Jun 2012)
New Revision: 6795
Modified:
trunk/MgDev/
trunk/MgDev/Common/Stylization/SE_Renderer.cpp
trunk/MgDev/Desktop/
trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
trunk/MgDev/Web/src/mapadmin/HelpDocs/
trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp
trunk/MgDev/Web/src/mapviewernet/mapframe.aspx
trunk/MgDev/Web/src/mapviewerphp/mapframe.php
trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
trunk/MgDev/Web/src/viewerfiles/
trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
trunk/MgDev/Web/src/viewerfiles/quickplot.js
Log:
Merge in 2.4 branch fixes for #1043 and #1263
Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789
/sandbox/rfc94:5099-5163
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/rfc94:5099-5163
Property changes on: trunk/MgDev/Common/Stylization/SE_Renderer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp:6749-6756,6777-6783,6785-6787,6789
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326
+ /branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp:6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326
Property changes on: trunk/MgDev/Desktop
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Desktop:6612-6613,6615-6616,6749-6756,6777-6783,6785-6787,6789
/sandbox/rfc94/Desktop:5099-5163
+ /branches/2.4/MgDev/Desktop:6612-6613,6615-6616,6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/rfc94/Desktop:5099-5163
Property changes on: trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6738-6741,6749-6756,6777-6783,6785-6787,6789
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326
+ /branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6738-6741,6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326
Property changes on: trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6738-6741,6749-6756,6777-6783,6785-6787,6789
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326
+ /branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6738-6741,6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326
Property changes on: trunk/MgDev/Web/src/mapadmin/HelpDocs
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs:6738-6741,6749-6756,6777-6783,6785-6787,6789
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
+ /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs:6738-6741,6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
Property changes on: trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6738-6741,6749-6756,6777-6783,6785-6787,6789
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326
+ /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6738-6741,6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326
Modified: trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp 2012-06-19 11:41:51 UTC (rev 6794)
+++ trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp 2012-06-19 14:57:53 UTC (rev 6795)
@@ -146,7 +146,7 @@
int i = 0;
while(iter.hasNext())
{
- scaleCreationCode = scaleCreationCode + "scales[" + i + "]=" + iter.next() + "; ";
+ scaleCreationCode = scaleCreationCode + "scales[" + i + "]=" + iter.next().toString().replace(',','.') + "; ";
i++;
}
MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
Modified: trunk/MgDev/Web/src/mapviewernet/mapframe.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/mapframe.aspx 2012-06-19 11:41:51 UTC (rev 6794)
+++ trunk/MgDev/Web/src/mapviewernet/mapframe.aspx 2012-06-19 14:57:53 UTC (rev 6795)
@@ -149,7 +149,7 @@
scales.Sort();
for(int i = 0; i < scales.Count; i++)
{
- scaleCreationCode = scaleCreationCode + "scales[" + i + "]=" + scales[i] + "; ";
+ scaleCreationCode = scaleCreationCode + "scales[" + i + "]=" + scales[i].ToString().Replace(',','.') + "; ";
}
MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
map.Save(resourceSrvc, mapStateId);
Modified: trunk/MgDev/Web/src/mapviewerphp/mapframe.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/mapframe.php 2012-06-19 11:41:51 UTC (rev 6794)
+++ trunk/MgDev/Web/src/mapviewerphp/mapframe.php 2012-06-19 14:57:53 UTC (rev 6795)
@@ -118,7 +118,7 @@
$scales[$i] = $map->GetFiniteDisplayScaleAt($i);
sort($scales);
for($i = 0; $i < count($scales); $i ++)
- $scaleCreationCode = $scaleCreationCode . "scales[" . $i . "]=" . $scales[$i] . "; ";
+ $scaleCreationCode = $scaleCreationCode . "scales[" . $i . "]=" . str_replace(",", ".", $scales[$i]) . "; ";
$mapStateId = new MgResourceIdentifier("Session:" . $sessionId . "//" . $mapName . "." . MgResourceType::Map);
$map->Save($resourceSrvc, $mapStateId);
Property changes on: trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6738-6741,6749-6756,6777-6783,6785-6787,6789
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
+ /branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6738-6741,6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
Property changes on: trunk/MgDev/Web/src/viewerfiles
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/viewerfiles:6738-6741,6749-6756,6777-6783,6785-6787,6789
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
+ /branches/2.4/MgDev/Web/src/viewerfiles:6738-6741,6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
Modified: trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2012-06-19 11:41:51 UTC (rev 6794)
+++ trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2012-06-19 14:57:53 UTC (rev 6795)
@@ -3596,7 +3596,7 @@
for(var i=0; i < GRIDCY; i ++) {
tileCode += '<tr height=' + TILECY + 'px>';
for(var j=0; j < GRIDCX; j ++)
- tileCode += '<td style="height: ' + TILECY + 'px;' + 'background-color: transparent;padding-top: 0px; padding-left: 0px; padding-bottom: 0px; padding-right: 0px;" id="' + k + ':' + j + ':' + i + '" width=' + TILECX + 'px loaded="0"><div style="width: ' + TILECX + 'px; height: ' + TILECY + 'px;"></td>';
+ tileCode += '<td style="height: ' + TILECY + 'px;' + 'background-color: transparent;padding-top: 0px; padding-left: 0px; padding-bottom: 0px; padding-right: 0px;" id="' + k + ':' + j + ':' + i + '" width=' + TILECX + 'px ><div style="width: ' + TILECX + 'px; height: ' + TILECY + 'px;"></td>';
tileCode += '</tr>\n';
}
tileCode += '</tbody></table>\n';
@@ -3634,9 +3634,6 @@
if((cell = FindCell(k, cellSpec)) == null)
return 0;
}
- if(cell.loaded == "1")
- return 0;
- cell.loaded = "1";
url = webAgent + "?OPERATION=GETTILEIMAGE&VERSION=1.2.0&SESSION=" + sessionId + "&MAPDEFINITION=" + encodeComponent(mapDefinitionName) + "&BASEMAPLAYERGROUPNAME=" + encodeComponent(baseGroups[k]) + "&TILECOL=" + tilex + "&TILEROW=" + tiley + "&SCALEINDEX=" + sci + "&CLIENTAGENT=" + encodeComponent(clientAgent);
// Defect in the way Chrome 4.0 caches images.
Property changes on: trunk/MgDev/Web/src/viewerfiles/quickplot.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js:6738-6741,6749-6756,6777-6783,6785-6787,6789
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326
+ /branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js:6738-6741,6749-6756,6777-6783,6785-6787,6789,6791-6794
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326
More information about the mapguide-commits
mailing list