Changeset 650 in tmcsimulator for trunk/webapps

Timestamp:

09/07/2022 12:22:34 PM (4 years ago)

Author:

jdalbey

Message:

Multiple updates - catchup webapps files I've been hoarding (sorry).

Location:

trunk/webapps

Files:

• common/js/displayutils.js (modified) (4 diffs)
• common/js/revision_number.dat (modified) (1 diff)
• cptms/css/styles.css (modified) (1 diff)
• cptms/images/CCTV (modified) (1 prop)
• cptms/images/CCTV/Cockatoo Traffic Cam.mp4 (added)
• cptms/images/CCTV/Toucan Traffic Cam.mp4 (added)
• dynamicdata/CADcomments.log (modified) (1 diff)
• dynamicdata/cms_messages.json (modified) (1 diff)
• dynamicdata/data.json (modified) (1 diff)
• dynamicdata/data_summary.json (modified) (1 diff)
• dynamicdata/har_messages.json (modified) (1 diff)
• dynamicdata/highway_status.json (modified) (1 diff)
• dynamicdata/incident_script_brief.xml (added)
• dynamicdata/incident_script_test.txt (added)
• dynamicdata/traffic_events.txt (added)
• dynamicdata/unifiedlog.csv (modified) (1 diff)
• dynamicdata/unifiedlog_final.csv (deleted)
• visualizer/css/styles.css (modified) (1 diff)

trunk/webapps/common/js/displayutils.js

@@ -30 +30 @@
 }
 
+// Format the csv data into an HTML table
 function formatTable(allRows, sortOrder)
 {
@@ -35 +36 @@
     if (sortOrder) // ascending order of time (most recent last)
     {
-        // Format the csv data into an HTML table
         // Put the last log entry at the BOTTOM of the table
         for (var singleRow = 0; singleRow <= allRows.length-1; singleRow++)
@@ -46 +46 @@
     else  // descending order of time (most recent first)
     {
-        // Format the csv data into an HTML table
         // Put the last log entry at the TOP of the table
         for (var singleRow = allRows.length-1; singleRow >= 0; singleRow--)
@@ -60 +59 @@
 }
 
+// Format a single row of fields into a table row
 function formatRow(rowCells)
 {

trunk/webapps/common/js/revision_number.dat

@@ -1 +1 @@
 
-    var revisionNumber = "640";
+    var revisionNumber = "649";
     

trunk/webapps/cptms/css/styles.css

@@ -106 +106 @@
         }
        .wrapper {
-           position: relative;\
+           position: relative;
         }
         /* CMS Edit Message Dialog */

trunk/webapps/dynamicdata/CADcomments.log

@@ -1 @@
-CAD Log, Simulation Started at 14 Mar 2021 11:28:27 with incidents 100 181 
 CAD Log, Simulation Paused.

trunk/webapps/dynamicdata/cms_messages.json

@@ -8 +8 @@
 {"cms":{"index":"16","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
 {"cms":{"index":"17","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
-{"cms":{"index":"18","message":{"displayTime":"","phase1":{"Line1":"BBBBB","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
+{"cms":{"index":"18","message":{"displayTime":"","phase1":{"Line1":"DRIVE SAFE","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
 {"cms":{"index":"19","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
 {"cms":{"index":"20","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},

trunk/webapps/dynamicdata/data.json

@@ -4 +4 @@
 ["20190207-001","02\/07","13:23.07","Gross, Angelo","","HCC NOTIFIED"],
 ["20190207-001","02\/07","13:23.59","Gross, Angelo","","32-1 Vehicle Disabled S 55@ 405 1308 hours"],
-["20190207-021","02\/07","16:05.11","","10-98 Assignment Completed","75-1"],
-["20190207-021","02\/07","16:05.16","","10-98 Let's get pizza.","75-1"],
-["20190207-021","02\/07","16:07.21","","10-97 Tomatoes everywhere.","75-1"],
-["20190207-021","02\/07","16:07.21","","10-97 Tribbles everywhere.","75-1"]
+["20190207-021","02\/07","16:05.11","Smith, Bob","10-98 Assignment Completed","75-1"],
+["20190207-021","02\/07","16:05.16","Jones, Mary","10-98 Let's get pizza.","75-1"],
+["20190207-021","02\/07","16:07.21","Tsu, Lao","10-97 Tomatoes everywhere.","75-1"],
+["20190207-021","02\/07","16:07.21","Barry, Dave","10-97 Tribbles everywhere.","75-1"],
+["20190207-021","02\/07","16:07.21","Jones, Mary","10-97 Doritos everywhere.","75-1"]
 ]
 }

trunk/webapps/dynamicdata/data_summary.json

@@ -1 @@
-{"data":[["20191001-001","10\/01","15:05.53","Bailey, Mary","I-5","","","Advisory","Advisory: National Weather Service Advisory",""],["20191001-002","10\/01","16:03.47","Hockaday, Neil","I-405","Jeffrey","SB","Major","Major: 11-79 Accident-Ambulance Rolling","Ducks"],["20191001-002","10\/01","16:03.47","Quan, Ally","I-405","Jeffrey","SB","Major","Major: 11-79 Accident-Ambulance Rolling","Ducks"]]}
+{"data":[["20191001-001","10\/01","15:05.53","Bailey, Mary","I-5","","","Advisory","Advisory: National Weather Service Advisory",""],["20191001-002","10\/01","16:03.47","Hockaday, Neil","I-405","Jeffrey","SB","Major","Major: 11-79 Accident-Ambulance Rolling","Ducks"],
+["20191001-002","10\/01","16:03.47","Quan, Ally","I-405","Jeffrey","SB","Major","Major: 11-79 Accident-Ambulance Rolling","Ducks"],
+["20191001-002","10\/01","16:03.47","Buck, Joe","I-405","Jeffrey","SB","Major","Major: 11-79 Party-Tailgate down","Pigs"]
+]}

trunk/webapps/dynamicdata/har_messages.json

@@ -1 +1 @@
 {"data":[
-{"har":{"index":"WPMW407 1620 AM","message":{"displayTime":"","phase1":{"Line1":"GOOD NIGHT"}}}},
-{"har":{"index":"KNNN868 1620 AM","message":{"displayTime":"","phase1":{"Line1":"SAMPLE HAR MESSAGE"}}}}
+{"har":{"index":"WPMW407 1620 AM","message":{"displayTime":"","phase1":{"Line1":"NOW IS THE TIME FOR ALL GOOD MEN TO COME TO THE AID OF THEIR COUNTRY\nASK NOT WHAT YOUR COUNTRY CAN DO FOR YOU ASK WHAT YOU CAN DO FOR YOUR COUNTRY."}}}},
+{"har":{"index":"KNNN868 1620 AM","message":{"displayTime":"","phase1":{"Line1":"SAMPLE HAR MESSAGE\nSAMPLE HAR MESSAGE\nSAMPLE HAR MESSAGE\nSAMPLE HAR MESSAGE"}}}}
 ]}

trunk/webapps/dynamicdata/highway_status.json

@@ -12035 +12035 @@
        },
    "properties": 
-       {"street": "MACARTHUR 1", "color": "red", "perpx": "0.408917", "perpy": "0.912572"}
+       {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"}
 },  
 {

trunk/webapps/dynamicdata/unifiedlog.csv

@@ -1 @@
-00:10:18, CMS Activated,N SR-55  5.38 Baker Street, 'BBBBB:::::'
-00:10:18, CMS Activated,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:'
-00:10:18, CMS Activated,S SR-55  8.64 WARNER AVE, 'ACCIDENT AHEAD:::::'
-00:10:18, CMS Activated,S I-405  4.06 JEFFREY, 'SLOW TRAFFIC:AHEAD::::'
-00:10:18, CAD Log, Simulation Started at 14 Mar 2021 10:24:44 with incidents 100 187 188 189 190 191
-00:10:18, Activity Log,Ha Khanh Duy,001  Per 32-1 NB rte 405 blocked
-00:10:18, Activity Log,Gross Angelo,001  HCC NOTIFIED
-00:10:18, Activity Log,Gross Angelo,001  32-1 Vehicle Disabled S 55@ 405 1308 hours
-00:10:18, Activity Log,,021 10-98 Assignment Completed 75-1
-00:10:18, Activity Log,,021 10-98 Let's get pizza. 75-1
-00:10:18, Activity Log,,021 10-97 Tomatoes everywhere. 75-1
-00:10:18, Activity Log,,021 10-97 Tribbles everywhere. 75-1
-00:10:18, Activity Log,Bailey Mary,001  Incident Created
-00:10:18, Activity Log,Hockaday Neil,002  Incident Created
-00:10:18, Activity Log,Quan Ally,002  Incident Created
-00:00:32, CAD Log, Simulation Paused.
+00:07:26, CMS Activated,N SR-55  5.38 Baker Street, 'DRIVE SAFE:::::'
+00:07:26, CMS Activated,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:'
+00:07:26, CMS Activated,S SR-55  8.64 WARNER AVE, 'ACCIDENT AHEAD:::::'
+00:07:26, CMS Activated,S I-405  4.06 JEFFREY, 'SLOW TRAFFIC:AHEAD::::'
+00:07:26, HAR Activated,WPMW407 1620 AM, 'NOW IS THE TIME FOR ALL GOOD MEN TO COME TO THE AID OF THEIR COUNTRY ASK NOT WHAT YOUR COUNTRY CAN DO FOR YOU ASK WHAT YOU CAN DO FOR YOUR COUNTRY.'
+00:07:26, HAR Activated,KNNN868 1620 AM, 'SAMPLE HAR MESSAGE'
+00:07:26, CAD Log, Simulation Started at 2 Sep 2022 15:34:26 with incidents 100 187 188 189 190 191
+00:07:26, CAD Log, Simulation Paused.
+00:07:26, Activity Log,Ha Khanh Duy,001  Per 32-1 NB rte 405 blocked
+00:07:26, Activity Log,Gross Angelo,001  HCC NOTIFIED
+00:07:26, Activity Log,Gross Angelo,001  32-1 Vehicle Disabled S 55@ 405 1308 hours
+00:07:26, Activity Log,Smith Bob,021 10-98 Assignment Completed 75-1
+00:07:26, Activity Log,Jones Mary,021 10-98 Let's get pizza. 75-1
+00:07:26, Activity Log,Tsu Lao,021 10-97 Tomatoes everywhere. 75-1
+00:07:26, Activity Log,Barry Dave,021 10-97 Tribbles everywhere. 75-1
+00:07:26, Activity Log,Jones Mary,021 10-97 Doritos everywhere. 75-1
+00:07:26, Activity Log,Bailey Mary,001  Incident Created
+00:07:26, Activity Log,Hockaday Neil,002  Incident Created
+00:07:26, Activity Log,Quan Ally,002  Incident Created
+00:07:26, Activity Log,Buck Joe,002  Incident Created
+00:07:26, HAR Updated, KNNN868 1620 AM, 'SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE'

trunk/webapps/visualizer/css/styles.css

@@ -123 +123 @@
         }
        .wrapper {
-           position: relative;\
+           position: relative;
         }
         /* CMS Edit Message Dialog */