[Mapbender-commits] r6921 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-09-20 13:55:49 +0000 (Mon, 20 Sep 2010)
New Revision: 6921

Modified:
   trunk/mapbender/http/javascripts/initWmcObj.php
Log:
code conventions
refactoring according to v0.2.3 http://www.mapbender.org/index.php?title=GET-Parameter&oldid=16902

Modified: trunk/mapbender/http/javascripts/initWmcObj.php
===================================================================
--- trunk/mapbender/http/javascripts/initWmcObj.php	2010-09-20 13:38:54 UTC (rev 6920)
+++ trunk/mapbender/http/javascripts/initWmcObj.php	2010-09-20 13:55:49 UTC (rev 6921)
@@ -11,7 +11,8 @@
 
 //check if session contains a wmc, otherwise create a new wmc from application
 if (!Mapbender::session()->get("mb_wmc")) {
-	$e = new mb_notice("wmc not set, generating from app: " . Mapbender::session()->get("mb_user_gui"));
+	$e = new mb_notice("wmc not set, generating from app: " .
+			Mapbender::session()->get("mb_user_gui"));
 	$wmc->createFromApplication(Mapbender::session()->get("mb_user_gui"));
 }
 else {
@@ -67,7 +68,10 @@
 			if (array_key_exists('application', $multipleAssocArray) && 
 				array_key_exists('id', $multipleAssocArray)) {
 				$currentWms = new wms();	
-				$currentWms->createObjFromDB($multipleAssocArray['application'], $multipleAssocArray['id']);
+				$currentWms->createObjFromDB(
+					$multipleAssocArray['application'],
+					$multipleAssocArray['id']
+				);
 			}
 			//get WMS by URL
 			elseif (array_key_exists('url', $multipleAssocArray)) {
@@ -79,11 +83,13 @@
 			}
 			array_push($wmsArray, $currentWms);
 			
-			if($multipleAssocArray['visible'] && $multipleAssocArray['visible'] != "") {
-				$options['visible'] = $multipleAssocArray['visible'] === "true" ? true : false;
+			if($multipleAssocArray['visible']) {
+				$options['visible'] = $multipleAssocArray['visible'] === 1 ?
+					true : false;
 			}
-			if($multipleAssocArray['zoom'] && $multipleAssocArray['zoom'] != "") {
-				$options['zoom'] = $multipleAssocArray['zoom'] === "true" ? true : false;
+			if($multipleAssocArray['zoom']) {
+				$options['zoom'] = $multipleAssocArray['zoom'] === 1 ?
+					true : false;
 			}
 			
 			$wmc->mergeWmsArray($wmsArray, $options);
@@ -115,14 +121,19 @@
 	if (array_key_exists('application', $singleAssocArray) && 
 		array_key_exists('id', $singleAssocArray)) {
 		$currentWms = new wms();	
-		$currentWms->createObjFromDB($singleAssocArray['application'], $singleAssocArray['id']);
+		$currentWms->createObjFromDB(
+			$singleAssocArray['application'],
+			$singleAssocArray['id']
+		);
 		array_push($wmsArray, $currentWms);
-		if($singleAssocArray['visible'] && $singleAssocArray['visible'] != "") {
-			$options['visible'] = $singleAssocArray['visible'] === "true" ? true : false;
+		if($singleAssocArray['visible']) {
+			$options['visible'] = $singleAssocArray['visible'] === 1 ?
+				true : false;
 		}
 		
 		if($singleAssocArray['zoom'] && $singleAssocArray['zoom'] != "") {
-			$options['zoom'] = $singleAssocArray['zoom'] === "true" ? true : false;
+			$options['zoom'] = $singleAssocArray['zoom'] === 1 ?
+				true : false;
 		}
 		$wmc->mergeWmsArray($wmsArray, $options);
 		$wmsArray = array();
@@ -133,11 +144,13 @@
 		$currentWms = new wms();
 		$currentWms->createObjFromXML($singleAssocArray['url']);
 		array_push($wmsArray, $currentWms);
-		if($singleAssocArray['visible'] && $singleAssocArray['visible'] != "") {
-			$options['visible'] = $singleAssocArray['visible'] === "true" ? true : false;
+		if($singleAssocArray['visible']) {
+			$options['visible'] = $singleAssocArray['visible'] === 1 ?
+				true : false;
 		}
-		if($singleAssocArray['zoom'] && $singleAssocArray['zoom'] != "") {
-			$options['zoom'] = $singleAssocArray['zoom'] === "true" ? true : false;
+		if($singleAssocArray['zoom']) {
+			$options['zoom'] = $singleAssocArray['zoom'] === 1 ?
+				true : false;
 		}
 		$wmc->mergeWmsArray($wmsArray, $options);
 		$wmsArray = array();
@@ -170,7 +183,8 @@
 	
 	$wmc->generalExtensionArray['WFSCONFIDSTRING'] = implode(",", array_merge(
 		$wmc->generalExtensionArray['WFSCONFIDSTRING'] ? 
-			explode(",", $wmc->generalExtensionArray['WFSCONFIDSTRING']) : array(),
+			explode(",", $wmc->generalExtensionArray['WFSCONFIDSTRING']) :
+			array(),
 		$wfsConfIds
 	));
 }
@@ -186,7 +200,8 @@
 
 //workaround for zoom to WMS
 $extent = $wmc->mainMap->getExtent();
-Mapbender::session()->set("mb_myBBOX", $extent->min->x . "," . $extent->min->y . "," . $extent->max->x . "," . $extent->max->y);
+Mapbender::session()->set("mb_myBBOX", $extent->min->x . "," .
+	$extent->min->y . "," . $extent->max->x . "," . $extent->max->y);
 
 $outputString = "";
 for ($i = 0; $i < count($output); $i++) {