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

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2010-11-24 08:17:10 -0800 (Wed, 24 Nov 2010)
New Revision: 7157

Modified:
   trunk/mapbender/http/classes/class_map.php
Log:
added function wrapJsInTryCatch to check whether application contains an overview

Modified: trunk/mapbender/http/classes/class_map.php
===================================================================
--- trunk/mapbender/http/classes/class_map.php	2010-11-24 14:46:04 UTC (rev 7156)
+++ trunk/mapbender/http/classes/class_map.php	2010-11-24 16:17:10 UTC (rev 7157)
@@ -611,6 +611,9 @@
 		return $currentMap;
 	}
 
+	private function wrapJsInTryCatch ($js) {
+		return "try { " . $js . "} catch (e) {}";
+	}
 
 	// ------------------------------------------------------------------------
 	// Output
@@ -627,26 +630,39 @@
 			$this->frameName . "'];" .
 			"currentWmcMap.elementName = '" . $this->frameName . "';" . 
 			"currentWmcMap.setWidth(" . $this->width . ");" . 
-			"currentWmcMap.setHeight(" . $this->height . ");"; 
+			"currentWmcMap.setHeight(" . $this->height . ");";
+		$registerMapString = $this->isOverview() ? 
+			$this->wrapJsInTryCatch($registerMapString) : $registerMapString; 
 		array_push($jsCodeArray, $registerMapString);
-
+		
+		$emptyDivInMapString = "$('#' + currentWmcMap.elementName).css({border: '0px solid'}).children().empty();";
+		$emptyDivInMapString = $this->isOverview() ? 
+			$this->wrapJsInTryCatch($emptyDivInMapString) : $emptyDivInMapString; 
+		array_push($jsCodeArray, $emptyDivInMapString);
+		
 		// if map is overview...
 		if ($this->isOverview) {
 			// ...set overview flag
 			$setOverviewFlagString = "currentWmcMap.isOverview = true;";
-			array_push($jsCodeArray, $setOverviewFlagString);
+			array_push($jsCodeArray, $this->wrapJsInTryCatch($setOverviewFlagString));
 		}
 
 		// calculate extent
 		$calcExtentString = "currentWmcMap.setSrs(" . 
 			$this->extent->toJavaScript() .
 			");";
-		array_push($jsCodeArray, $calcExtentString);
+		$calcExtentString = $this->isOverview() ? 
+			$this->wrapJsInTryCatch($calcExtentString) : $calcExtentString; 
+			array_push($jsCodeArray, $calcExtentString);
 		
 		$setWmsString = "currentWmcMap.setWms(" . $wmsJson . ");";
+		$setWmsString = $this->isOverview() ? 
+			$this->wrapJsInTryCatch($setWmsString) : $setWmsString; 
 		array_push($jsCodeArray, $setWmsString);
 		
 		$initWmsString = "currentWmcMap.initializeWms();";
+		$initWmsString = $this->isOverview() ? 
+			$this->wrapJsInTryCatch($initWmsString) : $initWmsString; 
 		array_push($jsCodeArray, $initWmsString);
 
 		return $jsCodeArray;