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

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2010-12-14 02:53:41 -0800 (Tue, 14 Dec 2010)
New Revision: 7307

Modified:
   trunk/mapbender/http/classes/class_map.php
   trunk/mapbender/http/classes/class_wmc.php
   trunk/mapbender/http/classes/class_wmcToXml.php
Log:
handle gui_wms_opacity in extension data of wmc

Modified: trunk/mapbender/http/classes/class_map.php
===================================================================
--- trunk/mapbender/http/classes/class_map.php	2010-12-13 10:23:19 UTC (rev 7306)
+++ trunk/mapbender/http/classes/class_map.php	2010-12-14 10:53:41 UTC (rev 7307)
@@ -516,7 +516,7 @@
 			$wms->gui_wms_mapformat = $currentWms->gui_wms_mapformat;
 			$wms->gui_wms_featureinfoformat = $currentWms->gui_wms_featureinfoformat;
 			$wms->gui_wms_exceptionformat = $currentWms->gui_wms_exceptionformat;
-			$wms->gui_wms_opacity = $currentWms->wms_opacity;
+			$wms->gui_wms_opacity = $currentWms->gui_wms_opacity;
 			$wms->gui_wms_sldurl = $currentWms->gui_wms_sldurl;
 			$wms->gui_wms_visible = $currentWms->gui_wms_visible;
 			$wms->gui_wms_epsg = $currentWms->gui_wms_epsg;

Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php	2010-12-13 10:23:19 UTC (rev 7306)
+++ trunk/mapbender/http/classes/class_wmc.php	2010-12-14 10:53:41 UTC (rev 7307)
@@ -1682,7 +1682,7 @@
 			$wms->gui_wms_exceptionformat = "application/vnd.ogc.se_xml"; // TODO : Add correct data
 			$wms->gui_wms_epsg = $this->mainMap->getEpsg();
 			$wms->gui_wms_visible = $currentLayer["extension"]["WMS_VISIBLE"];
-			$wms->gui_wms_opacity = 100; // TODO : Add correct data
+			$wms->gui_wms_opacity = $currentLayer["extension"]["GUI_WMS_OPACITY"];
 			$wms->gui_wms_sldurl = $currentLayer["style"][$styleIndex]["sld_url"];
 			$wms->wms_srs = $currentLayer["epsg"];
 			$wms->gui_epsg = $currentLayer["epsg"];

Modified: trunk/mapbender/http/classes/class_wmcToXml.php
===================================================================
--- trunk/mapbender/http/classes/class_wmcToXml.php	2010-12-13 10:23:19 UTC (rev 7306)
+++ trunk/mapbender/http/classes/class_wmcToXml.php	2010-12-14 10:53:41 UTC (rev 7307)
@@ -421,7 +421,8 @@
 		$layerExtensionData["gui_queryable"] = $currentLayer->gui_layer_queryable;
 		$layerExtensionData["gui_status"] = $currentLayer->gui_layer_status;
 		$layerExtensionData["layer_epsg"] = $currentLayer->layer_epsg;
-	
+		$layerExtensionData["gui_wms_opacity"] = $currentWms->gui_wms_opacity;
+		
 		for ($i = 0; $i < count($currentWms->gui_epsg); $i++) {
 			$found = false;
 			for ($j = 0; $j < count($layerExtensionData["layer_epsg"]); $j++) {