[fusion-commits] r1667 - in trunk/layers/MapServer: . php

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-11-14 10:52:21 -0500 (Fri, 14 Nov 2008)
New Revision: 1667

Modified:
   trunk/layers/MapServer/MapServer.js
   trunk/layers/MapServer/php/SetLayers.php
Log:
closes #169: patch applied to trunk

Modified: trunk/layers/MapServer/MapServer.js
===================================================================
--- trunk/layers/MapServer/MapServer.js	2008-11-14 15:45:43 UTC (rev 1666)
+++ trunk/layers/MapServer/MapServer.js	2008-11-14 15:52:21 UTC (rev 1667)
@@ -375,11 +375,16 @@
         eval('o='+r.responseText);
   			if (o.success) {
   				var layerCopy = $A(this.aLayers);
+          var nLayers = layerCopy.length -1;
+          
+          //Mapserver has list of layers reversed from MapGuide
+          aLayerIndex.reverse();
+    
   				this.aLayers = [];
   				this.aVisibleLayers = [];
 
           for (var i=0; i<aLayerIndex.length; ++i) {
-            this.aLayers.push( layerCopy[ aLayerIndex[i] ] );
+            this.aLayers.push( layerCopy[ nLayers - aLayerIndex[i] ] );
             if (this.aLayers[i].visible) {
                 this.aVisibleLayers.push(this.aLayers[i].layerName);
             }
@@ -388,9 +393,6 @@
 
   				this.drawMap();
   				this.triggerEvent(Fusion.Event.MAP_LAYER_ORDER_CHANGED);
-  			} else {
-          alert(OpenLayers.i18n('setLayersError', {'error':o.layerindex}));
-  			}
       }
     },
 

Modified: trunk/layers/MapServer/php/SetLayers.php
===================================================================
--- trunk/layers/MapServer/php/SetLayers.php	2008-11-14 15:45:43 UTC (rev 1666)
+++ trunk/layers/MapServer/php/SetLayers.php	2008-11-14 15:52:21 UTC (rev 1667)
@@ -70,9 +70,10 @@
 }
 
 if ($res) {
-	$oMap->save($_SESSION['maps'][$mapName]);
-	$currentLayers = $oMap->getlayersdrawingorder();
-    echo "{success: true, layerindex: [".implode(",",$currentLayers)."]}";
+    $oMap->save($_SESSION['maps'][$mapName]);
+    $oMap = ms_newMapObj($_SESSION['maps'][$mapName]);
+    $newLayers = $oMap->getlayersdrawingorder();
+    echo "{success: true, layerindex: [".implode(",",$newLayers)."]}";
 } else {
     echo "{success: false, layerindex: [".$_REQUEST['layerindex']."]}";
 }