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

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2010-11-24 08:18:25 -0800 (Wed, 24 Nov 2010)
New Revision: 7158

Modified:
   trunk/mapbender/http/classes/class_wmc.php
Log:
added try/catch to check whether application contains an overview

Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php	2010-11-24 16:17:10 UTC (rev 7157)
+++ trunk/mapbender/http/classes/class_wmc.php	2010-11-24 16:18:25 UTC (rev 7158)
@@ -1079,26 +1079,26 @@
 		// set visibility of ov map WMS (may be different from main)
 		if ($this->overviewMap !== null) {
 			for ($i = 0; $i < count($ovWmsArray[$wmsIndexOverview]->objLayer); $i++) {
-				$visStr = "Mapbender.modules['".$this->overviewMap->getFrameName().
+				$visStr = "try { Mapbender.modules['".$this->overviewMap->getFrameName().
 					//					"'].wms[" .$wmsIndexOverview . "].handleLayer(" .
 					// The above doesn't work.
 					// But there is only one WMS in the overview anyway! The index 0 is hard wired for now.
 					"'].wms[0].handleLayer(" .
 					"'" . $ovWmsArray[$wmsIndexOverview]->objLayer[$i]->layer_name . "', " .
 					"'visible', " .
-					($ovWmsArray[$wmsIndexOverview]->objLayer[$i]->gui_layer_visible ? 1 : 0) . ");";
+					($ovWmsArray[$wmsIndexOverview]->objLayer[$i]->gui_layer_visible ? 1 : 0) . ")} catch (e) {};";
 				array_push($wmcJsArray, $visStr);
 			}
-			array_push($wmcJsArray, "Mapbender.modules['".$this->overviewMap->getFrameName().
-				"'].restateLayers(" . $ovWmsArray[$wmsIndexOverview]->wms_id . ");");
+			array_push($wmcJsArray, "try { Mapbender.modules['".$this->overviewMap->getFrameName().
+				"'].restateLayers(" . $ovWmsArray[$wmsIndexOverview]->wms_id . ");} catch (e) {};");
 		}
 
 		// .. request the map
 		array_push($wmcJsArray, "Mapbender.modules['".$this->mainMap->getFrameName().
 			"'].setMapRequest();");
 		if ($this->overviewMap !== null) {
-			array_push($wmcJsArray, "Mapbender.modules['".$this->overviewMap->getFrameName().
-				"'].setMapRequest();");
+			array_push($wmcJsArray, "try {Mapbender.modules['".$this->overviewMap->getFrameName().
+				"'].setMapRequest()} catch (e) {};");
 		}
 
 		array_push($wmcJsArray, "eventAfterLoadWMS.trigger();");