[Mapbender-commits] r8415 - branches/2.7/http/classes

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2012-07-05 07:16:54 -0700 (Thu, 05 Jul 2012)
New Revision: 8415

Modified:
   branches/2.7/http/classes/class_wms.php
Log:
check affected EPSG for WMS 1.3 with function check_epsg_wms_13($someEPSG) from core/epsg.php instead of between 4000 and 5000

Modified: branches/2.7/http/classes/class_wms.php
===================================================================
--- branches/2.7/http/classes/class_wms.php	2012-07-05 14:14:43 UTC (rev 8414)
+++ branches/2.7/http/classes/class_wms.php	2012-07-05 14:16:54 UTC (rev 8415)
@@ -982,14 +982,14 @@
 					$cnt_epsg++;
 					$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["epsg"] = $element[attributes][CRS];
 					$tmp_epsg = $element[attributes][CRS];
-					$tmp_epsg = str_replace('CR:','',str_replace ( 'EPSG:', '', $tmp_epsg ));
-					if ($tmp_epsg >= 4000 && $tmp_epsg < 5000){
-					#if(check_epsg_wms_13($tmp_epsg))
+					$tmp_epsg = str_replace('CRS:','',str_replace ( 'EPSG:', '', $tmp_epsg ));
+					if(check_epsg_wms_13($tmp_epsg)){
 						$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["minx"] = $element[attributes][miny];
 						$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["miny"] = $element[attributes][minx];
 						$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["maxx"] = $element[attributes][maxy];
 						$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["maxy"] = $element[attributes][maxx];
 					}else{
+						$e = new mb_exception("class_wms: createObjFromXML: WMS 1.3.0 ELSE");
 						$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["minx"] = $element[attributes][minx];
 						$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["miny"] = $element[attributes][miny];
 						$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["maxx"] = $element[attributes][maxx];