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

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2008-07-09 05:04:03 -0400 (Wed, 09 Jul 2008)
New Revision: 2628

Modified:
   trunk/mapbender/http/php/mod_wfs_gazetteer_server.php
Log:
get results from server as geoJSON

Modified: trunk/mapbender/http/php/mod_wfs_gazetteer_server.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_gazetteer_server.php	2008-07-09 08:59:49 UTC (rev 2627)
+++ trunk/mapbender/http/php/mod_wfs_gazetteer_server.php	2008-07-09 09:04:03 UTC (rev 2628)
@@ -94,7 +94,10 @@
 	
 	$obj = new WfsConf();
 	$obj->load($wfsConfIdArray);
-	echo $obj;
+
+	$json = new Services_JSON();
+	$output = $json->encode($obj->confArray);
+	echo $output;
 }
 else if ($command == "getSearchResults") {
 	$wfs_conf_id = $_REQUEST["wfs_conf_id"];
@@ -141,22 +144,10 @@
 	
 	$req = urldecode($url).urlencode($admin->char_decode(stripslashes($filter)));
 	$mygml = new gml2();
-	$mygml->parsegml($req);
+	$mygml->parseFile($req);
 	
-	// generates JavaScript code that will add a geometry array containing
-	// all the result geometries and their attributes (wfs_conf_elements)
-	
-	$js = "";
-	if ($mygml->getMemberCount() > 0) { 
-		$js .= $mygml->exportGeometriesToJS(true);
-	
-		for ($i = 0; $i < $mygml->getMemberCount(); $i++) {
-			for ($j = 0; $j < count($col); $j++){
-				$js .= "geom.get(".$i.").e.setElement('".$j."', '".$mygml->getValueBySeparatedKey($i, $col[$j]) . "');\n";
-			}
-		}
-	}
-	echo $js;
+	header("Content-type:application/x-json; charset=utf-8");
+	echo $mygml->toGeoJSON();
 }
 else {
 	echo "please enter a valid command.";