Changeset 285 in tmcsimulator for trunk/src/atmsdriver/model/Highways.java

Timestamp:

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

Author:

jdalbey

Message:

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

File:

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

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);