[Mapbender-commits] r3171 - in branches/beck_dev: . gazetteer_rostock2

[svn_mapbender at osgeo.org]

Author: beck
Date: 2008-11-04 03:48:48 -0500 (Tue, 04 Nov 2008)
New Revision: 3171

Added:
   branches/beck_dev/gazetteer_rostock2/
Modified:
   branches/beck_dev/gazetteer_rostock2/mod_WFSStreetGaz_client.js
   branches/beck_dev/gazetteer_rostock2/mod_WFSStreetGaz_client.php
Log:


Copied: branches/beck_dev/gazetteer_rostock2 (from rev 3160, branches/beck_dev/http/gazetteer_rostock)

Modified: branches/beck_dev/gazetteer_rostock2/mod_WFSStreetGaz_client.js
===================================================================
--- branches/beck_dev/http/gazetteer_rostock/mod_WFSStreetGaz_client.js	2008-10-31 10:54:11 UTC (rev 3160)
+++ branches/beck_dev/gazetteer_rostock2/mod_WFSStreetGaz_client.js	2008-11-04 08:48:48 UTC (rev 3171)
@@ -119,7 +119,7 @@
 var deleteHighlight = function(argObj){
 	var geomIndex = argObj.geomIndex;
 	var geomArray = argObj.geomArray;
-	var highlightObj = argObj.highlightObj;
+	var highlightObj = argObj.highlightObj;
 
 //	var cw_fillcolor = "#cc33cc";
 	var cw_fillcolor = "#0000ff";
@@ -127,13 +127,15 @@
 	highlightObj.clean();
 //	highlightObj.del(currentGeom, cw_fillcolor);
 //	highlightObj.paint();
+/*
 	try {
 		var highlightObjTemp = argObj.highlightObjTemp;
 		highlightObjTemp.clean();
 	}
 	catch(e) {
 		//console.log("Ein Fehler ist aufgetreten: %s", e);
-	}
+	}
+*/
 };
 
 var displayHighlight = function(argObj){
@@ -144,7 +146,8 @@
 //	var cw_fillcolor = "#cc33cc";
 	var cw_fillcolor = "#0000ff";
 	var currentGeom = geomArray.get(geomIndex);
-	highlightObj.add(currentGeom, cw_fillcolor); highlightObj.paint();
+	highlightObj.add(currentGeom, cw_fillcolor);
+	highlightObj.paint();
 };
 
 var zoomToGeom = function(argObj){
@@ -296,7 +299,7 @@
 	$("#button2").css({"left":"0"});
 	$("#feld2").attr('disabled','');
 	$("#feld2").focus();
-//	$("#td_h").empty();
+	$("#td_h").empty();
 	wfsSearchStr = nextWfsUrl;
 }
 
@@ -309,7 +312,7 @@
 function transferStrResult(resultFill,nextSearchAttr,nextWfsUrl){
 	var searchResult = resultFill;
 	$("#feld2").attr({"value":""+searchResult+""});
-//	$("#td_h").empty();
+	$("#td_h").empty();
 	propertyName2 = [];
 	searchValue2 = [];
 	propertyName2[0] = propNameStr3;
@@ -328,7 +331,7 @@
  */
  
  function validate2(propertyName2,searchValue2,wfsUrl,searchAbbr){
- 	$("#td_h").empty();
+// 	$("#td_h").empty();
  	if(geomArray2.count()>0){
  		geomArray2.empty();
  	}
@@ -476,7 +479,7 @@
 									"geomArray":geomArray2,
 									"eventAction":"over",
 									"targetArray":targetArray2,
-									"highlightObj":global_resultHighlight1
+									"highlightObj":global_resultHighlight1
 								});
 							});
 							$("#"+geomStr).mouseout( function() { 
@@ -499,6 +502,7 @@
 									"zoomTo":"1.0",
 									"offsetParam":offsetParamStr
 								});
+								$(this).css('color','inherit');
 								$(this).clone().prependTo('#td_h');
 							});
 						})();	
@@ -536,16 +540,16 @@
 									"geomArray":geomArray2,
 									"eventAction":"over",
 									"targetArray":targetArray2,
-									"highlightObj":global_resultHighlight1
-								});
+									"highlightObj":global_resultHighlight2
+								});
 							});
-							$("#"+geomStr).mouseout( function() { 
+							$("#"+geomStr).mouseout( function() { 
 								eventGazResOut.trigger({
 									"geomIndex":geomIndex,
 									"geomArray":geomArray2,
 									"eventAction":"out",
 									"targetArray":targetArray2,
-									"highlightObj":global_resultHighlight1
+									"highlightObj":global_resultHighlight2
 								});
 							});
 							$("#"+geomStr).click( function() { 
@@ -563,7 +567,7 @@
 					}
 				}
 				if(geomArray2.count()==0){
-//					$("#td_h").empty();
+					$("#td_h").empty();
 					$("<div>").attr({"id":"noResult"}).appendTo("#td_h");
 					if(searchAbbr==shortName2[0]){
 						$("#noResult").text(noResultText2[0]);
@@ -577,7 +581,7 @@
 				}
 			}
 			else {
-//				$("#td_h").empty();
+				$("#td_h").empty();
 
 				$("<div>").attr({"id":"noResult"}).appendTo("#td_h");
 				if(searchAbbr==shortName2[0]){

Modified: branches/beck_dev/gazetteer_rostock2/mod_WFSStreetGaz_client.php
===================================================================
--- branches/beck_dev/http/gazetteer_rostock/mod_WFSStreetGaz_client.php	2008-10-31 10:54:11 UTC (rev 3160)
+++ branches/beck_dev/gazetteer_rostock2/mod_WFSStreetGaz_client.php	2008-11-04 08:48:48 UTC (rev 3171)
@@ -22,7 +22,7 @@
 echo "var e_id2 = '".$e_id."';";
 echo "var resultGeom2 = '';";
 echo "var geomArray2 = new GeometryArray();";
-echo "var geomArray3 = new GeometryArray();";
+echo "var geomArray3 = new GeometryArray();";
 
 echo "var wfsSearchOrt = 'http://geoportal.rostock.de/geoserver_hro/wfs?SERVICE=WFS&VERSION=1.0.0&REQUEST=getFeature&TYPENAME=hro:orte_sort';";
 echo "var wfsSearchStr = 'http://geoportal.rostock.de/geoserver_hro/wfs?SERVICE=WFS&VERSION=1.0.0&REQUEST=getFeature&TYPENAME=hro:str_dbr_sort';";