Changeset 248 in tmcsimulator for trunk/src/tmcsim

Timestamp:

02/09/2019 08:18:35 AM (7 years ago)

Author:

jdalbey

Message:

TrafficModelManager?: multi-file commit to enhance Traffic Mgr to output highway status to json file for viewing in Google Map.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• cadsimulator/managers/TrafficModelManager.java (modified) (4 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Thu, 07 Feb 2019 15:47:33 -0800
+#Sat, 09 Feb 2019 09:41:52 -0800
 
-Application.revision=242
+Application.revision=247
 
 Application.buildnumber=91

trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java

@@ -1 +1 @@
 package tmcsim.cadsimulator.managers;
 
+import atmsdriver.GoogleMapAnimator;
 import atmsdriver.model.Highways;
 import atmsdriver.model.LoopDetector;
@@ -8 +9 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.PrintWriter;
 import java.rmi.RemoteException;
 import java.text.ParseException;
@@ -208 +210 @@
             wtConsole.start();
         }
+        // Always write to json for google map display
+        Thread wtJson = new WriteToJsonThread();
+        wtJson.start();
     }
     /** Accessor to event queue
@@ -403 +408 @@
             while (true)
             {
-                 // Write the highway network status to the FEP Simulator
+                 // Write the highway network status to the Console
                  System.out.println(highways.toString());
-
-                // Wait for FEP Sim to process the data we just sent
+                // Output the highway model 
+                String geojson = highways.toJson();
+                //System.out.println(geojson); // diagnostic
+                PrintWriter out;
+                try
+                {
+                    out = new PrintWriter("highways.json");
+                    out.print(geojson);
+                    out.close();
+                }
+                catch (FileNotFoundException ex)
+                {
+                    Logger.getLogger(GoogleMapAnimator.class.getName()).log(Level.SEVERE, null, ex);
+                }
+                // Wait for Google Map to process the data we just sent
                 try
                 {
                     Thread.sleep(5000);
+                }
+                catch (InterruptedException ie)
+                {
+                    ie.printStackTrace();
+                }
+            }
+
+        }
+    }
+    /** Writes the highway model to a GeoJson file for reading
+     *  by Google Maps.
+     */
+    class WriteToJsonThread extends Thread
+    {
+
+        public void run()
+        {
+            System.out.println("WriteToJson Thread starting.");
+            // Run indefinitely
+            while (true)
+            {
+                 // Write the highway network status to Json
+                String geojson = highways.toJson();
+                PrintWriter out;
+                try
+                {
+                    // currently writes to local file
+                    out = new PrintWriter("highways.json");
+                    out.print(geojson);
+                    out.close();
+                }
+                catch (FileNotFoundException ex)
+                {
+                    Logger.getLogger(GoogleMapAnimator.class.getName()).log(Level.SEVERE, null, ex);
+                }
+                // Wait for Google Map to process the data we just sent
+                try
+                {
+                    Thread.sleep(30000);
                 }
                 catch (InterruptedException ie)