[Mapbender-commits] r7765 - in branches/2.7/http: javascripts php

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2011-04-12 05:30:43 -0700 (Tue, 12 Apr 2011)
New Revision: 7765

Modified:
   branches/2.7/http/javascripts/mod_wfs_SpatialRequest.php
   branches/2.7/http/php/mod_wfs_result.php
Log:
merged with revision 7764 from trunk

Modified: branches/2.7/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- branches/2.7/http/javascripts/mod_wfs_SpatialRequest.php	2011-04-12 12:22:25 UTC (rev 7764)
+++ branches/2.7/http/javascripts/mod_wfs_SpatialRequest.php	2011-04-12 12:30:43 UTC (rev 7765)
@@ -559,7 +559,8 @@
 			'filter' : filter,
 			'typename' : typename,
 			'js_wfs_conf_id' : js_wfs_conf_id, 
-			'db_wfs_conf_id' : db_wfs_conf_id
+			'db_wfs_conf_id' : db_wfs_conf_id,
+			'destSrs' : mod_wfs_spatialRequest_epsg
 		},
 		function(json,status){
 			var geom = new GeometryArray();

Modified: branches/2.7/http/php/mod_wfs_result.php
===================================================================
--- branches/2.7/http/php/mod_wfs_result.php	2011-04-12 12:22:25 UTC (rev 7764)
+++ branches/2.7/http/php/mod_wfs_result.php	2011-04-12 12:30:43 UTC (rev 7765)
@@ -28,6 +28,7 @@
 $filter = $_REQUEST["filter"];
 $db_wfs_conf_id = $_REQUEST["db_wfs_conf_id"];
 $typename = $_REQUEST["typename"];
+$destSrs = $_REQUEST["destSrs"];
 
 /**
  * checks if a variable name is valid.
@@ -108,7 +109,7 @@
 
 $myWfsFactory = new UniversalWfsFactory();
 $myWfs = $myWfsFactory->createFromDb($wfsId);
-$data = $myWfs->getFeature($typename, $filter);
+$data = $myWfs->getFeature($typename, $filter,$destSrs);
 
 if ($data === null) die('{}');