[Mapbender-commits] r2054 - branches/2.5/http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Feb 1 11:19:50 EST 2008
Author: christoph
Date: 2008-02-01 11:19:49 -0500 (Fri, 01 Feb 2008)
New Revision: 2054
Modified:
branches/2.5/http/javascripts/map.js
Log:
merged w/ SLD branch
Modified: branches/2.5/http/javascripts/map.js
===================================================================
--- branches/2.5/http/javascripts/map.js 2008-02-01 15:25:17 UTC (rev 2053)
+++ branches/2.5/http/javascripts/map.js 2008-02-01 16:19:49 UTC (rev 2054)
@@ -762,6 +762,12 @@
var temp = "&SLD=" + tmp+ "&";
newMapURL += temp;
}
+ // add sld
+ if(mb_mapObj[i].wms[ii].gui_wms_sldurl != ""){
+ //alert(mb_mapObj[i].wms[ii].gui_wms_sldurl);
+ var temp = "&SLD=" + escape(mb_mapObj[i].wms[ii].gui_wms_sldurl) + "&";
+ newMapURL += temp;
+ }
if(mb_log){
var tmp = eval(mb_log + "('" + newMapURL + "','" + ts + "')");
}
@@ -824,7 +830,7 @@
newMapURL += "LAYERS="+layerNames+"&";
var layer = layerNames.split(",");
- newMapURL += "STYLES=";
+
for(var j=0; j<layer.length; j++){
if(j>0){
newMapURL += ",";
@@ -836,7 +842,8 @@
newMapURL += mb_mapObj[i].wms[ii].getCurrentStyleByLayerName(layer[j]);
}
}
- newMapURL += "&";
+ newMapURL += "STYLES="+str_LayerStyles[1]+"&";
+
newMapURL += "SRS="+mb_mapObj[i].epsg+"&";
newMapURL += "BBOX="+mb_mapObj[i].extent+"&";
newMapURL += "WIDTH="+mb_mapObj[i].width+"&";
@@ -865,9 +872,16 @@
var temp = "&SLD=" + tmp+ "&";
newMapURL += temp;
}
+ // add sld
+ if(mb_mapObj[i].wms[ii].gui_wms_sldurl != ""){
+ //alert(mb_mapObj[i].wms[ii].gui_wms_sldurl);
+ var temp = "&SLD=" + escape(mb_mapObj[i].wms[ii].gui_wms_sldurl) + "&";
+ newMapURL += temp;
+ }
//prompt("",newMapURL);
- if(mb_mapObj[i].layers[ii] != "" && layerNames!=''){
+ if(mb_mapObj[i].layers[ii] != ""){
+// if(mb_mapObj[i].layers[ii] != "" && str_LayerStyles[0] != ""){
newMapRequest += newMapURL;
mb_mapObj[i].mapURL[ii] = newMapURL;
mb_mapObj[i].wms[ii].mapURL = newMapURL;
@@ -930,6 +944,10 @@
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;
@@ -942,8 +960,18 @@
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++;
}
}
@@ -951,6 +979,10 @@
}
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) {
More information about the Mapbender_commits
mailing list