Changeset 7793 for trunk/src

Timestamp:

Apr 16, 2010, 4:31:42 PM (15 years ago)

Author:

janveeden

Message:

David: Fixed the lat long issue. Typecast to number was need. Your circles are now on map. Please fix them to the background, and make the hiding at start.

Location:

trunk/src/map/inc

Files:

• nodemapWL.js (modified) (6 diffs)
• overlay.js (modified) (1 diff)

trunk/src/map/inc/nodemapWL.js

@@ -4 +4 @@
 var marker_hash = {};
 var markerArray = new Array();
+var circleArray = new Array();
 var xmlhttp;
 var targetDiv = "infotop";
@@ -36 +37 @@
          * Hier zo circles toevoegen.
          */
+        for(var  i=0; i<circleArray.length; i++) {
+                map.addOverlay(circleArray[i]);
+        }
         
         var markerClusterer = new MarkerClusterer(map, markerArray);
@@ -49 +53 @@
 function addMarker(current, i) {
         var id = current.id;
+        var latitude = Number(current.latitude[0]);
+        var longitude = Number(current.longitude[0]);
+        var circle = drawCircle(latitude, longitude, 2.0, "#6C3", 1, 0.75, "#0F0",.2); 
         var marker  = new GMarker(new GLatLng(current.latitude[0], current.longitude[0]), {title: current.name[0], icon: greenIcon});
+        
         //Added mouseover listener that calls on our mouseOver function when the mouse moves over a marker on the map
         GEvent.addListener(marker, 'mouseover', function() {
@@ -63 +71 @@
         
         markerArray.push(marker);
+        circleArray.push(circle);
         return marker;
 }
@@ -104 +113 @@
                 *Hieronder verdergaan met dekking
                 */
-                drawCircle(lat, longitude, 2.0, "#6C3", 1, 0.75, "#0F0",.2);    
+                        
         }       
 }
@@ -151 +160 @@
 //Our click function for Cluster nodes. 'markers' is an array containing all markers within the cluster
 function clickCluster(markers)
-{
+{       
+        if(selected == true)
+                deselect();
+        
         //Let the rest of the program know that something is selected
         select();

trunk/src/map/inc/overlay.js

@@ -15 +15 @@
 
     polygon = new GPolygon(Cpoints, strokeColor, strokeWidth, strokeOpacity, fillColor, fillOpacity);
-    map.addOverlay(polygon);
+    return polygon;
    }