Changeset 337 in tmcsimulator

Timestamp:

03/20/2019 11:25:24 AM (7 years ago)

Author:

jdalbey

Message:

CPTMS: Add white circle image and supporting code

Location:

trunk/webapps

Files:

• cptms.html (modified) (2 diffs)
• images/circle_white.png (added)
• js/vdsLayer.js (modified) (4 diffs)

trunk/webapps/cptms.html

@@ -126 +126 @@
     };
 
-    var kVDSstatusFile = "highway_status.json"; // dynamic json data file created by CADserver
-    var kMapStartupFile = "data_layers/highways_startup.json"; // initial (static) highways file used once at startup
+    var kVDSstatusFile = "highway_status_test.json"; // dynamic json data file created by CADserver
+    var kMapStartupFile = "data_layers/highways_startup_test.json"; // initial (static) highways file used once at startup
     var kCMSfile = "data_layers/cms_locations_D12.gjson"; // CMS locations 
     var kCCTVfile = "data_layers/cctv_locations_D12.gjson"; // CCTV locations
@@ -138 +138 @@
     var iconVDSyellow = "images/circle_yellow.png"
     var iconVDSred = "images/circle_red.png"
+    var iconVDSwhite = "images/circle_white.png"
     var iconHARactive = "images/icon_har_active.png";
     var cms_showing = false;

trunk/webapps/js/vdsLayer.js

@@ -1 +1 @@
     // Build a solid colored icon to use instead of the classic pin
-    // Use a diamond on N and E directions, circle on S and W directions
-    function dotSymbol(color) //,direction)
+    function dotSymbol(color) 
     {
-//        var circle = google.maps.SymbolPath.CIRCLE;
-//        var diamond = 'M -1,0 0,-1 1,0 0,1 z';
-//        var myShape = circle;
-        var iconPath = iconVDSgreen;
+        var iconPath = iconVDSwhite;
         if (color == 'red')
         {
@@ -15 +11 @@
             iconPath = iconVDSyellow;
         }
+        else if (color == 'lime')
+        {
+            iconPath = iconVDSgreen;
+        }
         return {
-//            path: iconPath,
-//            icon: 
-//                    {
-                        url: iconPath, 
-                        anchor: new google.maps.Point(6, 6)
-//                    };
-//            anchor: new google.maps.Point(6, 6),
-//            scale: 5,
-//            strokeColor: "black", // the border color
-//            strokeWeight: 1, // the border thickness
-//            fillColor: color,
-//            fillOpacity: 1.0
+            url: iconPath, 
+            anchor: new google.maps.Point(6, 6)
         };
     }
@@ -36 +26 @@
         // Load the static map data and call saveCoords when done
         map.data.loadGeoJson(kMapStartupFile, null, saveCoords)
-//        var d = new Date();
-//        var start = d.getTime();
         // Style the map data by applying the desired properties to each feature (marker)
         // The function will be called every time a feature's properties are updated.
@@ -52 +40 @@
             return {
                 icon: iconSymbol,
-/*                    icon: 
-                    {
-                        url: vdsIconGreen, 
-                        anchor: new google.maps.Point(6, 6)
-                    }, */
                 title: name + " @" + street, // set rollover text
                 // set zIndex for slowed traffic to a higher value so they overlap