[fusion-commits] r2622 - trunk/layers/MapGuide/php

[svn_fusion at osgeo.org]

Author: liuar
Date: 2012-10-25 18:25:46 -0700 (Thu, 25 Oct 2012)
New Revision: 2622

Modified:
   trunk/layers/MapGuide/php/GetSelectionProperties.php
Log:
Submit on behalf of Andy Zhang: integrate 2559

Modified: trunk/layers/MapGuide/php/GetSelectionProperties.php
===================================================================
--- trunk/layers/MapGuide/php/GetSelectionProperties.php	2012-10-22 08:14:33 UTC (rev 2621)
+++ trunk/layers/MapGuide/php/GetSelectionProperties.php	2012-10-26 01:25:46 UTC (rev 2622)
@@ -80,17 +80,19 @@
             //could it be that $selection->AddFeatures($layerObj, $featureReader, 0) is
             //the one causing a problem when the properies are limited ?
             if (isset($_SESSION['property_mappings']) && isset($_SESSION['property_mappings'][$oLayer->GetObjectId()])) {
-                $mappings = $_SESSION['property_mappings'][$oLayer->GetObjectId()];
-                if (0 && count($mappings) > 0) {
+                $mappings = $_SESSION['property_mappings'][$oLayer->GetObjectId()];                
+                if (count($mappings) > 0) {
                     foreach($mappings as $name => $value) {
                         $queryOptions->AddFeatureProperty($name);
                         //echo "$name $value <br>\n";
                     }
-                    $geomName = $oLayer->GetFeatureGeometryName();
-                    $queryOptions->AddFeatureProperty($geomName);
                 }
             }
 
+            //Add geometry property in all cases.
+            $geomName = $oLayer->GetFeatureGeometryName();
+            $queryOptions->AddFeatureProperty($geomName);
+
             $filter = $selection->GenerateFilter($oLayer, $class);
             $queryOptions->SetFilter($filter);
             $featureReader = $featureService->SelectFeatures($featureResId, $class, $queryOptions);