[Mapbender-commits] r7429 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: kmq
Date: 2011-01-07 06:58:50 -0800 (Fri, 07 Jan 2011)
New Revision: 7429

Modified:
   trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
Log:
use resultList instead for displaying results

Modified: trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php	2011-01-07 14:41:00 UTC (rev 7428)
+++ trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php	2011-01-07 14:58:50 UTC (rev 7429)
@@ -865,9 +865,10 @@
  	}
 	
 	// empty the result geometry
-	if(geomArray != null && geomArray.count()>0){
- 		geomArray.empty();
- 	}
+// geomArray not used any more
+//	if(geomArray != null && geomArray.count()>0){
+// 		geomArray.empty();
+// 	}
 	
 	// set the Highlight object for the result geometry
 	var styleProperties = {"position":"absolute", "top":"0px", "left":"0px", "z-index":100};
@@ -912,9 +913,7 @@
 	       		if (!exportToShape) {
 	       			if (jsCode) {
 			        	if (typeof(geoObj) == 'object') {
-							geomArray = new parent.GeometryArray();
-							geomArray.importGeoJSON(geoObj);
-							displayPopup(geomArray);
+							displayPopup(geoObj);
 						}
 						else {
 							displayPopup();
@@ -958,9 +957,7 @@
 		       		if (!exportToShape) {
 		       			if (jsCode) {
 				        	if (typeof(geoObj) == 'object') {
-								geomArray = new parent.GeometryArray();
-								geomArray.importGeoJSON(geoObj);
-								displayPopup(geomArray);
+								displayPopup(geoObj);
 							}
 							else {
 								displayPopup();
@@ -1041,6 +1038,17 @@
 function displayPopup(geom){
 	geomArray = geom;
 
+	if(!parent.$("#resultList")){
+		return;
+	}
+	var resultList = parent.$('#resultList').mapbender();
+	resultList.clear();
+	resultList.setTitle(global_wfsConfObj[global_selectedWfsConfId].wfs_conf_abstract);
+	resultList.setWFSconf(global_wfsConfObj[global_selectedWfsConfId]);
+	resultList.addFeatureCollection(geom);
+	resultList.show();
+	return;
+
 	var contentHtml = "Kein Ergebnis";
 	if (geomArray != null && geomArray.count() > 0){
 		contentHtml = createListOfGeometries();