[mapguide-commits] r7509 - in trunk/Tools/Maestro: Maestro MgCooker

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-05-20 05:26:02 -0700 (Mon, 20 May 2013)
New Revision: 7509

Modified:
   trunk/Tools/Maestro/Maestro/changelog.txt
   trunk/Tools/Maestro/MgCooker/Program.cs
Log:
#2207: Whatever custom scale indexes we set, it's being reset by the AddMapDefinitions() call after it. This submission reverses the order so that custom scale indexes are set *after* the call to AddMapDefinitions()

Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt	2013-05-20 12:24:43 UTC (rev 7508)
+++ trunk/Tools/Maestro/Maestro/changelog.txt	2013-05-20 12:26:02 UTC (rev 7509)
@@ -10,6 +10,7 @@
     - Indicate which widgets are dockable
 	- Filter out un-dockable widgets when prompting the user for the widget to attach to a toolbar/container
  - Support for new Resampling Method paramter in GDAL Feature Source editor
+ - Fix: Custom scale indexes passed in from command-line ignored by MgCooker
  - Fix: Dependency list compilation failure on Flexible Layout documents
  - Fix: OutOfMemoryException on HTTP SETRESOURCEDATA calls involving really large files
  - Fix: Exceptions during resource preview generation not being shown

Modified: trunk/Tools/Maestro/MgCooker/Program.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Program.cs	2013-05-20 12:24:43 UTC (rev 7508)
+++ trunk/Tools/Maestro/MgCooker/Program.cs	2013-05-20 12:26:02 UTC (rev 7509)
@@ -225,16 +225,6 @@
             
 
             BatchSettings bx = new BatchSettings(connection);
-            if (!string.IsNullOrEmpty(scaleindex))
-            {
-                List<int> scales = new List<int>();
-                int tmp;
-                foreach (string s in scaleindex.Split(','))
-                    if (int.TryParse(s, out tmp))
-                        scales.Add(tmp);
-                bx.SetScales(scales.ToArray());
-            }
-
             if (!string.IsNullOrEmpty(basegroups))
             {
                 List<string> groups = new List<string>();
@@ -281,6 +271,16 @@
             //Now that all global parameters are set, we can now add the map definitions
             bx.AddMapDefinitions(maps);
 
+            if (!string.IsNullOrEmpty(scaleindex))
+            {
+                List<int> scales = new List<int>();
+                int tmp;
+                foreach (string s in scaleindex.Split(','))
+                    if (int.TryParse(s, out tmp))
+                        scales.Add(tmp);
+                bx.SetScales(scales.ToArray());
+            }
+
             if (overrideExtents != null)
                 foreach (BatchMap bm in bx.Maps)
                     bm.MaxExtent = overrideExtents;