[mapguide-commits] r6621 - in branches/maestro-4.0.x: MaestroAPITests OSGeo.MapGuide.MaestroAPI/Mapping

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-05-08 05:12:49 -0700 (Tue, 08 May 2012)
New Revision: 6621

Modified:
   branches/maestro-4.0.x/MaestroAPITests/HttpConnectionTests.cs
   branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
Log:
#1964: Assign group property for basemap layers

Also update a unit test (to match trunk)

Modified: branches/maestro-4.0.x/MaestroAPITests/HttpConnectionTests.cs
===================================================================
--- branches/maestro-4.0.x/MaestroAPITests/HttpConnectionTests.cs	2012-05-08 11:25:05 UTC (rev 6620)
+++ branches/maestro-4.0.x/MaestroAPITests/HttpConnectionTests.cs	2012-05-08 12:12:49 UTC (rev 6621)
@@ -148,9 +148,12 @@
 
             resSvc.SetResourceXmlData(target, resSvc.GetResourceXmlData(source));
 
-            string dataName = "";
+            string dataName = "UT_HydrographicPolygons.sdf";
             var resDataList = resSvc.EnumerateResourceData(source);
-            dataName = resDataList.ResourceData[0].Name;
+            if (resDataList.ResourceData.Count == 1)
+                dataName = resDataList.ResourceData[0].Name;
+            else
+                resSvc.SetResourceData(source, dataName, ResourceDataType.File, File.OpenRead("TestData/MappingService/UT_HydrographicPolygons.sdf"));
 
             resSvc.SetResourceData(target,
                                    dataName,

Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs	2012-05-08 11:25:05 UTC (rev 6620)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs	2012-05-08 12:12:49 UTC (rev 6621)
@@ -291,6 +291,7 @@
                             var rtl = _mapSvc.CreateMapLayer(this, layer);
                             rtl.Visible = true;
                             rtl.Type = RuntimeMapLayer.kBaseMap;
+                            rtl.Group = group.Name;
                             this.Layers.Add(rtl);
                         }
                     }