Changeset 434 in tmcsimulator for trunk/webapps

Timestamp:

07/09/2019 04:59:27 PM (7 years ago)

Author:

jdalbey

Message:

LoadEvents?.js modified to show incident start, and full script edited to move GENERAL INFO to start of tag. Fixes #164

Location:

trunk/webapps

Files:

• common/js/revision_number.dat (modified) (1 diff)
• dynamicdata/highway_status.json (modified) (13 diffs)
• dynamicdata/incident_script.xml (modified) (4 diffs)
• einotebook/scripts/LoadEvents.js (modified) (1 diff)

trunk/webapps/common/js/revision_number.dat

@@ -1 +1 @@
 
-    var revisionNumber = "431";
+    var revisionNumber = "433";
     

trunk/webapps/dynamicdata/highway_status.json

@@ -4304 +4304 @@
        },
    "properties": 
-       {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.725068", "perpy": "-0.688678"}
+       {"street": "PAULARINO 2", "color": "lime", "perpx": "0.725068", "perpy": "-0.688678"}
 },  
 {
@@ -4315 +4315 @@
        },
    "properties": 
-       {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.719864", "perpy": "-0.694115"}
+       {"street": "PAULARINO 2", "color": "lime", "perpx": "0.719864", "perpy": "-0.694115"}
 },  
 {
@@ -4766 +4766 @@
        },
    "properties": 
-       {"street": "MACARTHU2", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"}
+       {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"}
 },  
 {
@@ -4777 +4777 @@
        },
    "properties": 
-       {"street": "DYER 1", "color": "red", "perpx": "0", "perpy": "0"}
+       {"street": "DYER 1", "color": "yellow", "perpx": "0", "perpy": "0"}
 },  
 {
@@ -4788 +4788 @@
        },
    "properties": 
-       {"street": "DYER 2", "color": "red", "perpx": "-0.708914", "perpy": "0.705295"}
+       {"street": "DYER 2", "color": "lime", "perpx": "-0.708914", "perpy": "0.705295"}
 },  
 {
@@ -4799 +4799 @@
        },
    "properties": 
-       {"street": "WARNER", "color": "red", "perpx": "-0.711107", "perpy": "0.703084"}
+       {"street": "WARNER", "color": "lime", "perpx": "-0.711107", "perpy": "0.703084"}
 },  
 {
@@ -4810 +4810 @@
        },
    "properties": 
-       {"street": "EDINGER 1", "color": "yellow", "perpx": "0", "perpy": "0"}
+       {"street": "EDINGER 1", "color": "lime", "perpx": "0", "perpy": "0"}
 },  
 {
@@ -12013 +12013 @@
        },
    "properties": 
-       {"street": "JAMBOREE1", "color": "yellow", "perpx": "0.400805", "perpy": "0.916164"}
+       {"street": "JAMBOREE1", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"}
 },  
 {
@@ -12024 +12024 @@
        },
    "properties": 
-       {"street": "JAMBOREE2", "color": "red", "perpx": "0.400805", "perpy": "0.916164"}
+       {"street": "JAMBOREE2", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"}
 },  
 {
@@ -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"}
 },  
 {
@@ -12046 +12046 @@
        },
    "properties": 
-       {"street": "AIRPORT", "color": "red", "perpx": "0.321527", "perpy": "0.9469"}
+       {"street": "AIRPORT", "color": "lime", "perpx": "0.321527", "perpy": "0.9469"}
 },  
 {
@@ -12057 +12057 @@
        },
    "properties": 
-       {"street": "HOV AT 55N FLYOVER**", "color": "red", "perpx": "0.271933", "perpy": "0.962316"}
+       {"street": "HOV AT 55N FLYOVER**", "color": "lime", "perpx": "0.271933", "perpy": "0.962316"}
 },  
 {
@@ -12068 +12068 @@
        },
    "properties": 
-       {"street": "RED HILL", "color": "red", "perpx": "0.126754", "perpy": "0.991934"}
+       {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"}
 },  
 {

trunk/webapps/dynamicdata/incident_script.xml

@@ -2162 +2162 @@
                 <TIME_INDEX>01:23:00</TIME_INDEX>
                 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
+
+                <GENERAL_INFO> 
+                        <TITLE>Incident Description</TITLE>
+                        <TEXT>This is a suicide attempt and a bomb threat. A man with a bomb 
+                  strapped to him is threatening to blow up the interchange at I-405 and
+                  Jeffrey Road. The freeway interchange is shut down completely, causing 
+                  major backup in both directions on I-405. The man is eventually 
+                  apprehended after attempting to explode the bomb. The PD, additional 
+                  units, sign trucks, negotiator, and the bomb squad are sent to the 
+                  scene to assist.
+                        </TEXT>
+                </GENERAL_INFO>
                 
                 <CAD_DATA>
@@ -2228 +2240 @@
                         
                 </CAD_DATA>     
-
-                <GENERAL_INFO> 
-                        <TITLE>Incident Description</TITLE>
-                        <TEXT>This is a suicide attempt and a bomb threat. A man with a bomb 
-                  strapped to him is threatening to blow up the interchange at I-405 and
-                  Jeffrey Road. The freeway interchange is shut down completely, causing 
-                  major backup in both directions on I-405. The man is eventually 
-                  apprehended after attempting to explode the bomb. The PD, additional 
-                  units, sign trucks, negotiator, and the bomb squad are sent to the 
-                  scene to assist.
-                        </TEXT>
-                </GENERAL_INFO>
 
                 <CHP_RADIO RadioFile="18901.mp3">
@@ -3778 +3778 @@
                 <INCIDENT LogNum="191">RV Fire</INCIDENT>
                 
+                <GENERAL_INFO> 
+                        <TITLE>Incident Description</TITLE>
+                        <TEXT> This is an RV fire on the shoulder southbound 73 just north of 
+                   Bear/Baker Street. There are two injured victims who were pulled from 
+                   the RV by passers-by. The #3 is closed to fight the fire. 
+                   The fire department, paramedics, an extra unit, sign truck/s, and 
+                   ambulance are sent to the scene.
+                        </TEXT>
+                </GENERAL_INFO>
+
                 <CAD_DATA>
                         <MASTER_INC_NUM>145086SLO007</MASTER_INC_NUM>
@@ -3818 +3828 @@
                 </CAD_DATA>             
                 
-                <GENERAL_INFO> 
-                        <TITLE>Incident Description</TITLE>
-                        <TEXT> This is an RV fire on the shoulder southbound 73 just north of 
-                   Bear/Baker Street. There are two injured victims who were pulled from 
-                   the RV by passers-by. The #3 is closed to fight the fire. 
-                   The fire department, paramedics, an extra unit, sign truck/s, and 
-                   ambulance are sent to the scene.
-                        </TEXT>
-                </GENERAL_INFO>
-
         </SCRIPT_EVENT>
 

trunk/webapps/einotebook/scripts/LoadEvents.js

@@ -45 +45 @@
                         var theIncident = new Incident(evtTime, incidentNum, incidentTitle, desc);
                         incidents.add(theIncident);
+                        // Create an entry showing the Incident start description. Fixes ticket #164
+                        var result = new Array();   
+                        result.push("Description:");
+                        result.push(desc);
+                        proparray.push(new Property("Incident Start",result));
                         break;
                     case "CAD_DATA":