[Mapbender-commits] r5254 - branches/2.6/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-01-04 05:19:04 -0500 (Mon, 04 Jan 2010)
New Revision: 5254

Modified:
   branches/2.6/http/javascripts/map_obj.js
   branches/2.6/http/javascripts/wms.js
Log:
http://trac.osgeo.org/mapbender/ticket/561

Modified: branches/2.6/http/javascripts/map_obj.js
===================================================================
--- branches/2.6/http/javascripts/map_obj.js	2010-01-04 09:51:12 UTC (rev 5253)
+++ branches/2.6/http/javascripts/map_obj.js	2010-01-04 10:19:04 UTC (rev 5254)
@@ -628,10 +628,11 @@
 		if(validLayers.length === 0) {
 			return false;
 		}
+		var validLayersEncoded = [];
 		for (var i = 0; i < validLayers.length; i++) {
-			validLayers[i] = encodeURIComponent(validLayers[i]);			
+			validLayersEncoded[i] = encodeURIComponent(validLayers[i]);			
 		}		
-		var layerNames = validLayers.join(",");
+		var layerNames = validLayersEncoded.join(",");
 		
 		url = currentWms.wms_getmap;
 		url += mb_getConjunctionCharacter(currentWms.wms_getmap);
@@ -645,13 +646,12 @@
 		
 		url += "LAYERS=" + layerNames + "&";
 		url += "STYLES=";
-		var layer = layerNames.split(",");
-		for (var j = 0; j < layer.length; j++) {
+		for (var j = 0; j < validLayers.length; j++) {
 			if (j > 0) {
 				url += ",";
 			}
-			if (currentWms.getCurrentStyleByLayerName(layer[j]) !== false) {
-				url += currentWms.getCurrentStyleByLayerName(layer[j]);
+			if (currentWms.getCurrentStyleByLayerName(validLayers[j]) !== false) {
+				url += currentWms.getCurrentStyleByLayerName(validLayers[j]);
 			}
 		}
 		url += "&";

Modified: branches/2.6/http/javascripts/wms.js
===================================================================
--- branches/2.6/http/javascripts/wms.js	2010-01-04 09:51:12 UTC (rev 5253)
+++ branches/2.6/http/javascripts/wms.js	2010-01-04 10:19:04 UTC (rev 5254)
@@ -387,6 +387,7 @@
 			}
 		}
 	}
+	return false;
 };
 
 /**