[Mapbender-commits] r4238 - in trunk/mapbender/http: javascripts
print
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Jun 26 04:28:24 EDT 2009
Author: astrid_emde
Date: 2009-06-26 04:28:23 -0400 (Fri, 26 Jun 2009)
New Revision: 4238
Modified:
trunk/mapbender/http/javascripts/mod_legend.php
trunk/mapbender/http/javascripts/wms.js
trunk/mapbender/http/print/mod_printPDF.php
Log:
http://trac.osgeo.org/mapbender/ticket/469
When the default STYLE is used (STYLE=,,,,), Mapbender now takes the first style from the database
Modified: trunk/mapbender/http/javascripts/mod_legend.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_legend.php 2009-06-25 14:51:45 UTC (rev 4237)
+++ trunk/mapbender/http/javascripts/mod_legend.php 2009-06-26 08:28:23 UTC (rev 4238)
@@ -129,7 +129,7 @@
var layerStyle = parent.mb_mapObj[ind].wms[i].getCurrentStyleByLayerName(layerNames[j]);
var legendUrl = false;
if(layerStyle == false){
- legendUrl = parent.mb_mapObj[ind].wms[i].getLegendUrlByGuiLayerStyle(layerNames[j],"default");
+ legendUrl = parent.mb_mapObj[ind].wms[i].getLegendUrlByGuiLayerStyle(layerNames[j],"");
}
else{
legendUrl = parent.mb_mapObj[ind].wms[i].getLegendUrlByGuiLayerStyle(layerNames[j],layerStyle);
Modified: trunk/mapbender/http/javascripts/wms.js
===================================================================
--- trunk/mapbender/http/javascripts/wms.js 2009-06-25 14:51:45 UTC (rev 4237)
+++ trunk/mapbender/http/javascripts/wms.js 2009-06-26 08:28:23 UTC (rev 4238)
@@ -380,8 +380,9 @@
return false;
}
for(var k=0; k< this.objLayer[i].layer_style.length; k++){
- if(this.objLayer[i].layer_style[k].name == guiLayerStyle){
- var legendUrl = this.objLayer[i].layer_style[k].legendurl;
+ var legendUrl = '';
+ if(guiLayerStyle == '' && k == 0){
+ legendUrl = this.objLayer[i].layer_style[k].legendurl;
if (this.gui_wms_sldurl !== "") {
legendUrl += "&SLD="+escape(this.gui_wms_sldurl);
}
@@ -391,6 +392,17 @@
else {
return false;
}
+ }else if(this.objLayer[i].layer_style[k].name == guiLayerStyle){
+ legendUrl = this.objLayer[i].layer_style[k].legendurl;
+ if (this.gui_wms_sldurl !== "") {
+ legendUrl += "&SLD="+escape(this.gui_wms_sldurl);
+ }
+ if(legendUrl !=='' && legendUrl !== null && typeof(legendUrl) != 'undefined'){
+ return legendUrl;
+ }
+ else {
+ return false;
+ }
}
}
}
Modified: trunk/mapbender/http/print/mod_printPDF.php
===================================================================
--- trunk/mapbender/http/print/mod_printPDF.php 2009-06-25 14:51:45 UTC (rev 4237)
+++ trunk/mapbender/http/print/mod_printPDF.php 2009-06-26 08:28:23 UTC (rev 4238)
@@ -93,7 +93,7 @@
var title = pt.mb_mapObj[ind].wms[i].getTitleByLayerName(layers[j]);
var layerStyle = pt.mb_mapObj[ind].wms[i].getCurrentStyleByLayerName(layers[j]);
if(layerStyle==false){
- var temp_legendurl = pt.mb_mapObj[ind].wms[i].getLegendUrlByGuiLayerStyle(layers[j],"default");
+ var temp_legendurl = pt.mb_mapObj[ind].wms[i].getLegendUrlByGuiLayerStyle(layers[j],"");
}
else{
var temp_legendurl = pt.mb_mapObj[ind].wms[i].getLegendUrlByGuiLayerStyle(layers[j],layerStyle);
More information about the Mapbender_commits
mailing list