[fusion-commits] r1358 - trunk/MapGuide/php

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-04-03 10:51:10 -0400 (Thu, 03 Apr 2008)
New Revision: 1358

Modified:
   trunk/MapGuide/php/Buffer.php
Log:
closes #45: remove $excludedLayers variable and modify MgCoordinateSystemMeasure for MGOS 2.0

Modified: trunk/MapGuide/php/Buffer.php
===================================================================
--- trunk/MapGuide/php/Buffer.php	2008-04-01 19:16:04 UTC (rev 1357)
+++ trunk/MapGuide/php/Buffer.php	2008-04-03 14:51:10 UTC (rev 1358)
@@ -158,12 +158,10 @@
             $layerSrsWkt = $spatialContext->GetCoordinateSystemWkt();
             /* skip this layer if the srs is empty */
             if($layerSrsWkt == "") {
-                $excludedLayers ++;
                 continue;
             }
         } else {
             /* skip this layer if there is no spatial context at all */
-            $excludedLayers ++;
             continue;
         }
 
@@ -182,7 +180,6 @@
         //
         if(($arbitraryDsSrs != $arbitraryMapSrs) || ($arbitraryDsSrs && ($dsSrsUnits != $mapSrsUnits)))
         {
-            $excludedLayers ++;
             continue;
         }
 
@@ -191,15 +188,19 @@
         $dist = $layerCs->ConvertMetersToCoordinateSystemUnits($distance);
 
         // calculate great circle unless data source srs is arbitrary
+        $verMajor = subStr(GetSiteVersion(), 0,1);
         if(!$arbitraryDsSrs) {
-            $measure = new MgCoordinateSystemMeasure($layerCs);
+            if ($verMajor == '1') {
+              $measure = new MgCoordinateSystemMeasure($layerCs);
+            } else {
+              $measure = $layerCs->GetMeasure();
+            }
         } else {
             $measure = null;
         }
 
         // create a SRS transformer if necessary.
         if($layerSrsWkt != $srsDefMap) {
-            $verMajor = subStr(GetSiteVersion(), 0,1);
             if ($verMajor == '1') {
               $srsXform = new MgCoordinateSystemTransform($layerCs, $srsMap);
             } else {