[mapguide-commits] r7507 - branches/maestro-4.0.x/MgCooker

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-05-20 05:22:57 -0700 (Mon, 20 May 2013)
New Revision: 7507

Modified:
   branches/maestro-4.0.x/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: branches/maestro-4.0.x/MgCooker/Program.cs
===================================================================
--- branches/maestro-4.0.x/MgCooker/Program.cs	2013-05-20 11:55:56 UTC (rev 7506)
+++ branches/maestro-4.0.x/MgCooker/Program.cs	2013-05-20 12:22:57 UTC (rev 7507)
@@ -210,16 +210,7 @@
             
 
             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>();
@@ -265,6 +256,16 @@
 
             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;