[fusion-commits] r2565 - in trunk: layers/MapGuide lib

[svn_fusion at osgeo.org]

Author: jng
Date: 2012-08-06 07:27:49 -0700 (Mon, 06 Aug 2012)
New Revision: 2565

Modified:
   trunk/layers/MapGuide/MapGuide.js
   trunk/lib/MGBroker.js
Log:
#530: Eliminate the use of Xml2JSON.php for QUERYMAPFEATURES (the only operation that calls it). This results in one less request for every selection operation and tooltip request. This requires revision 6935 or newer of MapGuide trunk or 2.4 branch, which supports JSON output for QUERYMAPFEATURES (see: http://trac.osgeo.org/mapguide/ticket/2090).

Modified: trunk/layers/MapGuide/MapGuide.js
===================================================================
--- trunk/layers/MapGuide/MapGuide.js	2012-08-02 06:10:32 UTC (rev 2564)
+++ trunk/layers/MapGuide/MapGuide.js	2012-08-06 14:27:49 UTC (rev 2565)
@@ -1136,7 +1136,7 @@
                                                                 options.layers,
                                                                 layerAttributeFilter);
         var callback = (options.extendSelection == true) ? OpenLayers.Function.bind(this.processAndMergeFeatureInfo, this) : OpenLayers.Function.bind(this.processFeatureInfo, this);
-        Fusion.oBroker.dispatchRequest(r, OpenLayers.Function.bind(Fusion.xml2json, this, callback));
+        Fusion.oBroker.dispatchRequest(r, callback);
     },
 
     showLayer: function( layer, noDraw ) {
@@ -1226,7 +1226,7 @@
                                                             maxFeatures, persist, selection, filter, layerNames,
                                                             layerAttributeFilter);
         var callback = OpenLayers.Function.bind(this.crtlClickDisplay, this);
-        Fusion.oBroker.dispatchRequest(r, OpenLayers.Function.bind(Fusion.xml2json, this, callback));
+        Fusion.oBroker.dispatchRequest(r, callback);
       }
     },
 
@@ -1346,9 +1346,7 @@
                                         sGeometry,
                                         maxFeatures, persist, selection, filter, layerNames,
                                         layerAttributeFilter);
-        oBroker.dispatchRequest(r, 
-            OpenLayers.Function.bind(Fusion.xml2json, this, 
-                  OpenLayers.Function.bind(this.parseMapTip, this)));
+        oBroker.dispatchRequest(r, OpenLayers.Function.bind(this.parseMapTip, this));
     },
     
     parseMapTip: function(xhr) {

Modified: trunk/lib/MGBroker.js
===================================================================
--- trunk/lib/MGBroker.js	2012-08-02 06:10:32 UTC (rev 2564)
+++ trunk/lib/MGBroker.js	2012-08-06 14:27:49 UTC (rev 2565)
@@ -579,6 +579,7 @@
         this.initializeRequest();
         this.setParams( {
             operation : 'QUERYMAPFEATURES',
+            format: "application/json",
             session: sessionId,
             mapname: mapName,
             geometry: geometry,