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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-08-02 09:17:40 -0400 (Thu, 02 Aug 2007)
New Revision: 1572

Modified:
   trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
Log:
added filter parameter to wfs request

Modified: trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php	2007-08-02 13:14:01 UTC (rev 1571)
+++ trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php	2007-08-02 13:17:40 UTC (rev 1572)
@@ -408,7 +408,7 @@
 			}
 			filter += '</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs>';
 			filter += '</gml:Polygon></Within></ogc:Filter>';
-			mb_get_geom(url, filter, i, w_[i]);
+			mb_get_geom(url, filter, i, wfs_config[w_[i]]['featuretype_name'], w_[i], w[i]);
 		}
 	}
 	else if(queryGeom.geomType==geomType.line){
@@ -430,7 +430,7 @@
 			filter += rectangle[0].x+","+rectangle[0].y+ " " + rectangle[1].x+","+rectangle[1].y; 
 			filter += "</gml:coordinates></gml:Box></ogc:BBOX></ogc:Filter>";
 			url += param;
-			mb_get_geom(url, filter, i, w_[i]);
+			mb_get_geom(url, filter, i, wfs_config[w_[i]]['featuretype_name'], w_[i], w[i]);
 		}
 	}
 	else if(queryGeom.geomType == geomType.point){
@@ -451,16 +451,16 @@
 			filter += (tmp.x + buffer) + "," + (tmp.y + buffer) + " " + (tmp.x - buffer) + "," + (tmp.y + buffer) + " " + (tmp.x - buffer) + "," + (tmp.y - buffer); 
 			filter += "</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersects></ogc:Filter>";
 			url += param;
-			mb_get_geom(url, filter, i, w_[i]);
+			mb_get_geom(url, filter, i, wfs_config[w_[i]]['featuretype_name'], w_[i], w[i]);
 		}
 	}
 //	highlight = new Highlight(mb_wfs_targets, highlight_tag_id, {"position":"absolute", "top":"0px", "left":"0px", "z-index":generalHighlightZIndex}, generalHighlightLineWidth);
 	return true;
 }
 
-function mb_get_geom(url, filter, index, wfs_conf_id) {
+function mb_get_geom(url, filter, index, typename, js_wfs_conf_id, db_wfs_conf_id) {
 	
-	mb_ajax_post("../" + wfsResultModulePath + wfsResultModuleFilename,{'url':url,'filter':filter,'typename':wfs_config[wfs_conf_id]['featuretype_name'],'wfs_conf_id':wfs_conf_id},function(js_code,status){
+	mb_ajax_post("../" + wfsResultModulePath + wfsResultModuleFilename,{'url':url,'filter':filter,'typename':typename,'js_wfs_conf_id':js_wfs_conf_id, 'db_wfs_conf_id':db_wfs_conf_id},function(js_code,status){
 //		alert(js_code);
 		eval(js_code);
 		if (typeof(geom) == 'object') mb_execWfsReadSubFunctions(geom);