Index: trunk/src/map/inc/nodemapWL.js
===================================================================
--- trunk/src/map/inc/nodemapWL.js	(revision 7808)
+++ trunk/src/map/inc/nodemapWL.js	(revision 7809)
@@ -1,4 +1,5 @@
 //Declaring some variables we will be using
 var gmap_search_state = false;
+
 var map;
 var markerArray = new Array();
@@ -8,5 +9,5 @@
 var selected = false;
 var overNode;
-var markerSelected;
+var markerSelected = "";
 var polygons_on_map_array = new Array();
 
@@ -14,5 +15,4 @@
 //This function is called from index.php
 function initialize_map() {
-	suggestMarkers("");
 	//We will only do this function if the browser is compatible
 	if (GBrowserIsCompatible()) {
@@ -45,4 +45,5 @@
 	
 	var markerClusterer = new MarkerClusterer(map, markerArray);
+	suggestMarkers("");
   }
 } 
@@ -136,9 +137,10 @@
 		//Make 'markers' array (containing gmarkers) into an array containing only the titles(names) of the markers
 		var markerTitles = new Array;
-		
+		var markerLatLngs = new Array;
 		
 		for(var i=0; i<markers.length; i++) {
 			
 			markerTitles.push(markers[i].marker.getTitle());
+			markerLatLngs.push(markers[i].marker.getLatLng() );
 		}
 
@@ -161,5 +163,5 @@
 
 			map.addOverlay(polygon);
-			
+			polygons_on_map_array.push(polygon);
 		}
 		
@@ -198,31 +200,6 @@
 	//Make 'markers' array (containing gmarkers) into an array containing only the titles(names) of the markers
 	var markerTitles = new Array;
-	var markerLatLngs = new Array;
-	
 	for(var i=0; i<markers.length; i++) {
-		markerTitles.push(markers[i].marker.getTitle());		
-		markerLatLngs.push(markers[i].marker.getLatLng() );
-	}
-
-
-	
-	
-	var polygons_on_map_array = new Array;
-	for (var i=0; i<markerLatLngs.length; i++)
-	{
-		latLng = String(markerLatLngs[i]);	
-					
-		pos = latLng.indexOf(',');
-		pos2 = latLng.length-1;
-		
-		var latitude = Number(latLng.substring(1, pos) );
-		var longitude = Number(latLng.substring(2 + pos, pos2) );
-		
-		
-		polygons_on_map_array.push( drawCircle( latitude, longitude,2.0, "#6C3", 1, 0.75, "#0F0",.2) );
-		
-
-
-		map.addOverlay(polygons_on_map_array[i]);
+		markerTitles.push(markers[i].marker.getTitle());
 		
 	}
@@ -250,8 +227,4 @@
 {
 	
-	
-	deSelect();
-
-	
 	//TODO DELETE ALL CIRCLES 
 	
@@ -274,19 +247,15 @@
 function deSelect()
 {
-	
-	map.removeOverlay(polygon);
+	selected = false;
+	
+	loadXMLDoc("inc/node_info.php");
+	if(!markerSelected == "")
+		markerSelected.setImage("../img/sleutelGroen.png");
+	
 	for(var i=0; i<polygons_on_map_array.length; i++) 
 	{
-
 		var currentpolygon = polygons_on_map_array[i];
-		map.removeOverlay(polygon);
-	}
-	
-	
-	selected = false;
-	loadXMLDoc("inc/node_info.php");
-	markerSelected.setImage("../img/sleutelGroen.png");
-	
-
+		map.removeOverlay(currentpolygon);
+	}
 	
 }
@@ -379,26 +348,4 @@
 }
 
-function toggleGoogleSearchMap()
-{
-	if(gmap_search_state)
-	{
-		gmap_search_state = false;
-	}
-	else
-	{
-		gmap_search_state = true;
-	}
-	
-	if(gmap_search_state)
-	{
-		map.enableGoogleBar();
-	}
-	
-	if(!gmap_search_state)
-	{
-		map.disableGoogleBar();
-	}
-}
-
 function suggestMarkers(value)
 {
@@ -408,4 +355,2 @@
 
 
-
-
