[Mapbender-commits] r2084 - branches/2.5/http/javascripts

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2008-02-13 07:20:19 -0500 (Wed, 13 Feb 2008)
New Revision: 2084

Modified:
   branches/2.5/http/javascripts/map.js
Log:
merged SLD changes with changes of setMapRequest() and setSingleMapRequest() of revision 2010

Modified: branches/2.5/http/javascripts/map.js
===================================================================
--- branches/2.5/http/javascripts/map.js	2008-02-13 10:42:46 UTC (rev 2083)
+++ branches/2.5/http/javascripts/map.js	2008-02-13 12:20:19 UTC (rev 2084)
@@ -830,7 +830,7 @@
 					
 					newMapURL += "LAYERS="+layerNames+"&";
 					var layer = layerNames.split(",");
-
+					newMapURL += "STYLES=";
 					for(var j=0; j<layer.length; j++){
 						if(j>0){
 							newMapURL  += ",";
@@ -842,8 +842,7 @@
 							newMapURL  += mb_mapObj[i].wms[ii].getCurrentStyleByLayerName(layer[j]);
 						}
 					}
-					newMapURL += "STYLES="+str_LayerStyles[1]+"&";
-         
+					newMapURL += "&";
 					newMapURL += "SRS="+mb_mapObj[i].epsg+"&";
 					newMapURL += "BBOX="+mb_mapObj[i].extent+"&";
 					newMapURL += "WIDTH="+mb_mapObj[i].width+"&";
@@ -880,8 +879,7 @@
 					}
 
 					//prompt("",newMapURL);
-					if(mb_mapObj[i].layers[ii] != ""){
-//					if(mb_mapObj[i].layers[ii] != "" && str_LayerStyles[0] != ""){
+					if(mb_mapObj[i].layers[ii] != "" && layerNames!=''){
 						newMapRequest += newMapURL;
 						mb_mapObj[i].mapURL[ii] = newMapURL;
 						mb_mapObj[i].wms[ii].mapURL = newMapURL;
@@ -944,10 +942,6 @@
 	var thisLayer = mb_mapObj[mObj].layers[wmsObj].split(",");
 	var thisScale = mb_getScale(frameName);  
 	var str_layer = "";
-	var str_styles = "";
-	var str_titles = "";
-	var str_legendurls = "";
-	var str_parent = "";
 	var cnt_layer = 0;
 	for(var i=0; i<mb_mapObj[mObj].wms[wmsObj].objLayer.length; i++){  
 		var myLayername = mb_mapObj[mObj].wms[wmsObj].objLayer[i].layer_name;
@@ -960,18 +954,8 @@
 				if(myMinscale == 0 || thisScale >= myMinscale){minscaleOK = true;}
 				if(myMaxscale == 0 || thisScale <= myMaxscale){maxscaleOK = true;}
 				if(maxscaleOK == true && minscaleOK == true ){
-					if(cnt_layer > 0){str_layer += ","; str_styles += ","; str_titles += ",";str_parent += ","; str_legendurls += ",";}
+					if(cnt_layer > 0){str_layer += ","; }//str_styles += ","; str_titles += ",";str_parent += ","; str_legendurls += ",";}
 					str_layer += thisLayer[ii];
-					str_styles += "";
-					str_titles += mb_mapObj[mObj].wms[wmsObj].objLayer[i].layer_title;
-					str_parent += mb_mapObj[mObj].wms[wmsObj].objLayer[i].layer_parent;
-					if(mb_mapObj[mObj].wms[wmsObj].objLayer[i].layer_style.length>0){
-					 	str_legendurls += mb_mapObj[mObj].wms[wmsObj].objLayer[i].layer_style[0]["legendurl"] ;
-					 	// add SLD-Url to Legend-Url
-					 	if (mb_mapObj[mObj].wms[wmsObj].gui_wms_sldurl != "") {
-					 		str_legendurls += "&SLD="+escape(mb_mapObj[mObj].wms[wmsObj].gui_wms_sldurl);
-					 	}
-					}
 					cnt_layer++;
 				}
 			}
@@ -979,10 +963,6 @@
 	}
 	var str_layerstyles = [];
 	str_layerstyles[0] = str_layer;
-	str_layerstyles[1] = str_styles;
-	str_layerstyles[2] = str_titles;
-	str_layerstyles[3] = str_legendurls;
-	str_layerstyles[4] = str_parent;
 	return str_layerstyles;
 }
 function setFeatureInfoRequest(fName,x,y, path) {