Changeset 285 in tmcsimulator for trunk/src

Timestamp:

02/28/2019 10:21:36 AM (7 years ago)

Author:

jdalbey

Message:

Station.java: Add getColorName method, comment out dead code.

Location:

trunk/src

Files:

• atmsdriver/model/Highways.java (modified) (3 diffs)
• atmsdriver/model/Station.java (modified) (3 diffs)
• tmcsim/application.properties (modified) (1 diff)

trunk/src/atmsdriver/model/Highways.java

@@ -510 +510 @@
                 {
                     //lineout.append("" + dir.getLetter() + stat.postmile);
-                    lineout.append(stat.getColorByDirection(dir));
+                    lineout.append(stat.getColor());
                     //lineout.append("  ");
                 }
@@ -543 +543 @@
         Scanner s = new Scanner(fis).useDelimiter("\\A");
         pmList.load(s);
+        
         String header = "{\n" +
         "  \"type\": \"FeatureCollection\",\n" +
@@ -573 +574 @@
                         String outString = currentPM.toJson();
                         // replace the color code with the color name
-                        String colorName="";
-                        switch (stat.getColorByDirection(stat.direction))
-                        {
-                            case '@': colorName = "red";break;
-                            case '+': colorName = "yellow"; break;
-                            case '-': colorName = "lime";break;
-                            case ' ': colorName = "lime";break;
-                        }
+                        String colorName=stat.getColorName();
                         outString = outString.replace("desiredcolor",colorName);
                         lineout.append(outString);

trunk/src/atmsdriver/model/Station.java

@@ -202 +202 @@
     /**
      * Return the color for the lanes in a given direction.
-     *
-     * @param direction
-     * @return character representing color of lanes in given direction '@' =
-     * red, '+' = yellow, '-' = green
-     */
-    public char getColorByDirection(DIRECTION direction)
+     * @return character representing color of this station's traffic flow
+     * '@' = red, '+' = yellow, '-' = green
+     */
+    public char getColor()
     {
         /* For now just use the color of the first lane. 
@@ -213 +211 @@
 
         String laneDir = "";
-        if (direction.equals(this.direction))
-        {
-            laneDir = "ML";
-        }
-        else if (direction.equals(this.direction.getOpposite()))
-        {
-            laneDir = "OS";
-        }
+        
+            // THIS DECISION ISN'T NEEDED after JD's BuildHighwayFile pgm
+            // creates a highway map based on VDS instead of Controller (LDS).
+//        if (direction.equals(this.direction))
+//        {
+//            laneDir = "ML";
+//        }
+//        else if (direction.equals(this.direction.getOpposite()))
+//        {
+//            laneDir = "OS";
+//        }
         // Search lanes to find specified direction
         for (LoopDetector loop : loops)
@@ -245 +246 @@
         // Default case for when the route is not on this direction
         return ' ';
-
-    }
-
+    }
+    /**
+     * Return the color name for the traffic volume of this station.
+     */
+    public String getColorName()
+    {
+        String colorName = "";
+        switch (this.getColor())
+        {
+            case '@': colorName = "red";break;
+            case '+': colorName = "yellow"; break;
+            case '-': colorName = "lime";break;
+            case ' ': colorName = "lime";break;
+        }
+        return colorName;
+    }
     /**
      * Output for updateByDirection. Logs the update to the console.

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Tue, 26 Feb 2019 10:41:58 -0800
+#Thu, 28 Feb 2019 10:42:26 -0800
 
-Application.revision=278
+Application.revision=283
 
-Application.buildnumber=100
+Application.buildnumber=101