Changeset 278 in tmcsimulator for trunk/src/atmsdriver/model

Timestamp:

02/26/2019 09:11:08 AM (7 years ago)

Author:

jdalbey

Message:

Station.java CHANGED HIGHWAY MODEL to be consistent with JD's new BuildHighwayFile? pgm that creates a highway map based on VDS instead of Controller (LDS). (The code I removed is just commented out for now).

File:

• trunk/src/atmsdriver/model/Station.java (modified) (3 diffs)

trunk/src/atmsdriver/model/Station.java

@@ -187 +187 @@
         for (LoopDetector loop : loops)
         {
-            if (loop.loopLocation.startsWith(laneDir))
-            {
+            // THIS DECISION ISN'T NEEDED after JD's BuildHighwayFile pgm
+            // creates a highway map based on VDS instead of Controller (LDS).
+//            if (loop.loopLocation.startsWith(laneDir))
+//            {
                 // UPDATE LOOP WITH VALUES
                 loop.updateLoop(dotColor.volume(), dotColor.occupancy());
-            }
+//            }
         }
 
@@ -222 +224 @@
         for (LoopDetector loop : loops)
         {
-            if (loop.loopLocation.substring(0,2).equals(laneDir))
-            {
+            // THIS DECISION ISN'T NEEDED after JD's BuildHighwayFile pgm
+            // creates a highway map based on VDS instead of Controller (LDS).
+//            if (loop.loopLocation.substring(0,2).equals(laneDir))
+//            {
                 // Return color according to loop volume of first matching lane
                 if (loop.vol == 1)
@@ -237 +241 @@
                     return '-';
                 }
-            }
+//            }
         }
         // Default case for when the route is not on this direction