Changeset 248 in tmcsimulator for trunk/src

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

Files:

• atmsdriver/ATMSDriver.java (modified) (1 diff)
• atmsdriver/GoogleMapAnimator.java (modified) (2 diffs)
• atmsdriver/model/Highways.java (modified) (3 diffs)
• atmsdriver/model/PostmileCoords.java (modified) (2 diffs)
• tmcsim/application.properties (modified) (1 diff)
• tmcsim/cadsimulator/managers/TrafficModelManager.java (modified) (4 diffs)

trunk/src/atmsdriver/ATMSDriver.java

@@ -8 +8 @@
 import tmcsim.common.SimulationException;
 
-/**
+/** "Super Old"
  * ATMS Driver reads the current simulation traffic conditions from the
  * EXCHANGE.XML file and constructs the Highway Network status info in the

trunk/src/atmsdriver/GoogleMapAnimator.java

@@ -33 +33 @@
      * Error logger.
      */
-    private final static Logger logger = Logger.getLogger("trafficmodeleventdriver");
+    private final static Logger logger = Logger.getLogger("mapanimator");
 
     /**
@@ -195 +195 @@
     public static void main(String[] args) throws RemoteException, SimulationException
     {
-        JFrame frame = new JFrame("Traffic Events Animator");
+        JFrame frame = new JFrame("Google Map Animator");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setSize(1050,450);

trunk/src/atmsdriver/model/Highways.java

@@ -545 +545 @@
         for (Highway hwy: highways)
         {
-            // Consider each route direction
-            //for (DIRECTION dir: DIRECTION.values())
-            // TODO: Needs fixing so proper direction is displayed
-            Station.DIRECTION dir = Station.DIRECTION.SOUTH;
-            if (hwy.routeNumber == 55)
-                dir = Station.DIRECTION.SOUTH;
-            if (hwy.routeNumber == 405)
-                dir = Station.DIRECTION.NORTH;
-            {
-                String rowLabel = ""+String.format("%3s ",hwy.routeNumber)+dir.getLetter()+' ';
+            // For json output we don't care about listing all the stations
+            // in order by direction because we are just outputting points not lines.
+            {
+                // Examine every station on this highway and direction
                 StringBuilder lineout = new StringBuilder();
-                // Examine every station on this highway and direction
                 for (Station stat: hwy.stations)
                 {
-                    String pmID = "" + hwy.routeNumber + " " + stat.postmile;
+                    String pmID = "" + hwy.routeNumber + " " 
+                            + stat.direction.getLetter() + " " 
+                            + stat.postmile;
                     PostmileCoords.Postmile currentPM = pmList.find(pmID);
                     if (currentPM != null)
@@ -566 +561 @@
                     //lineout.append(stat.getColorByDirection(dir));
                     String outString = currentPM.toJson();
+                    // replace the color code with the color name
                     String colorName="";
-                    switch (stat.getColorByDirection(dir))
+                    switch (stat.getColorByDirection(stat.direction))
                     {
                         case '@': colorName = "red";break;
@@ -579 +575 @@
                     }
                 }
-                                // See if there were stations for this direction
-                String checkMe = lineout.toString().trim();
-                // if any stations were colored, output the line
-                if (checkMe.length() > 1)
-                {
-                    //result.append(rowLabel);
-                    result.append(lineout + "\n");
-                }
+                //result.append(rowLabel);
+                result.append(lineout + "\n");
 
             }

trunk/src/atmsdriver/model/PostmileCoords.java

@@ -54 +54 @@
         {
             String[] fields = item.split(",");
-            Postmile pm = new Postmile(fields[0],fields[1],fields[2]);
+            String[] nameparts = fields[0].split(" ");
+            String statepm = nameparts[2];
+            // some postmiles come with a prefix, which we ignore
+            if (Character.isLetter(statepm.charAt(0)))
+            {
+                statepm = statepm.substring(1);
+            }  
+            String revisedpm = nameparts[0] + " " + nameparts[1] + " " + statepm;
+            Postmile pm = new Postmile(revisedpm,fields[1],fields[2]);
             postmileList.add(pm);
         }
@@ -69 +77 @@
     final static class Postmile  
     {
-        String name;  // the postmile name or id
+        String name;  // the postmile name (Route,Direction,State postmile)
         String latitude; // the latitude coordinate for this postmile
         String longitude; // the longitude coordinate for this postmile

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)