Changeset 7830 for trunk/src

Timestamp:

Apr 18, 2010, 5:04:00 PM (15 years ago)

Author:

janveeden

Message:

If status is not up we show a red marker instead of a green one.

Location:

trunk/src

Files:

• img/redMarker (added)
• img/redMarker/image.png (added)
• img/redMarker/mozPrintImage.gif (added)
• img/redMarker/printImage.gif (added)
• img/redMarker/printShadow.gif (added)
• img/redMarker/shadow.png (added)
• img/redMarker/transparent.png (added)
• map/inc/iconStyles.js (modified) (2 diffs)
• map/inc/nodemapWL.js (modified) (5 diffs)

trunk/src/map/inc/iconStyles.js

@@ -1 +1 @@
 var greenIcon = new GIcon();
+var redIcon = new GIcon();
 
 greenIcon.image = '../img/greenMarker/image.png';
@@ -11 +12 @@
 greenIcon.printShadow = '../img/greenMarker/printShadow.gif';
 greenIcon.transparent = '../img/greenMarker/transparent.png';
+
+redIcon.image = '../img/redMarker/image.png';
+redIcon.shadow = '../img/redMarker/shadow.png';
+redIcon.iconSize = new GSize(32,41);
+redIcon.shadowSize = new GSize(53,41);
+redIcon.iconAnchor = new GPoint(16,41);
+redIcon.infoWindowAnchor = new GPoint(16,25);
+redIcon.printImage = '../img/redMarker/printImage.gif';
+redIcon.mozPrintImage = '../img/redMarker/mozPrintImage.gif';
+redIcon.printShadow = '../img/redMarker/printShadow.gif';
+redIcon.transparent = '../img/redMarker/transparent.png';

trunk/src/map/inc/nodemapWL.js

@@ -17 +17 @@
 function initialize_map() {
         //We will only do this function if the browser is compatible
-        if (GBrowserIsCompatible()) {
+        if (GBrowserIsCompatible()) 
+        {
         //Adding the google map into the div called #mapcanvas
         map = new GMap2(document.getElementById("mapcanvas"), {googleBarOptions : {style : "new"}});
@@ -30 +31 @@
          * If the latLng of the marker is both 0 
          */
-        for (var i=0; i<markers.length; i++) {
-                var current = markers[i];
-                if(current.latitude[0] > 0 || current.latitude[0] < 0)
-                {
-                        addMarker(current, i);
-                }
-        }
-        
-        GEvent.addListener(map, "click", function() {
-                if(!overNode == true)
-                        deSelect();
-        });
-        
-        GEvent.addListener(map, "zoomend", function() {
-                mapZoomed();
-        });
-        
-        suggestMarkers("");
-        var markerClusterer = new MarkerClusterer(map, markerArray);
-        
-  }
+                for (var i=0; i<markers.length; i++) {
+                        var current = markers[i];
+                        if(current.latitude[0] > 0 || current.latitude[0] < 0)
+                        {
+                                addMarker(current, i);
+                        }
+                }
+                
+                GEvent.addListener(map, "click", function() {
+                        if(!overNode == true)
+                                deSelect();
+                });
+                
+                GEvent.addListener(map, "zoomend", function() {
+                        mapZoomed();
+                });
+                
+                suggestMarkers("");
+                
+                new MarkerClusterer(map, markerArray);
+        }
 } 
 
@@ -62 +63 @@
         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});
+        
+        var displayIcon;
+        var currentstatus = current.status[0];
+        if(currentstatus == "up")
+        {
+                displayIcon = greenIcon;
+        }
+        else
+        {
+                displayIcon = redIcon;
+        }
+        
+        var marker  = new GMarker(new GLatLng(current.latitude[0], current.longitude[0]), {title: current.name[0], icon: displayIcon});
         
         //Added mouseover listener that calls on our mouseOver function when the mouse moves over a marker on the map
@@ -99 +111 @@
                 selected = true;
                 markerSelected = marker;
-                marker.setImage("../img/sleutelGroenSelected.png");//Path should be in config
-                loadXMLDoc("inc/node_info.php?type=single&name="+name+"&a="+Math.random()); //Should also be in config  
+                for(var i=0; i<markers.length; i++)
+                {
+                var currentmarker = markers[i];
+                        if(currentmarker.name[0] == marker.getTitle())
+                        {
+                                if(currentmarker.status[0] == "up")
+                                {
+                                        marker.setImage("../img/sleutelGroenSelected.png");
+                                }       
+                                else
+                                {
+                                        marker.setImage("../img/sleutelRoodSelected.png");
+                                }
+                                
+                        }
+                }
+                loadXMLDoc("inc/node_info.php?type=single&name="+name+"&a="+Math.random()); 
         }
 }
@@ -259 +286 @@
         if(!markerSelected == "")
         {
-                markerSelected.setImage("../img/sleutelGroen.png");
+                for(var i=0; i<markers.length; i++)
+                {
+                var currentmarker = markers[i];
+                        if(currentmarker.name[0] == markerSelected.getTitle())
+                        {
+                                if(currentmarker.status[0] == "up")
+                                {
+                                        markerSelected.setImage("../img/sleutelGroen.png");
+                                }       
+                                else
+                                {
+                                        markerSelected.setImage("../img/sleutelRood.png");
+                                }
+                                
+                        }
+                }
                 markerSelected = "";
         }