[fusion-commits] r1461 - in trunk: MapGuide/php widgets

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-08-13 15:26:39 -0400 (Wed, 13 Aug 2008)
New Revision: 1461

Modified:
   trunk/MapGuide/php/Query.php
   trunk/widgets/PanQuery.js
Log:
re #101: add same option to PanQuery.js;  also removed debugging output from Query.php

Modified: trunk/MapGuide/php/Query.php
===================================================================
--- trunk/MapGuide/php/Query.php	2008-08-13 17:57:40 UTC (rev 1460)
+++ trunk/MapGuide/php/Query.php	2008-08-13 19:26:39 UTC (rev 1461)
@@ -114,7 +114,6 @@
                 $layerObj = $mapLayers->GetItem($i);
             }
             $bVisFlag = $layerObj->IsVisible() || $bQueryHiddenLayers;
-            echo "/*bVisFlag:".$bVisFlag."*/";
             
             $className = $layerObj->GetFeatureClassName();
             if (!$layerObj->GetSelectable() || !$bVisFlag ||

Modified: trunk/widgets/PanQuery.js
===================================================================
--- trunk/widgets/PanQuery.js	2008-08-13 17:57:40 UTC (rev 1460)
+++ trunk/widgets/PanQuery.js	2008-08-13 19:26:39 UTC (rev 1461)
@@ -54,6 +54,10 @@
         var json = widgetTag.extension;
         
         this.nTolerance = json.Tolerance ? Math.abs(parseInt(json.Tolerance)) : 3;
+        this.bComputeMetadata = (json.ComputeMetadata &&
+                           (json.ComputeMetadata[0] == 'true' ||
+                            json.ComputeMetadata[0] == '1')) ? true : false;
+        
 
         var activeOnly = json.QueryActiveLayer ? json.QueryActiveLayer[0] : 'false';
         this.bActiveOnly = (activeOnly == 'true' || activeOnly == '1') ? true : false;
@@ -89,6 +93,7 @@
             var maxy = pos.y+dfGeoTolerance;
             options.geometry = 'POLYGON(('+ minx + ' ' + miny + ', ' + maxx + ' ' + miny + ', ' + maxx + ' ' + maxy + ', ' + minx + ' ' + maxy + ', ' + minx + ' ' + miny + '))';
             options.selectionType = "INTERSECTS";
+            options.computed = this.bComputeMetadata;
 
             if (this.bActiveOnly) {
                 var layer = this.getMap().getActiveLayer();