[fusion-commits] r1636 - trunk/MapGuide

[svn_fusion at osgeo.org]

Author: pagameba
Date: 2008-11-05 09:38:13 -0500 (Wed, 05 Nov 2008)
New Revision: 1636

Modified:
   trunk/MapGuide/MapGuide.js
Log:
Re #149.  Separate logic for drawing selection and map in the case of a separate overlay layer in MapGuide.  Also remove the resize effect on the selection overlay layer as it causes a temporary visual displacement of the selection image that is quite disconcerting.

Modified: trunk/MapGuide/MapGuide.js
===================================================================
--- trunk/MapGuide/MapGuide.js	2008-11-05 13:56:09 UTC (rev 1635)
+++ trunk/MapGuide/MapGuide.js	2008-11-05 14:38:13 UTC (rev 1636)
@@ -530,10 +530,14 @@
         this.aHideGroups = [];
         this.aRefreshLayers = [];
 
+        this.oLayerOL.mergeNewParams(params);
+    },
+    
+    drawSelection: function() {
         if (this.queryLayer) {
-          this.queryLayer.redraw(true);
+            this.queryLayer.redraw(true);
         } else {
-          this.oLayerOL.mergeNewParams(params);
+            this.drawMap();
         }
     },
 
@@ -556,7 +560,7 @@
         useOverlay: this.selectionAsOverlay,
         ratio: this.ratio
       };
-      if (!/WebKit/.test(navigator.userAgent)) {
+      if (behaviour != 1 && !/WebKit/.test(navigator.userAgent)) {
         layerOptions.transitionEffect = 'resize';
       }
 
@@ -596,7 +600,7 @@
           params.selectioncolor = this.selectionColor;
           params.format = this.selectionFormat;
         }
-        //params.version = "2.0.0";
+        params.version = "2.0.0";
 
       } else {
         params = {      //tiled version
@@ -681,7 +685,7 @@
             this.oSelection = null;
         }
         this.bSelectionOn = true;
-        this.drawMap();
+        this.drawSelection();
         this.triggerEvent(Fusion.Event.MAP_SELECTION_ON);
     },
 
@@ -811,7 +815,7 @@
           this.queryLayer.setVisibility(false);
         }
         this.triggerEvent(Fusion.Event.MAP_SELECTION_OFF);
-        this.drawMap();
+        this.drawSelection();
         this.oSelection = null;
     },