[Mapbender-commits] r3471 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-01-20 10:34:21 -0500 (Tue, 20 Jan 2009)
New Revision: 3471

Modified:
   trunk/mapbender/http/classes/class_wms.php
Log:
WMC changes

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2009-01-20 15:33:35 UTC (rev 3470)
+++ trunk/mapbender/http/classes/class_wms.php	2009-01-20 15:34:21 UTC (rev 3471)
@@ -861,7 +861,12 @@
 		$newLayer->gui_layer_status = $currentLayer["extension"]["GUI_STATUS"];
 		$newLayer->gui_layer_style = ""; // TODO: Add correct data
 		$newLayer->gui_layer_selectable = $currentLayer["extension"]["GUI_SELECTABLE"];
-		$newLayer->gui_layer_visible = $currentLayer["visible"];
+		if (isset($currentLayer["extension"]["OVERVIEWHIDDEN"])) {
+			$newLayer->gui_layer_visible = ($currentLayer["extension"]["OVERVIEWHIDDEN"] === "1") ? false : true;
+		}
+		else {
+			$newLayer->gui_layer_visible = $currentLayer["visible"];
+		}
 		$newLayer->gui_layer_queryable = $currentLayer["extension"]["GUI_QUERYABLE"];
 		$newLayer->gui_layer_querylayer = $currentLayer["extension"]["QUERYLAYER"];
 		$newLayer->gui_layer_minscale = $currentLayer["extension"]["GUI_MINSCALE"];
@@ -1896,7 +1901,7 @@
 			$res_style = db_prep_query($sql,$v,$t);
 			$count_layer_style = 0;
 			while($row2 = db_fetch_array($res_style)){
-				$this->objLayer[$layer_cnt]->layer_style[$count_layer_style]["name"]=$row2["name"];
+				$this->objLayer[$layer_cnt]->layer_style[$count_layer_style]["name"] = $row2["name"] ? $row2["name"] : "default";
 				$this->objLayer[$layer_cnt]->layer_style[$count_layer_style]["title"]=$row2["title"];
 				if($wmsowsproxy != ""){
 					if($row2["legendurl"]!=''){