[Mapbender-commits] r9893 - trunk/mapbender/http/extensions/mapserver

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-04-12 07:16:50 -0700 (Thu, 12 Apr 2018)
New Revision: 9893

Modified:
   trunk/mapbender/http/extensions/mapserver/class_mapserver_layer.php
   trunk/mapbender/http/extensions/mapserver/class_mapserver_layer_metadata.php
   trunk/mapbender/http/extensions/mapserver/class_mapserver_map.php
   trunk/mapbender/http/extensions/mapserver/class_mapserver_map_metadata.php
Log:
Alter mapfile generator classes to support mapserver > 7.0.4 (debian 9)

Modified: trunk/mapbender/http/extensions/mapserver/class_mapserver_layer.php
===================================================================
--- trunk/mapbender/http/extensions/mapserver/class_mapserver_layer.php	2018-03-26 15:43:55 UTC (rev 9892)
+++ trunk/mapbender/http/extensions/mapserver/class_mapserver_layer.php	2018-04-12 14:16:50 UTC (rev 9893)
@@ -7,6 +7,9 @@
     public $connection;
     public $connectiontype;
     public $data;
+    public $template;
+    public $dump;
+    public $tolerance;
     public $processing;
     public $status;
     public $labelitem;
@@ -22,6 +25,9 @@
 					"connection",
 					"connectiontype",
 					"data",
+					"template",
+					"dump",
+					"tolerance",
 					"processing",
 					"status",
 					"labelitem",

Modified: trunk/mapbender/http/extensions/mapserver/class_mapserver_layer_metadata.php
===================================================================
--- trunk/mapbender/http/extensions/mapserver/class_mapserver_layer_metadata.php	2018-03-26 15:43:55 UTC (rev 9892)
+++ trunk/mapbender/http/extensions/mapserver/class_mapserver_layer_metadata.php	2018-04-12 14:16:50 UTC (rev 9893)
@@ -6,11 +6,29 @@
     public $ows_abstract;
     public $ows_keywordlist;
     public $ows_extent;
+    public $gml_featureid;
+    public $gml_include_items;
+    //public $wfs_enable_request;
+    public $gml_geometries;
+    public $gml_geometry_type;
+    public $gml_id_alias;
+    public $ows_metadataurl_format;
+    public $ows_metadataurl_href;
+    public $ows_metadataurl_type;
+
     public $printElements = 	array(	"ows_title",
 					"ows_srs",
 					"ows_abstract",
 					"ows_keywordlist",
-					"ows_extent"
+					"ows_extent",
+					"ows_metadataurl_format",
+					"ows_metadataurl_href",
+					"ows_metadataurl_type",
+					"gml_featureid",
+					"gml_include_items",
+					"gml_geometries",
+					"gml_geometry_type",
+					"gml_id_alias",
 				);
     
     public function printText() {

Modified: trunk/mapbender/http/extensions/mapserver/class_mapserver_map.php
===================================================================
--- trunk/mapbender/http/extensions/mapserver/class_mapserver_map.php	2018-03-26 15:43:55 UTC (rev 9892)
+++ trunk/mapbender/http/extensions/mapserver/class_mapserver_map.php	2018-04-12 14:16:50 UTC (rev 9893)
@@ -124,6 +124,11 @@
 				$text .= strtoupper($element)." ".$this->{$element}."\n";
 			}
 		}
+		if ($this->projection != null) {
+			$text .= "PROJECTION\n";
+			$text .= "  '".$this->projection."'\n";
+			$text .= "END\n";
+		}
 		foreach ($this->outputformat as $outputformat) {
 			$text .= $outputformat->printText();
 		}

Modified: trunk/mapbender/http/extensions/mapserver/class_mapserver_map_metadata.php
===================================================================
--- trunk/mapbender/http/extensions/mapserver/class_mapserver_map_metadata.php	2018-03-26 15:43:55 UTC (rev 9892)
+++ trunk/mapbender/http/extensions/mapserver/class_mapserver_map_metadata.php	2018-04-12 14:16:50 UTC (rev 9893)
@@ -23,6 +23,15 @@
     public $wms_contactvoicetelephone;
     public $wms_enable_request;
     public $wms_encoding;
+    public $wms_feature_info_mime_type;
+    //public $wfs_title;
+    //public $wfs_abstract;
+    public $wfs_enable_request;//" "*"  # necessary
+    public $wfs_maxfeatures;//" "1000"# example
+    public $wfs_namespace_prefix;//" "baugb_offenlage"
+    public $wfs_namespace_uri;//" "http://www.geoportal.rlp.de/baugb/offenlagen"
+    public $wfs_encoding; //"UTF-8"
+    public $wfs_getfeature_formatlist; //"OGRGML,CSV"
 
     public $printElements = 	array(	"ows_title",
 					"ows_srs",
@@ -41,10 +50,20 @@
          				"ows_contactperson",
          				"ows_contactorganization",
          				"ows_contactposition", 						
-					"ows_contactelectronicmailaddress",	 						"wms_contactfacsimiletelephones",
+					"ows_contactelectronicmailaddress",	 						
+                                        "wms_contactfacsimiletelephones",
     					"wms_contactvoicetelephone",
     					"wms_enable_request",
-    					"wms_encoding"
+    					"wms_encoding",
+					"wms_feature_info_mime_type",
+					//"wfs_title",
+					//"wfs_abstract",
+					"wfs_enable_request",
+					"wfs_maxfeatures",
+					"wfs_namespace_prefix",
+					"wfs_namespace_uri",
+					"wfs_encoding",
+					"wfs_getfeature_formatlist",
 				);
     
     public function printText() {