Changeset 433 in tmcsimulator for trunk

Timestamp:

07/07/2019 11:17:08 AM (7 years ago)

Author:

jdalbey

Message:

Unified Logger v1.0. Add cad watcher plugin to logging service.

Location:

trunk

Files:

• scripts/cad_event_script.xml (added)
• scripts/documented_script.txt (added)
• scripts/experimental_practice.xml (added)
• scripts/media_log_only.xml (moved) (moved from trunk/scripts/one-incident.xml)
• webapps/common/js/revision_number.dat (modified) (1 diff)
• webapps/dynamicdata/highway_status.json (modified) (14 diffs)
• webapps/dynamicdata/unifiedlog.html (added)
• webapps/unifiedlogger/cad_watcher.py (added)
• webapps/unifiedlogger/cms_watcher.py (modified) (3 diffs)
• webapps/unifiedlogger/logging_service.py (modified) (3 diffs)

trunk/webapps/common/js/revision_number.dat

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

trunk/webapps/dynamicdata/highway_status.json

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

trunk/webapps/unifiedlogger/cms_watcher.py

@@ -56 +56 @@
                     msgList[idx]['cms']['message']['phase2']['Line3'])
 
-# Compare previous messages to current messages to look for changes
-def compare():
+def setup():
+     extractMessages(initialize())
+
+# compare previous messages to current messages to look for changes
+def getLogEntries():
      global prevList, currList
      msgList = readFile()
@@ -80 +83 @@
      return results
 
-def setup():
-     msgList = initialize()
-     extractMessages(msgList)
-
 def main():
      global currList
@@ -90 +89 @@
      while True:
           # Look for changed messages
-          answer = compare()
+          answer = getLogEntries()
           # Output results
           for item in answer:

trunk/webapps/unifiedlogger/logging_service.py

@@ -1 @@
-import cms_watcher, time, json
+import cms_watcher, cad_watcher, time, json
 # Unified Logging Service
 # jdalbey 7/6/2019
@@ -16 +16 @@
 
 def main():
+    # Delete any previously existing output file
+    f = open("../dynamicdata/unifiedlog.html", "w")
+    startHTML = "<HTML><HEAD><meta http-equiv=\"refresh\" content=\"5\" /></HEAD><BODY><PRE>"
+    f.write(startHTML);
+    f.close()            
     # List of the available plugin modules 
-    plugins = ["cms_watcher"]
+    plugins = ["cms_watcher","cad_watcher"]
     #FOR each plugin LOOP
     for plugin in plugins:
         # dynamically load the setup function for this plugin
-        plugmodule = locals()[plugin]
+        plugmodule = globals()[plugin]
         setupfunc = getattr(plugmodule, 'setup')
         #Call setup
@@ -33 +38 @@
     #    Reset Output Buffer
         output = ""
+        results = []
     #    FOR each plugin LOOP
         for plugin in plugins:
             # dynamically load the setup function for this plugin
-            plugmodule = locals()[plugin]
-            comparefunc = getattr(plugmodule, 'compare')
+            plugmodule = globals()[plugin]
+            getfunc = getattr(plugmodule, 'getLogEntries')
             
     #        Run the plugin process returning new log entries
-            results = comparefunc()          # Look for changed messages
+            results = getfunc()     
+            #    Append simulation time and the log entries to the Output Buffer
+            for item in results:
+                trimmed_item = item.strip()
+                if len(trimmed_item) > 0:
+                    output += timeStamp + " " + trimmed_item + "\n"
     #    END LOOP
-    #    Append simulation time and the log entries to the Output Buffer
-        for item in results:
-            output += timeStamp + " " + item + "\n"
     #    IF the Output Buffer has any contents THEN
         if len(output) > 0:
     #       Write (append) Output Buffer to unified log file 
-            print output
+            print output,
+            f = open("../dynamicdata/unifiedlog.html", "a")
+            f.write(output)
+            f.close()            
     #    END IF
     #    Wait one second