[mapguide-commits] r6178 - trunk/MgDev/Server/src/Services/Rendering

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2011-10-19 02:14:43 -0700 (Wed, 19 Oct 2011)
New Revision: 6178

Modified:
   trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
Log:
Fix ticket 1836

This is because changeset 6023 removes the code to set LayerResourceContent. So we have to use other way to get layer definition.


Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2011-10-18 07:00:36 UTC (rev 6177)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2011-10-19 09:14:43 UTC (rev 6178)
@@ -1711,12 +1711,9 @@
     {
         Ptr<MgLayerBase> mapLayer(layers->GetItem(i));
 
-        // the layer resource content should be set during stylization if visible
-        if (mapLayer->GetLayerResourceContent() == L"")
-            continue;
+        Ptr<MgResourceIdentifier> layerid = mapLayer->GetLayerDefinition();
+        ldf.reset(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
 
-        ldf.reset(MgLayerBase::GetLayerDefinition(mapLayer->GetLayerResourceContent()));
-
         WatermarkInstanceCollection* layerWatermarks = ldf->GetWatermarks();
         for (int j=layerWatermarks->GetCount()-1; j>=0; j--)
             tempWatermarkInstances.Adopt(layerWatermarks->OrphanAt(j));