[Mapbender-commits] r3593 - branches/2.5/http/classes

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-02-25 11:05:11 -0500 (Wed, 25 Feb 2009)
New Revision: 3593

Modified:
   branches/2.5/http/classes/class_map.php
   branches/2.5/http/classes/class_wmc.php
   branches/2.5/http/classes/class_wmcToXml.php
Log:
added gui_wms_visible to wmc

Modified: branches/2.5/http/classes/class_map.php
===================================================================
--- branches/2.5/http/classes/class_map.php	2009-02-25 16:04:15 UTC (rev 3592)
+++ branches/2.5/http/classes/class_map.php	2009-02-25 16:05:11 UTC (rev 3593)
@@ -292,7 +292,6 @@
 				$newLayer->layer_maxscale = $currentLayer->layer_maxscale;
 				$newLayer->layer_metadataurl = $currentLayer->metadataurl;
 				$newLayer->gui_layer_wms_id = $currentLayer->gui_layer_wms_id;
-//				$newLayer->gui_layer_wms_id = $wms->objLayer[0]->layer_uid;
 				$newLayer->gui_layer_status = $currentLayer->gui_layer_status;
 				$newLayer->gui_layer_style = $currentLayer->gui_layer_style;
 				$newLayer->gui_layer_selectable = $currentLayer->gui_layer_selectable;

Modified: branches/2.5/http/classes/class_wmc.php
===================================================================
--- branches/2.5/http/classes/class_wmc.php	2009-02-25 16:04:15 UTC (rev 3592)
+++ branches/2.5/http/classes/class_wmc.php	2009-02-25 16:05:11 UTC (rev 3593)
@@ -983,7 +983,7 @@
 			$wms->gui_wms_featureinfoformat = "text/html"; // TODO : Add correct data
 			$wms->gui_wms_exceptionformat = "application/vnd.ogc.se_xml"; // TODO : Add correct data
 			$wms->gui_wms_epsg = $this->mainMap->getEpsg();
-			$wms->gui_wms_visible = 1; // TODO : Add correct data
+			$wms->gui_wms_visible = $currentLayer["extension"]["WMS_VISIBLE"];
 			$wms->gui_wms_opacity = 100; // TODO : Add correct data
 			$wms->gui_wms_sldurl = $currentLayer["style"][$styleIndex]["sld_url"];
 

Modified: branches/2.5/http/classes/class_wmcToXml.php
===================================================================
--- branches/2.5/http/classes/class_wmcToXml.php	2009-02-25 16:04:15 UTC (rev 3592)
+++ branches/2.5/http/classes/class_wmcToXml.php	2009-02-25 16:05:11 UTC (rev 3593)
@@ -95,7 +95,6 @@
 		$currentMap = $this->wmc->mainMap;
 		for ($i = 0; $i < count($currentWmsArray); $i++) {
 			$currentWms = $currentWmsArray[$i];
-			
 			for ($j = 0; $j < count($currentWms->objLayer); $j++) {
 				$currentLayer = $currentWms->objLayer[$j];
 				
@@ -401,6 +400,7 @@
 		$layerExtensionData["layer_id"] = $currentLayer->layer_uid;
 		$layerExtensionData["wms_layer_id"] = $currentWms->objLayer[0]->layer_uid;
 		$layerExtensionData["wms_selectable"] = $currentWms->objLayer[0]->gui_layer_selectable;
+		$layerExtensionData["wms_visible"] = $currentWms->gui_wms_visible;
 		$layerExtensionData["layer_pos"] = $currentLayer->layer_pos;
 		$layerExtensionData["layer_parent"] = $currentLayer->layer_parent;
 		$layerExtensionData["wms_id"] = $currentLayer->gui_layer_wms_id;