[Mapbender-commits] r8458 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2012-08-17 00:30:33 -0700 (Fri, 17 Aug 2012)
New Revision: 8458

Modified:
   trunk/mapbender/http/php/mod_inspireDownloadFeed.php
Log:
Alter INSPIRE download feed export to use defined pixels and features

Modified: trunk/mapbender/http/php/mod_inspireDownloadFeed.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2012-08-17 07:00:44 UTC (rev 8457)
+++ trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2012-08-17 07:30:33 UTC (rev 8458)
@@ -501,6 +501,7 @@
 			if (!is_int((integer)$mapbenderMetadata[$m]->spatial_res_value)) {
 				echo "<error>WMS footprints cannot be calculated, cause resolution is no integer.</error>";
 			} else {
+				$maxImageSize = (integer)$mapbenderMetadata[$m]->wms_max_imagesize;
 				//calculate the bboxes
 				//transform layer_bbox to mb_metadata epsg
 				/*$georssPolygon = $mapbenderMetadata["minx"]." ".$mapbenderMetadata["miny"]." ".$mapbenderMetadata["maxx"]." ".$mapbenderMetadata["miny"]." ";
@@ -589,6 +590,8 @@
 			$featureTypeBboxWGS84 = array();
 			//For each featuretype which was found! Maybe more than one!
 			for ($i = 0; $i < $countRessource; $i++) {
+				//overwrite feature count with information from database
+				$maxFeatureCount = (integer)$mapbenderMetadata[$i]->wfs_max_features;
 				$crs = $mapbenderMetadata[$i]->metadata_ref_system;
 				$e = new mb_notice("Ref system of featuretype ".$mapbenderMetadata[$i]->featuretype_name." : ".$crs);
 				$epsgId = explode(':',$crs);
@@ -1058,6 +1061,7 @@
 		$mapbenderMetadata[$indexMapbenderMetadata]->datalink_url = $row['datalink_url'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->wms_getmap = $row['wms_getmap'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->wms_version = $row['wms_version'];
+		$mapbenderMetadata[$indexMapbenderMetadata]->wms_max_imagesize = $row['wms_max_imagesize'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->layer_name = $row['layer_name'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->datalink_format = $row['datalink_format'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->metadata_ref_system = $row['metadata_ref_system'];
@@ -1070,6 +1074,7 @@
 		$mapbenderMetadata[$indexMapbenderMetadata]->wfs_abstract = $row['wfs_abstract'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->wfs_getfeature = $row['wfs_getfeature'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->wfs_version = $row['wfs_version'];
+		$mapbenderMetadata[$indexMapbenderMetadata]->wfs_max_features = $row['wfs_max_features'];
 		//$mapbenderMetadata[$indexMapbenderMetadata]->format = $row['format'];
 		//check if codespace was given in metadata or it must be generated from uuid and default codespace
 		if (($mapbenderMetadata[$indexMapbenderMetadata]->datasetid_codespace == '' or !isset($mapbenderMetadata[$indexMapbenderMetadata]->datasetid_codespace)) or ($mapbenderMetadata[$indexMapbenderMetadata]->datasetid == '' or !isset($mapbenderMetadata[$indexMapbenderMetadata]->datasetid))) {