Changeset 434 in tmcsimulator


Ignore:
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
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/scripts/full_script_2016.xml

    r386 r434  
    579579                <INCIDENT LogNum="188">Tomato Truck Spill/Fire</INCIDENT> 
    580580                 
     581                <GENERAL_INFO> 
     582                        <TITLE>Incident Description</TITLE> 
     583                        <TEXT>This is a two vehicle collision between a tomato truck and a car. The  
     584                  truck spills tomatoes across lanes #3,4,5 right lanes plus  
     585                  shoulder of NB 5 just north of Lake Forest Drive. There is one 11-44  
     586                  and 2 major injured. Ambulance, fire, paramedics, additional units,  
     587                  Maintenance/coroner, and TMT are requested on this incident. 
     588                        </TEXT> 
     589                </GENERAL_INFO> 
    581590                <CAD_DATA> 
    582591                        <MASTER_INC_NUM>145086SLO004</MASTER_INC_NUM> 
     
    625634                </CAD_DATA>              
    626635                 
    627                 <GENERAL_INFO> 
    628                         <TITLE>Incident Description</TITLE> 
    629                         <TEXT>This is a two vehicle collision between a tomato truck and a car. The  
    630                   truck spills tomatoes across lanes #3,4,5 right lanes plus  
    631                   shoulder of NB 5 just north of Lake Forest Drive. There is one 11-44  
    632                   and 2 major injured. Ambulance, fire, paramedics, additional units,  
    633                   Maintenance/coroner, and TMT are requested on this incident. 
    634                         </TEXT> 
    635                 </GENERAL_INFO> 
    636636        </SCRIPT_EVENT> 
    637637 
     
    21852185                <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    21862186                 
     2187                <GENERAL_INFO>  
     2188                        <TITLE>Incident Description</TITLE> 
     2189                        <TEXT>This is a suicide attempt and a bomb threat. A man with a bomb  
     2190                  strapped to him is threatening to blow up the interchange at I-405 and 
     2191                  Jeffrey Road. The freeway interchange is shut down completely, causing  
     2192                  major backup in both directions on I-405. The man is eventually  
     2193                  apprehended after attempting to explode the bomb. The PD, additional  
     2194                  units, sign trucks, negotiator, and the bomb squad are sent to the  
     2195                  scene to assist. 
     2196                        </TEXT> 
     2197                </GENERAL_INFO> 
     2198 
    21872199                <CAD_DATA> 
    21882200                        <MASTER_INC_NUM>145086SLO005</MASTER_INC_NUM> 
     
    22502262                         
    22512263                </CAD_DATA>      
    2252  
    2253                 <GENERAL_INFO>  
    2254                         <TITLE>Incident Description</TITLE> 
    2255                         <TEXT>This is a suicide attempt and a bomb threat. A man with a bomb  
    2256                   strapped to him is threatening to blow up the interchange at I-405 and 
    2257                   Jeffrey Road. The freeway interchange is shut down completely, causing  
    2258                   major backup in both directions on I-405. The man is eventually  
    2259                   apprehended after attempting to explode the bomb. The PD, additional  
    2260                   units, sign trucks, negotiator, and the bomb squad are sent to the  
    2261                   scene to assist. 
    2262                         </TEXT> 
    2263                 </GENERAL_INFO> 
    22642264 
    22652265                <CHP_RADIO RadioFile="18901.mp3"> 
     
    38003800                <INCIDENT LogNum="191">RV Fire</INCIDENT> 
    38013801                 
     3802                <GENERAL_INFO>  
     3803                        <TITLE>Incident Description</TITLE> 
     3804                        <TEXT> This is an RV fire on the shoulder southbound 73 just north of  
     3805                   Bear/Baker Street. There are two injured victims who were pulled from  
     3806                   the RV by passers-by. The #3 is closed to fight the fire.  
     3807                   The fire department, paramedics, an extra unit, sign truck/s, and  
     3808                   ambulance are sent to the scene. 
     3809                        </TEXT> 
     3810                </GENERAL_INFO> 
     3811 
    38023812                <CAD_DATA> 
    38033813                        <MASTER_INC_NUM>145086SLO007</MASTER_INC_NUM> 
     
    38403850                </CAD_DATA>              
    38413851                 
    3842                 <GENERAL_INFO>  
    3843                         <TITLE>Incident Description</TITLE> 
    3844                         <TEXT> This is an RV fire on the shoulder southbound 73 just north of  
    3845                    Bear/Baker Street. There are two injured victims who were pulled from  
    3846                    the RV by passers-by. The #3 is closed to fight the fire.  
    3847                    The fire department, paramedics, an extra unit, sign truck/s, and  
    3848                    ambulance are sent to the scene. 
    3849                         </TEXT> 
    3850                 </GENERAL_INFO> 
    3851  
    38523852        </SCRIPT_EVENT> 
    38533853 
  • trunk/src/tmcsim/application.properties

    r432 r434  
    1 #Sun, 07 Jul 2019 11:28:33 -0700 
     1#Tue, 09 Jul 2019 18:29:55 -0700 
    22 
    3 Application.revision=431 
     3Application.revision=433 
    44 
    55Application.buildnumber=145 
  • trunk/webapps/common/js/revision_number.dat

    r433 r434  
    11 
    2     var revisionNumber = "431"; 
     2    var revisionNumber = "433"; 
    33     
  • trunk/webapps/dynamicdata/highway_status.json

    r433 r434  
    43044304       }, 
    43054305   "properties":  
    4306        {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.725068", "perpy": "-0.688678"} 
     4306       {"street": "PAULARINO 2", "color": "lime", "perpx": "0.725068", "perpy": "-0.688678"} 
    43074307},   
    43084308{ 
     
    43154315       }, 
    43164316   "properties":  
    4317        {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.719864", "perpy": "-0.694115"} 
     4317       {"street": "PAULARINO 2", "color": "lime", "perpx": "0.719864", "perpy": "-0.694115"} 
    43184318},   
    43194319{ 
     
    47664766       }, 
    47674767   "properties":  
    4768        {"street": "MACARTHU2", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"} 
     4768       {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"} 
    47694769},   
    47704770{ 
     
    47774777       }, 
    47784778   "properties":  
    4779        {"street": "DYER 1", "color": "red", "perpx": "0", "perpy": "0"} 
     4779       {"street": "DYER 1", "color": "yellow", "perpx": "0", "perpy": "0"} 
    47804780},   
    47814781{ 
     
    47884788       }, 
    47894789   "properties":  
    4790        {"street": "DYER 2", "color": "red", "perpx": "-0.708914", "perpy": "0.705295"} 
     4790       {"street": "DYER 2", "color": "lime", "perpx": "-0.708914", "perpy": "0.705295"} 
    47914791},   
    47924792{ 
     
    47994799       }, 
    48004800   "properties":  
    4801        {"street": "WARNER", "color": "red", "perpx": "-0.711107", "perpy": "0.703084"} 
     4801       {"street": "WARNER", "color": "lime", "perpx": "-0.711107", "perpy": "0.703084"} 
    48024802},   
    48034803{ 
     
    48104810       }, 
    48114811   "properties":  
    4812        {"street": "EDINGER 1", "color": "yellow", "perpx": "0", "perpy": "0"} 
     4812       {"street": "EDINGER 1", "color": "lime", "perpx": "0", "perpy": "0"} 
    48134813},   
    48144814{ 
     
    1201312013       }, 
    1201412014   "properties":  
    12015        {"street": "JAMBOREE1", "color": "yellow", "perpx": "0.400805", "perpy": "0.916164"} 
     12015       {"street": "JAMBOREE1", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} 
    1201612016},   
    1201712017{ 
     
    1202412024       }, 
    1202512025   "properties":  
    12026        {"street": "JAMBOREE2", "color": "red", "perpx": "0.400805", "perpy": "0.916164"} 
     12026       {"street": "JAMBOREE2", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} 
    1202712027},   
    1202812028{ 
     
    1203512035       }, 
    1203612036   "properties":  
    12037        {"street": "MACARTHUR 1", "color": "red", "perpx": "0.408917", "perpy": "0.912572"} 
     12037       {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"} 
    1203812038},   
    1203912039{ 
     
    1204612046       }, 
    1204712047   "properties":  
    12048        {"street": "AIRPORT", "color": "red", "perpx": "0.321527", "perpy": "0.9469"} 
     12048       {"street": "AIRPORT", "color": "lime", "perpx": "0.321527", "perpy": "0.9469"} 
    1204912049},   
    1205012050{ 
     
    1205712057       }, 
    1205812058   "properties":  
    12059        {"street": "HOV AT 55N FLYOVER**", "color": "red", "perpx": "0.271933", "perpy": "0.962316"} 
     12059       {"street": "HOV AT 55N FLYOVER**", "color": "lime", "perpx": "0.271933", "perpy": "0.962316"} 
    1206012060},   
    1206112061{ 
     
    1206812068       }, 
    1206912069   "properties":  
    12070        {"street": "RED HILL", "color": "red", "perpx": "0.126754", "perpy": "0.991934"} 
     12070       {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"} 
    1207112071},   
    1207212072{ 
  • trunk/webapps/dynamicdata/incident_script.xml

    r429 r434  
    21622162                <TIME_INDEX>01:23:00</TIME_INDEX> 
    21632163                <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
     2164 
     2165                <GENERAL_INFO>  
     2166                        <TITLE>Incident Description</TITLE> 
     2167                        <TEXT>This is a suicide attempt and a bomb threat. A man with a bomb  
     2168                  strapped to him is threatening to blow up the interchange at I-405 and 
     2169                  Jeffrey Road. The freeway interchange is shut down completely, causing  
     2170                  major backup in both directions on I-405. The man is eventually  
     2171                  apprehended after attempting to explode the bomb. The PD, additional  
     2172                  units, sign trucks, negotiator, and the bomb squad are sent to the  
     2173                  scene to assist. 
     2174                        </TEXT> 
     2175                </GENERAL_INFO> 
    21642176                 
    21652177                <CAD_DATA> 
     
    22282240                         
    22292241                </CAD_DATA>      
    2230  
    2231                 <GENERAL_INFO>  
    2232                         <TITLE>Incident Description</TITLE> 
    2233                         <TEXT>This is a suicide attempt and a bomb threat. A man with a bomb  
    2234                   strapped to him is threatening to blow up the interchange at I-405 and 
    2235                   Jeffrey Road. The freeway interchange is shut down completely, causing  
    2236                   major backup in both directions on I-405. The man is eventually  
    2237                   apprehended after attempting to explode the bomb. The PD, additional  
    2238                   units, sign trucks, negotiator, and the bomb squad are sent to the  
    2239                   scene to assist. 
    2240                         </TEXT> 
    2241                 </GENERAL_INFO> 
    22422242 
    22432243                <CHP_RADIO RadioFile="18901.mp3"> 
     
    37783778                <INCIDENT LogNum="191">RV Fire</INCIDENT> 
    37793779                 
     3780                <GENERAL_INFO>  
     3781                        <TITLE>Incident Description</TITLE> 
     3782                        <TEXT> This is an RV fire on the shoulder southbound 73 just north of  
     3783                   Bear/Baker Street. There are two injured victims who were pulled from  
     3784                   the RV by passers-by. The #3 is closed to fight the fire.  
     3785                   The fire department, paramedics, an extra unit, sign truck/s, and  
     3786                   ambulance are sent to the scene. 
     3787                        </TEXT> 
     3788                </GENERAL_INFO> 
     3789 
    37803790                <CAD_DATA> 
    37813791                        <MASTER_INC_NUM>145086SLO007</MASTER_INC_NUM> 
     
    38183828                </CAD_DATA>              
    38193829                 
    3820                 <GENERAL_INFO>  
    3821                         <TITLE>Incident Description</TITLE> 
    3822                         <TEXT> This is an RV fire on the shoulder southbound 73 just north of  
    3823                    Bear/Baker Street. There are two injured victims who were pulled from  
    3824                    the RV by passers-by. The #3 is closed to fight the fire.  
    3825                    The fire department, paramedics, an extra unit, sign truck/s, and  
    3826                    ambulance are sent to the scene. 
    3827                         </TEXT> 
    3828                 </GENERAL_INFO> 
    3829  
    38303830        </SCRIPT_EVENT> 
    38313831 
  • trunk/webapps/einotebook/scripts/LoadEvents.js

    r429 r434  
    4545                        var theIncident = new Incident(evtTime, incidentNum, incidentTitle, desc); 
    4646                        incidents.add(theIncident); 
     47                        // Create an entry showing the Incident start description. Fixes ticket #164 
     48                        var result = new Array();    
     49                        result.push("Description:"); 
     50                        result.push(desc); 
     51                        proparray.push(new Property("Incident Start",result)); 
    4752                        break; 
    4853                    case "CAD_DATA":  
Note: See TracChangeset for help on using the changeset viewer.