[fusion-commits] r2027 - trunk/widgets/Theme/classes

[svn_fusion at osgeo.org]

Author: christinebao
Date: 2009-12-21 05:09:59 -0500 (Mon, 21 Dec 2009)
New Revision: 2027

Modified:
   trunk/widgets/Theme/classes/theme.php
Log:
Fix ticket http://trac.osgeo.org/fusion/ticket/345.
Theme: Theme doesn't consider the layer with filter condition


Modified: trunk/widgets/Theme/classes/theme.php
===================================================================
--- trunk/widgets/Theme/classes/theme.php	2009-12-21 08:33:20 UTC (rev 2026)
+++ trunk/widgets/Theme/classes/theme.php	2009-12-21 10:09:59 UTC (rev 2027)
@@ -225,6 +225,8 @@
         $resId = new MgResourceIdentifier($layer->GetFeatureSourceId());
         $layerDefResId = $layer->GetLayerDefinition();
         $byteReader = $resourceService->GetResourceContent($layerDefResId);
+        
+        $filter = $layer->GetFilter();
 
         // Load the Layer Definition and Navigate to the specified <VectorScaleRange>
 
@@ -265,6 +267,8 @@
             
             $aggregateOptions->AddFeatureProperty($this->args['PROPERTYNAME']);
             $aggregateOptions->SelectDistinct(true);
+            if($filter != '')
+                $aggregateOptions->SetFilter($filter);
             $dataReader = $featureService->SelectAggregate($resId, $layer->GetFeatureClassName(), $aggregateOptions);            
             while ($dataReader->ReadNext())
             {
@@ -312,6 +316,8 @@
 
             $aggregateOptions->AddComputedProperty('THEME_VALUE',
                 $this->args['DISTRO'] . '("' . $this->args['PROPERTYNAME'] . '",' . $this->args['NUMRULES'] . ',' . $this->args['MINVALUE'] . ',' . $this->args['MAXVALUE'] . ')');
+            if($filter != '')
+                $aggregateOptions->SetFilter($filter);
 
             $dataReader = $featureService->SelectAggregate($resId, $layer->GetFeatureClassName(), $aggregateOptions);
             while ($dataReader->ReadNext())