[Mapbender-commits] r2263 - branches/nimix_dev/http/javascripts

[svn_mapbender at osgeo.org]

Author: nimix
Date: 2008-03-18 04:45:54 -0400 (Tue, 18 Mar 2008)
New Revision: 2263

Modified:
   branches/nimix_dev/http/javascripts/map.js
   branches/nimix_dev/http/javascripts/map_obj.js
Log:
fix grouped layer bugs

Modified: branches/nimix_dev/http/javascripts/map.js
===================================================================
--- branches/nimix_dev/http/javascripts/map.js	2008-03-18 08:45:01 UTC (rev 2262)
+++ branches/nimix_dev/http/javascripts/map.js	2008-03-18 08:45:54 UTC (rev 2263)
@@ -927,10 +927,10 @@
 					querylayers += mb_mapObj[ind].wms[i].objLayer[ii].layer_name; 
 					cnt_querylayers++;
 				}
-				mb_mapObj[ind].layers[i] = layers;
-				mb_mapObj[ind].querylayers[i] = querylayers;
-				mb_mapObj[ind].styles[i] = styles;
 			}
+			mb_mapObj[ind].layers[i] = layers;
+			mb_mapObj[ind].querylayers[i] = querylayers;
+			mb_mapObj[ind].styles[i] = styles;
 		}
 	}
 }
@@ -950,7 +950,7 @@
 			if(thisLayer[ii] == myLayername){
 				if(myMinscale === 0 || thisScale >= myMinscale){minscaleOK = true;}
 				if(myMaxscale === 0 || thisScale <= myMaxscale){maxscaleOK = true;}
-				if(maxscaleOK === true && minscaleOK === true ){
+				if(maxscaleOK === true && minscaleOK === true  && !mb_mapObj[mObj].wms[wmsObj].objLayer[i].has_childs){
 					if(cnt_layer > 0){str_layer += ","; }//str_styles += ","; str_titles += ",";str_parent += ","; str_legendurls += ",";}
 					str_layer += thisLayer[ii];
 					cnt_layer++;

Modified: branches/nimix_dev/http/javascripts/map_obj.js
===================================================================
--- branches/nimix_dev/http/javascripts/map_obj.js	2008-03-18 08:45:01 UTC (rev 2262)
+++ branches/nimix_dev/http/javascripts/map_obj.js	2008-03-18 08:45:54 UTC (rev 2263)
@@ -487,7 +487,7 @@
 	
 	//Set visibility/queryability of Layer and Sublayers
 	for(var j = i; j < this.objLayer.length; j++){
-		if (i != j && this.objLayer[i].layer_parent == this.objLayer[j].layer_parent) {
+		if (i != j && this.objLayer[i].layer_parent >= this.objLayer[j].layer_parent) {
 			break;
 		}
 		if(type == "visible") {
@@ -509,7 +509,7 @@
 			else if(type=="querylayer") {
 				this.objLayer[j].gui_layer_querylayer = state;
 			}
-		}		
+		}
 	}
 };