Changeset 306 in tmcsimulator for trunk/src

Timestamp:

03/12/2019 11:23:26 AM (7 years ago)

Author:

jdalbey

Message:

Highways.java Enhanced/fixed so toJson() outputs each station only once (by removing Dir loop)

File:

• trunk/src/atmsdriver/model/Highways.java (modified) (1 diff)

trunk/src/atmsdriver/model/Highways.java

@@ -556 +556 @@
         for (Highway hwy: highways)
         {
-            // Consider each route direction
-            for (DIRECTION dir: DIRECTION.values())
-            {
-                // Examine every station on this highway and direction
-                StringBuilder lineout = new StringBuilder();
-                for (Station stat: hwy.stations)
-                {
-                    String pmID = "" + hwy.routeNumber + " " 
-                            + stat.direction.getLetter() + " " 
-                            + stat.postmile;
-                    PostmileCoords.Postmile currentPM = pmList.find(pmID);
-                    if (currentPM == null)
-                    { 
-                    Logger.getLogger(Highways.class.getName()).log(Level.INFO, 
-                            "Postmile Coords lookup couldn't find Station: "+pmID,
-                            " ");
-                    }
-                    if (currentPM != null)
-                    {    
-                        //lineout.append("" + dir.getLetter() + stat.postmile);
-                        //lineout.append(stat.getColorByDirection(dir));
-                        String outString = currentPM.toJson();
-                        // replace the color code with the color name
-                        String colorName=stat.getColorName();
-                        outString = outString.replace("desiredcolor",colorName);
-                        lineout.append(outString);
-                        lineout.append("  ");
-                    }
-                }
-                //result.append(rowLabel);
-                result.append(lineout + "\n");
-
-            }
+            // Examine every station on this highway
+            StringBuilder lineout = new StringBuilder();
+            for (Station stat: hwy.stations)
+            {
+                String pmID = "" + hwy.routeNumber + " " 
+                        + stat.direction.getLetter() + " " 
+                        + stat.postmile;
+                PostmileCoords.Postmile currentPM = pmList.find(pmID);
+                if (currentPM == null)
+                { 
+                Logger.getLogger(Highways.class.getName()).log(Level.INFO, 
+                        "Postmile Coords lookup couldn't find Station: "+pmID,
+                        " ");
+                }
+                if (currentPM != null)
+                {    
+                    //lineout.append("" + dir.getLetter() + stat.postmile);
+                    //lineout.append(stat.getColorByDirection(dir));
+                    String outString = currentPM.toJson();
+                    // replace the color code with the color name
+                    String colorName=stat.getColorName();
+                    outString = outString.replace("desiredcolor",colorName);
+                    lineout.append(outString);
+                    lineout.append("  ");
+                }
+            }
+            //result.append(rowLabel);
+            result.append(lineout + "\n");
+
         }
         // remove last trailing comma