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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2017-09-29 04:52:04 -0700 (Fri, 29 Sep 2017)
New Revision: 9789

Modified:
   trunk/mapbender/http/php/mod_inspireDownloadFeed.php
Log:
Fix for fes in wfs 2.0 bbox filter

Modified: trunk/mapbender/http/php/mod_inspireDownloadFeed.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2017-09-29 11:40:12 UTC (rev 9788)
+++ trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2017-09-29 11:52:04 UTC (rev 9789)
@@ -1373,10 +1373,19 @@
 	</fes:Filter>
 					*/
 					$currentBbox = explode(',',$bboxWfs[$mapbenderMetadata[$i]->featuretype_name][$l]);
+					$mapbenderMetadata[$i]->featuretype_name;
+					if (strpos($mapbenderMetadata[$i]->featuretype_name, ':') !== false) {
+						$ftNamespace = explode(':', $mapbenderMetadata[$i]->featuretype_name);
+						$ftNamespace = $ftNamespace[0];
+						$geometryFieldName = $ftNamespace.':'.$mapbenderMetadata[$i]->geometry_field_name[0];
+					} else {
+						$ftNamespace = false;
+						$geometryFieldName = $mapbenderMetadata[$i]->geometry_field_name[0];
+					}
 					switch ($mapbenderMetadata[$i]->wfs_version) {
 						case "2.0.0":
 							$bboxFilter = '<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0"><fes:BBOX>';
-							$bboxFilter .= '<fes:PropertyName>'.$mapbenderMetadata[$i]->geometry_field_name[0].'</fes:PropertyName>';
+							$bboxFilter .= '<fes:ValueReference>'.$geometryFieldName.'</fes:ValueReference>';
 							//<gml:Envelope srsName="urn:ogc:def:crs:EPSG::1234">
 							$bboxFilter .= '<gml:Envelope xmlns:gml="http://www.opengis.net/gml/3.2" srsName="'.$crs.'">';
 							//FIX for ESRI? TODO
@@ -1389,7 +1398,7 @@
 							break;
 						case "2.0.2":
 							$bboxFilter = '<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0"><fes:BBOX>';
-							$bboxFilter .= '<fes:PropertyName>'.$mapbenderMetadata[$i]->geometry_field_name[0].'</fes:PropertyName>';
+							$bboxFilter .= '<fes:ValueReference>'.$geometryFieldName.'</fes:ValueReference>';
 							//<gml:Envelope srsName="urn:ogc:def:crs:EPSG::1234">
 							$bboxFilter .= '<gml:Envelope xmlns:gml="http://www.opengis.net/gml/3.2" srsName="'.$crs.'">';
 							//FIX for ESRI? TODO