[Mapbender-commits] r6055 - in trunk/mapbender: http/javascripts resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2010-05-03 04:40:00 -0400 (Mon, 03 May 2010)
New Revision: 6055

Modified:
   trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql
Log:
added possibility to remove spatialRequestHighlight in gazetteerWFS when firing search as element var for gazetteerWFS

Modified: trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2010-04-30 14:29:21 UTC (rev 6054)
+++ trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2010-05-03 08:40:00 UTC (rev 6055)
@@ -77,6 +77,10 @@
  * > 'enableSearchWithoutParams', '0', 
  * > 'define that search can be started without any search params' ,
  * > 'var');
+ * >
+ * > INSERT INTO gui_element_vars (fkey_gui_id, fkey_e_id, var_name, 
+ * > var_value, context, var_type) VALUES('<appId>', 'gazetteerWFS', 
+ * > 'removeSpatialRequestHighlight', '0', 'remove spatialrequest highlighting when firing search' ,'var');
  *
  * Help:
  * http://www.mapbender.org/GazetteerWFS
@@ -91,6 +95,7 @@
  * initializeOnLoad - start gazetteer onload
  * enableSearchWithoutParams - define that search can be started without any 
  * 			search params
+ * removeSpatialRequestHighlight - remove spatialrequest highlighting when firing search
  *
  * License:
  * Copyright (c) 2009, Open Source Geospatial Foundation
@@ -126,6 +131,9 @@
 // Element var to allow search without any search params
 try {if(enableSearchWithoutParams){}}catch(e) {enableSearchWithoutParams = 0;}
 
+//Element var to remove spatialrequest highlighting when firing search
+try {if(removeSpatialRequestHighlight){}}catch(e) {removeSpatialRequestHighlight = 0;}
+
 var targetArray = targetString.split(",");
 var global_wfsConfObj;
 var global_selectedWfsConfId;
@@ -969,6 +977,11 @@
 	//close old dialogs 
 	parent.$('.resultList').dialog('close');
 	parent.$('.infoPopup').dialog('close');
+
+	if(removeSpatialRequestHighlight == 1) { 
+		requestGeometryHighlight.clean();
+		requestGeometryHighlight.paint();
+	}
 	
 	var filterParameterCount = getNumberOfFilterParameters();
 	

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql	2010-04-30 14:29:21 UTC (rev 6054)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql	2010-05-03 08:40:00 UTC (rev 6055)
@@ -2373,6 +2373,6 @@
 INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) VALUES('admin1','deleteWFSConf',2,1,'delete wfs conf','','a','','href = "../javascripts/mod_deleteWfsConf_client.html" target="AdminFrame"',10,1204,250,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','DELETE WFS CONF','a','','','','AdminFrame','');
 --
 
+-- element var removeSpatialRequestHighlight for gazetteerWFS
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) SELECT gui_element.fkey_gui_id, 'gazetteerWFS', 'removeSpatialRequestHighlight', '0', 'remove spatialrequest highlighting when firing search' ,'var' FROM gui_element WHERE gui_element.e_id = 'gazetteerWFS' AND gui_element.fkey_gui_id NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'removeSpatialRequestHighlight' AND fkey_e_id = 'gazetteerWFS');
 
-
-