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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-09-24 07:56:42 +0000 (Fri, 24 Sep 2010)
New Revision: 6939

Modified:
   trunk/mapbender/http/classes/class_wms.php
Log:
equals method of WMS is now defined looser. Only the getmap URL must match

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2010-09-24 07:41:09 UTC (rev 6938)
+++ trunk/mapbender/http/classes/class_wms.php	2010-09-24 07:56:42 UTC (rev 6939)
@@ -330,7 +330,10 @@
 		// If the layer count is different, the WMS are not equal.
 		if (count($this->objLayer) != count($anotherWms->objLayer)) {
 //			$e = new mb_notice($this . " != " . $anotherWms . " (layer count: " . count($this->objLayer) . ":" . count($anotherWms->objLayer). ")");
-			return false;
+// removing this check because you can also load single layers of WMS!
+// so you might load different layers of the WMS at different times,
+// they need to be grouped under the same WMS
+//			return false;
 		}
 		
 		// If the layer names are different, the WMS are not equal.
@@ -339,7 +342,10 @@
 			$name2 = $anotherWms->objLayer[$i]->layer_name;
 			if ($name1 != $name2) {
 //				$e = new mb_notice($this . " != " . $anotherWms . " (layer names, " . $name1 . " vs. " . $name2 . ")");
-				return false;
+// removing this check because you can also load single layers of WMS!
+// so you might load different layers of the WMS at different times,
+// they need to be grouped under the same WMS
+//				return false;
 			}
 		}