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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-01-20 04:30:10 -0500 (Tue, 20 Jan 2009)
New Revision: 3464

Modified:
   branches/2.5/http/javascripts/mod_legend.php
Log:
re-insert missing changes from 2.4.5

they seem to have been lost in a trunk commit

https://trac.osgeo.org/mapbender/changeset/1710

Modified: branches/2.5/http/javascripts/mod_legend.php
===================================================================
--- branches/2.5/http/javascripts/mod_legend.php	2009-01-19 17:10:23 UTC (rev 3463)
+++ branches/2.5/http/javascripts/mod_legend.php	2009-01-20 09:30:10 UTC (rev 3464)
@@ -61,7 +61,6 @@
 
 <script type="text/javascript">
 <!--
-
 mod_legend_offsetLeft = 25;
 mod_legend_offsetTop = -10;
 
@@ -116,10 +115,13 @@
 		
 		var str = "";
 		var str_tmp = "";
-						
+
 		for(var i=0; i<parent.mb_mapObj[ind].wms.length; i++){
-			
-			 	var layerNames = parent.mb_mapObj[ind].wms[i].getLayers(parent.mb_mapObj[ind]);
+   			var img_format = parent.mb_mapObj[ind].wms[i].gui_wms_mapformat;
+			if(parent.mb_mapObj[ind].wms[i].gui_wms_visible != 0){
+
+				var layerNames = parent.mb_mapObj[ind].wms[i].getLayers(parent.mb_mapObj[ind]);
+
 				for(var j=0; j<layerNames.length; j++){
 					var layerParent = parent.mb_mapObj[ind].wms[i].checkLayerParentByLayerName(layerNames[j]); 
 					var layerTitle = parent.mb_mapObj[ind].wms[i].getTitleByLayerName(layerNames[j]);
@@ -131,39 +133,73 @@
 					else{
 						legendUrl = parent.mb_mapObj[ind].wms[i].getLegendUrlByGuiLayerStyle(layerNames[j],layerStyle);
 					}
-					//console.log("layer_infos : %s",layerNames[j],"---",layerParent,"---",layerTitle,"---",layerStyle,"---",legendUrl);
 			         
-					if (legendUrl !== false){
-						
-//						console.log("legendUrl: %s, typeof(legendUrl): %s", legendUrl, typeof(legendUrl));
-//	 					if(layerParent == 0){
-		 					if(showlayertitle == 'true'){
-								str_tmp += "<div><span class='titles'>" + layerTitle+ "</span></div>";
+					var l = parent.mb_getchildsbyname(ind,i,layerNames[j]);
+					var tmp_name = "";
+
+					// handle grouped layers
+					if (l) {				  		
+						for (var k=0; k<l["name"].length; k++){
+							if (l["legendurl"][k] != '' && l["legendurl"][k] != 0) {
+					 			if (tmp_name != l["title"][k]) {
+					 				if (showgroupedlayertitle == 'true'){				
+				  						str_tmp += "<div><span class='titles'>" + l["title"][k] + "</span></div>";
+				  					}
+				 	  				str_tmp += "<div>";
+									if(legendlink == 'true'){
+										str_tmp += "<a href='../php/result.php?lingo=deutsch&layer=" + 
+											layerNames[j] + l["name"][k] + "' class='legendlink' title='Zeigt Liste zum Thema: " + 
+											titles[j]+"' target='result'>";
+                                	}
+                                	str_tmp += "<img border=0 src = '";			
+					  				str_tmp += l["legendurl"][k];
+					  				str_tmp += "'></img>";		
+
+					  				if (legendlink == 'true'){
+                                		str_tmp += "</a>";
+                                	}
+
+                                	str_tmp += "</div>"; 
+									tmp_name = l["title"][k];
+					 			}
+					 		}
+         				 }
+         			}
+         			else {
+						if (legendUrl) {
+							if(layerParent == 0){
+								if(showlayertitle == 'true'){
+									str_tmp += "<div><span class='titles'>" + layerTitle + "</span></div>";
+								}
+								str_tmp += "<div>";
+								if(legendlink == 'true'){
+									str_tmp += "<a href='../php/result.php?lingo=deutsch&layer="+layerNames[j]+
+										"' class='link_metadata' title='Zeigt Liste zum Thema: "+layerTitle+
+										"' target='result'>";
+								}
+								str_tmp += "<img border=0 src = '";			
+								str_tmp += legendUrl;
+								str_tmp += "'></img>";
+								if (legendlink == 'true'){
+									str_tmp += "</a>";
+								}
+								str_tmp += "</div>";
 							}
-							str_tmp += "<div>";
-		                    if(legendlink == 'true'){
-		                    	str_tmp += "<a href='../php/result.php?lingo=deutsch&layer="+layerNames[j]+"' class='link_metadata' title='Zeigt Liste zum Thema: "+layerTitle+"' target='result'>";
-		                    }
-		                    str_tmp += "<img border=0 src = '";			
-							str_tmp += legendUrl;
-							str_tmp += "'></img>";
-							if (legendlink == 'true'){
-		                    	str_tmp += "</a>";
-		                    }
-		                    str_tmp += "</div>";
-//	                	}
+						}
 					} 
 				}
+			}
+					
 			if(str_tmp !=''){
 				if (showwmstitle == 'true'){
 					str += "<div><span class='header'>" +parent.mb_mapObj[ind].wms[i].wms_title+ "</span></div>";
 				}
 				str += str_tmp;
 				str_tmp ='';
-			}		
+			}
 		}
-		//console.log("ind =%s",ind,"str =",str);
-	    if(str != ""){
+
+		if(str != ""){
 			parent.writeTag("legend", "leg", str);
 		}
 		else{