[mapguide-commits] r6661 - in trunk/Tools/Maestro: Maestro MgCooker OSGeo.MapGuide.MaestroAPI/Tile

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-05-17 08:31:45 -0700 (Thu, 17 May 2012)
New Revision: 6661

Modified:
   trunk/Tools/Maestro/Maestro/changelog.txt
   trunk/Tools/Maestro/MgCooker/Program.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/BatchSettings.cs
Log:
Fix some MgCooker command line arguments being ignored

Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt	2012-05-17 15:31:21 UTC (rev 6660)
+++ trunk/Tools/Maestro/Maestro/changelog.txt	2012-05-17 15:31:45 UTC (rev 6661)
@@ -1,6 +1,13 @@
-5.0 Beta 1
+5.0 Beta 2
 ----------
+ - MgCooker tiling classes now part of the MaestroAPI
+ - Fix: Some MgCooker command line arguments were being ignored
+ - Fix: Raise signficantly the maximum allowed "Meters per unit" value in MgCooker.
+ - Fix: Dragging and dropping onto a layer in the Map Definition editor will add the layer to that layer's parent group instead of the root
 
+5.0 Beta 1
+----------
+
  - Now requires .net Framework 4.0 / Mono 2.8
  - Uses a patched version of the DockPanelSuite library for display and management of top-level UI content.
  - Uses new mg-desktop release (8 May 2012, .net 4.0, VC10)

Modified: trunk/Tools/Maestro/MgCooker/Program.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Program.cs	2012-05-17 15:31:21 UTC (rev 6660)
+++ trunk/Tools/Maestro/MgCooker/Program.cs	2012-05-17 15:31:45 UTC (rev 6661)
@@ -67,7 +67,7 @@
             //scaleindex=0,1,2,3,4,5
             //basegroups="x","y"
             //extentoverride=minx,miny,maxx,maxy
-
+            
             string mapagent = "http://localhost/mapguide";
             string username = "Anonymous";
             string password = "";
@@ -209,7 +209,7 @@
             }
             
 
-            BatchSettings bx = new BatchSettings(connection, maps);
+            BatchSettings bx = new BatchSettings(connection);
             if (!string.IsNullOrEmpty(scaleindex))
             {
                 List<int> scales = new List<int>();
@@ -249,7 +249,7 @@
 
             if (!string.IsNullOrEmpty(DPI) && int.TryParse(DPI, out x))
                 bx.Config.DPI = x;
-
+            
             double d;
             if (!string.IsNullOrEmpty(metersPerUnit) && double.TryParse(metersPerUnit, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.CurrentCulture, out d))
             {
@@ -263,6 +263,9 @@
             if (opts.ContainsKey("threadcount") && int.TryParse(opts["threadcount"], out x) && x > 0)
                 bx.Config.ThreadCount = x;
 
+            //Now that all global parameters are set, we can now add the map definitions
+            bx.AddMapDefinitions(maps);
+
             if (overrideExtents != null)
                 foreach (BatchMap bm in bx.Maps)
                     bm.MaxExtent = overrideExtents;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/BatchSettings.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/BatchSettings.cs	2012-05-17 15:31:21 UTC (rev 6660)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/BatchSettings.cs	2012-05-17 15:31:45 UTC (rev 6661)
@@ -260,6 +260,11 @@
             m_connection = connection;
             m_maps = new List<BatchMap>();
 
+            AddMapDefinitions(maps);
+        }
+
+        public void AddMapDefinitions(string[] maps)
+        {
             if (maps == null || maps.Length == 0 || (maps.Length == 1 && maps[0].Trim().Length == 0))
             {
                 List<string> tmp = new List<string>();
@@ -467,7 +472,7 @@
             {
                 long rows, cols;
                 double scale = m_mapdefinition.BaseMap.GetScaleAt(i);
-
+                
                 if (m_parent.Config.UseOfficialMethod)
                 {
                     //This is the algorithm proposed by the MapGuide team: