[Mapbender-commits] r5312 - branches/2.6/http/classes

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-01-13 06:05:18 -0500 (Wed, 13 Jan 2010)
New Revision: 5312

Modified:
   branches/2.6/http/classes/class_wms.php
Log:


Modified: branches/2.6/http/classes/class_wms.php
===================================================================
--- branches/2.6/http/classes/class_wms.php	2010-01-13 11:04:50 UTC (rev 5311)
+++ branches/2.6/http/classes/class_wms.php	2010-01-13 11:05:18 UTC (rev 5312)
@@ -1024,23 +1024,34 @@
 						$str .= "parent.";
 					}
 					$str .= "wms_addSRS('". 
-						$this->objLayer[$i]->layer_epsg[$j]["epsg"] ."','". 
-						$this->objLayer[$i]->layer_epsg[$j]["minx"] ."','". 
-						$this->objLayer[$i]->layer_epsg[$j]["miny"] ."','". 
-						$this->objLayer[$i]->layer_epsg[$j]["maxx"] ."','". 
-						$this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');";
+						$this->objLayer[$i]->layer_epsg[$j]["epsg"] ."',". 
+						$this->objLayer[$i]->layer_epsg[$j]["minx"] .",". 
+						$this->objLayer[$i]->layer_epsg[$j]["miny"] .",". 
+						$this->objLayer[$i]->layer_epsg[$j]["maxx"] .",". 
+						$this->objLayer[$i]->layer_epsg[$j]["maxy"] .");";
 				}
 				if($parent){
 					$str .=  "parent.";
 				}
 				$str .= "layer_addEpsg('". 
-					$this->objLayer[$i]->layer_epsg[$j]["epsg"] ."','". 
-					$this->objLayer[$i]->layer_epsg[$j]["minx"] ."','". 
-					$this->objLayer[$i]->layer_epsg[$j]["miny"] ."','". 
-					$this->objLayer[$i]->layer_epsg[$j]["maxx"] ."','". 
-					$this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');";
+					$this->objLayer[$i]->layer_epsg[$j]["epsg"] ."',". 
+					$this->objLayer[$i]->layer_epsg[$j]["minx"] .",". 
+					$this->objLayer[$i]->layer_epsg[$j]["miny"] .",". 
+					$this->objLayer[$i]->layer_epsg[$j]["maxx"] .",". 
+					$this->objLayer[$i]->layer_epsg[$j]["maxy"] .");";
 			}
 			for($j=0; $i==0 && $j<count($this->wms_srs);$j++){
+				$found = false;
+				for ($k = 0; $k < count($this->objLayer[$i]->layer_epsg); $k++){
+					if ($this->objLayer[$i]->layer_epsg[$k]["epsg"] === $this->wms_srs[$j]) {
+						$found = true;
+						break;
+					}
+				}
+				if ($found) {
+					continue;
+				}
+				
 				if($parent){
 					$str .= "parent.";
 				}
@@ -1056,7 +1067,7 @@
 					"', ".$j.
 					",".$i.
 					",'".$this->objLayer[$i]->layer_style[$j]["legendurl"].
-					"', '".$this->objLayer[$i]->layer_style[$j]["legendformat"]."');";
+					"', '".$this->objLayer[$i]->layer_style[$j]["legendurlformat"]."');";
 			}
 		}
 		return $str;
@@ -1148,7 +1159,7 @@
 				if($parent){
 				echo "parent.";
 				}
-				print("wms_addLayerStyle('".$this->objLayer[$i]->layer_style[$j]["name"]."', '".$this->objLayer[$i]->layer_style[$j]["title"]."', ".$j.",".$i.",'".$this->objLayer[$i]->layer_style[$j]["legendurl"]."', '".$this->objLayer[$i]->layer_style[$j]["legendformat"]."');");
+				print("wms_addLayerStyle('".$this->objLayer[$i]->layer_style[$j]["name"]."', '".$this->objLayer[$i]->layer_style[$j]["title"]."', ".$j.",".$i.",'".$this->objLayer[$i]->layer_style[$j]["legendurl"]."', '".$this->objLayer[$i]->layer_style[$j]["legendurlformat"]."');");
 			}
 		   }	
 		}