[fusion-commits] r2566 - in branches/fusion-mg24: . layers/MapGuide lib widgets widgets/QuickPlot

[svn_fusion at osgeo.org]

Author: jng
Date: 2012-08-06 08:05:25 -0700 (Mon, 06 Aug 2012)
New Revision: 2566

Modified:
   branches/fusion-mg24/
   branches/fusion-mg24/layers/MapGuide/MapGuide.js
   branches/fusion-mg24/lib/ApplicationDefinition.js
   branches/fusion-mg24/lib/MGBroker.js
   branches/fusion-mg24/lib/MapMessage.js
   branches/fusion-mg24/widgets/BasemapSwitcher.js
   branches/fusion-mg24/widgets/QuickPlot/GeneratePicture.php
   branches/fusion-mg24/widgets/QuickPlot/PreviewDialog.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).


Property changes on: branches/fusion-mg24
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/jxlib-3.0:1957-2248
   + /sandbox/jxlib-3.0:1957-2248
/trunk:2565

Modified: branches/fusion-mg24/layers/MapGuide/MapGuide.js
===================================================================
--- branches/fusion-mg24/layers/MapGuide/MapGuide.js	2012-08-06 14:27:49 UTC (rev 2565)
+++ branches/fusion-mg24/layers/MapGuide/MapGuide.js	2012-08-06 15:05:25 UTC (rev 2566)
@@ -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) {


Property changes on: branches/fusion-mg24/lib/ApplicationDefinition.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/adsk/2.4j/lib/ApplicationDefinition.js:2486-2514
/sandbox/jxlib-3.0/lib/ApplicationDefinition.js:1957-2248
/trunk/lib/ApplicationDefinition.js:2469-2485
   + /sandbox/adsk/2.4j/lib/ApplicationDefinition.js:2486-2514
/sandbox/jxlib-3.0/lib/ApplicationDefinition.js:1957-2248
/trunk/lib/ApplicationDefinition.js:2469-2485,2565

Modified: branches/fusion-mg24/lib/MGBroker.js
===================================================================
--- branches/fusion-mg24/lib/MGBroker.js	2012-08-06 14:27:49 UTC (rev 2565)
+++ branches/fusion-mg24/lib/MGBroker.js	2012-08-06 15:05:25 UTC (rev 2566)
@@ -579,6 +579,7 @@
         this.initializeRequest();
         this.setParams( {
             operation : 'QUERYMAPFEATURES',
+            format: "application/json",
             session: sessionId,
             mapname: mapName,
             geometry: geometry,


Property changes on: branches/fusion-mg24/lib/MapMessage.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/adsk/2.4j/lib/MapMessage.js:2486-2514
/sandbox/jxlib-3.0/lib/MapMessage.js:1957-2248
/trunk/lib/MapMessage.js:2469-2485
   + /sandbox/adsk/2.4j/lib/MapMessage.js:2486-2514
/sandbox/jxlib-3.0/lib/MapMessage.js:1957-2248
/trunk/lib/MapMessage.js:2469-2485,2565


Property changes on: branches/fusion-mg24/widgets/BasemapSwitcher.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/adsk/2.4j/widgets/BasemapSwitcher.js:2486-2526
/sandbox/jxlib-3.0/widgets/BasemapSwitcher.js:1957-2248
/trunk/widgets/BasemapSwitcher.js:2469-2485
   + /sandbox/adsk/2.4j/widgets/BasemapSwitcher.js:2486-2526
/sandbox/jxlib-3.0/widgets/BasemapSwitcher.js:1957-2248
/trunk/widgets/BasemapSwitcher.js:2469-2485,2565


Property changes on: branches/fusion-mg24/widgets/QuickPlot/GeneratePicture.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/adsk/2.4jbeta2/widgets/QuickPlot/GeneratePicture.php:2488-2498
/sandbox/jxlib-3.0/widgets/QuickPlot/GeneratePicture.php:1957-2248
/trunk/widgets/QuickPlot/GeneratePicture.php:2469-2487
   + /sandbox/adsk/2.4jbeta2/widgets/QuickPlot/GeneratePicture.php:2488-2498
/sandbox/jxlib-3.0/widgets/QuickPlot/GeneratePicture.php:1957-2248
/trunk/widgets/QuickPlot/GeneratePicture.php:2469-2487,2565


Property changes on: branches/fusion-mg24/widgets/QuickPlot/PreviewDialog.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/adsk/2.4j/widgets/QuickPlot/PreviewDialog.js:2486-2528
/sandbox/jxlib-3.0/widgets/QuickPlot/PreviewDialog.js:1957-2248
/trunk/widgets/QuickPlot/PreviewDialog.js:2469-2485
   + /sandbox/adsk/2.4j/widgets/QuickPlot/PreviewDialog.js:2486-2528
/sandbox/jxlib-3.0/widgets/QuickPlot/PreviewDialog.js:1957-2248
/trunk/widgets/QuickPlot/PreviewDialog.js:2469-2485,2565