Changeset 333 in tmcsimulator for trunk/webapps

Timestamp:

03/19/2019 05:59:34 AM (7 years ago)

Author:

jdalbey

Message:

Update cptms code to reflect image name changes.

Location:

trunk/webapps

Files:

• cptms.html (modified) (1 diff)
• images/CPTMSImages (deleted)
• js/cmsLayer.js (modified) (3 diffs)
• js/harLayer.js (modified) (1 diff)
• js/vdsLayer.js (modified) (2 diffs)

trunk/webapps/cptms.html

@@ -251 +251 @@
     };
 
-    var kMapPointsFile = "highway_status.json"; // dynamic json data file created by CADserver
+    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 kCMSfile = "data_layers/cms_locations_D12.gjson"; // CMS locations 
     var kCCTVfile = "data_layers/cctv_locations_D12.gjson"; // CCTV locations
     var kHARfile = "data_layers/har_locations_D12.gjson"; // CMS locations 
-    var blueFlag = "images/icon_cmsBlue.png";
-    var yellowFlag = "images/icon_cmsYellow.png";
+    var iconCMSactive = "images/icon_cms_active.png";
+    var iconCMSidle = "images/icon_cms_idle.png";
     var cctvIcon = "images/icon_cctvCyan.png";
     var cctvIconWhite = "images/icon_cctvWhite.png";
-    var vdsIconGreen = "images/circle-green.png"
-    var vdsIconYellow = "images/circle-yellow.png"
-    var vdsIconRed = "images/circle-red.png"
-    var harActive = "images/icon_harActive.png";
+    var iconVDSgreen = "images/circle_green.png"
+    var iconVDSyellow = "images/circle_yellow.png"
+    var iconVDSred = "images/circle_red.png"
+    var iconHARactive = "images/icon_har_active.png";
     var cms_showing = false;
     var vds_showing = true;

trunk/webapps/js/cmsLayer.js

@@ -39 +39 @@
         // return the StyleOptions
         return {
-            icon: yellowFlag,
+            icon: iconCMSidle,
             title: feature.getId()+ " " +feature.getProperty("location")+ " " 
                     + feature.getProperty("street"),
@@ -143 +143 @@
         if (outMessage == "|||||")
         {
-            currentIcon = {icon: yellowFlag};
+            currentIcon = {icon: iconCMSidle};
         }
         else
         {
-            currentIcon = {icon: blueFlag};
+            currentIcon = {icon: iconCMSactive};
         }
         cmsLayer.overrideStyle(cmsLayer.getFeatureById(cmsID), currentIcon)
@@ -199 +199 @@
                     item.cms.message.phase2.Line3 == "")
                 {
-                    cmsLayer.overrideStyle(cmsLayer.getFeatureById(item.cms.index), {icon: yellowFlag})
+                    cmsLayer.overrideStyle(cmsLayer.getFeatureById(item.cms.index), {icon: iconCMSidle})
                 }
                 else
                 {
-                    cmsLayer.overrideStyle(cmsLayer.getFeatureById(item.cms.index), {icon: blueFlag})
+                    cmsLayer.overrideStyle(cmsLayer.getFeatureById(item.cms.index), {icon: iconCMSactive})
                 }
             }

trunk/webapps/js/harLayer.js

@@ -39 +39 @@
         // return the StyleOptions
         return {
-            icon: harActive,
+            icon: iconHARactive,
             title: feature.getId()+ " " +feature.getProperty("location")+ " " 
                     + feature.getProperty("street"),

trunk/webapps/js/vdsLayer.js

@@ -6 +6 @@
 //        var diamond = 'M -1,0 0,-1 1,0 0,1 z';
 //        var myShape = circle;
-        var iconPath = vdsIconGreen;
+        var iconPath = iconVDSgreen;
         if (color == 'red')
         {
-           iconPath = vdsIconRed;
+           iconPath = iconVDSred;
         }
         else if (color == 'yellow')
         {
-            iconPath = vdsIconYellow;
+            iconPath = iconVDSyellow;
         }
         return {
@@ -136 +136 @@
     {
         var parsed_JSON;
-        loadJSON(kMapPointsFile, function(response)
+        loadJSON(kVDSstatusFile, function(response)
         {
             // Parse JSON string into object