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

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2012-01-30 01:27:02 -0800 (Mon, 30 Jan 2012)
New Revision: 8238

Modified:
   branches/2.7/http/classes/class_wms.php
Log:
WMS1.3 modifications

Modified: branches/2.7/http/classes/class_wms.php
===================================================================
--- branches/2.7/http/classes/class_wms.php	2012-01-30 09:22:48 UTC (rev 8237)
+++ branches/2.7/http/classes/class_wms.php	2012-01-30 09:27:02 UTC (rev 8238)
@@ -1003,6 +1003,10 @@
 			$map_default = "PNG";
 			$featureinfo_default = "MIME";
 			$exception_default = "INIMAGE";
+		}elseif($this->wms_version == "1.3.0"){
+			$map_default = "image/png";
+			$featureinfo_default = "text/html";
+			$exception_default = "INIMAGE";
 		}
 		/*define defaults for wms-version 1.1.0 and 1.1.1*/
 		else{
@@ -3068,16 +3072,19 @@
 			$this->gui_wms_sldurl = $row["gui_wms_sldurl"];
 			
 			if($this->wms_version == "1.0.0"){
-                    $this->gui_wms_mapformat = "PNG";
-                    $this->gui_wms_featureinfoformat = "MIME";
-                    $this->gui_wms_exceptionformat = "INIMAGE";
-            }
-            /*define defaults for wms-version 1.1.0 and 1.1.1*/
-            else{
-                    $this->gui_wms_mapformat = "image/png";
-                    $this->gui_wms_featureinfoformat = "text/html";
-                    $this->gui_wms_exceptionformat = "application/vnd.ogc.se_inimage";
-            }
+			    $this->gui_wms_mapformat = "PNG";
+			    $this->gui_wms_featureinfoformat = "MIME";
+			    $this->gui_wms_exceptionformat = "INIMAGE";
+			}elseif($this->wms_version == "1.3.0"){
+			    $this->gui_wms_mapformat = "image/png";
+			    $this->gui_wms_featureinfoformat = "text/html";
+			    $this->gui_wms_exceptionformat = "INIMAGE";
+			/*define defaults for wms-version 1.1.0 and 1.1.1*/
+			}else{
+			    $this->gui_wms_mapformat = "image/png";
+			    $this->gui_wms_featureinfoformat = "text/html";
+			    $this->gui_wms_exceptionformat = "application/vnd.ogc.se_inimage";
+			}
 			
 			$count_wms++;
 		}