Changeset 266 in tmcsimulator

Timestamp:

02/16/2019 03:22:09 PM (7 years ago)

Author:

jdalbey

Message:

PostmileCoords?.java: Add cross street name attribute and modified toJson to include it.

Location:

trunk

Files:

• src/atmsdriver/model/Highways.java (modified) (1 diff)
• src/atmsdriver/model/PostmileCoords.java (modified) (4 diffs)
• src/tmcsim/application.properties (modified) (1 diff)
• test/atmsdriver/model/PostmileCoordsTest.java (modified) (3 diffs)

trunk/src/atmsdriver/model/Highways.java

@@ -556 +556 @@
                             + 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="";
-                    switch (stat.getColorByDirection(stat.direction))
-                    {
-                        case '@': colorName = "red";break;
-                        case '+': colorName = "yellow"; break;
-                        case '-': colorName = "lime";break;
-                        case ' ': colorName = "lime";break;
-                    }
-                    outString = outString.replace("desiredcolor",colorName);
-                    lineout.append(outString);
-                    lineout.append("  ");
+                        //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="";
+                        switch (stat.getColorByDirection(stat.direction))
+                        {
+                            case '@': colorName = "red";break;
+                            case '+': colorName = "yellow"; break;
+                            case '-': colorName = "lime";break;
+                            case ' ': colorName = "lime";break;
+                        }
+                        outString = outString.replace("desiredcolor",colorName);
+                        lineout.append(outString);
+                        lineout.append("  ");
                     }
                 }

trunk/src/atmsdriver/model/PostmileCoords.java

@@ -48 +48 @@
     public void load(Scanner scan)
     {
+        try
+        {
         String out = scan.next();
         //  split into an array 
@@ -62 +64 @@
             }  
             String revisedpm = nameparts[0] + " " + nameparts[1] + " " + statepm;
-            Postmile pm = new Postmile(revisedpm,fields[1],fields[2]);
+            Postmile pm = new Postmile(revisedpm,fields[1],fields[2],fields[3]);
             postmileList.add(pm);
+        }
+        }
+        catch (Exception ex)
+        {
+            ex.printStackTrace();
         }
     }
@@ -77 +84 @@
     final static class Postmile  
     {
-        String name;  // the postmile name (Route,Direction,State postmile)
+        String name;  // the postmile name (Route,Direction,State postmile, e.g., 5 N 6.2)
         String latitude; // the latitude coordinate for this postmile
         String longitude; // the longitude coordinate for this postmile
-        public Postmile(String name, String lat, String longitude)
+        String street; // cross street name
+        public Postmile(String name, String lat, String longitude, String street)
         {
             this.name = name.trim();
             this.latitude = lat.trim();
             this.longitude = longitude.trim();
+            this.street = street.trim();
         }
         public boolean nameEquals(String target)
@@ -98 +107 @@
             boolean r2 = this.latitude.equals(that.latitude);
             boolean r3 = this.longitude.equals(that.longitude);
-            return r1 && r2 && r3;
+            boolean r4 = this.street.equals(that.street);
+            return r1 && r2 && r3 && r4;
         }
         @Override public String toString()
         {
-            return name + ": " + latitude +","+ longitude;
+            return name + ": " + latitude +","+ longitude +","+ street;
         }
         public String toJson()
         {
-            String kFeature = "\n{\n   \"type\": \"Feature\",\n   \"id\": \"";
-            String kPoint = "\", \n     \"geometry\":\n       {\n        \"type\": \"Point\",\n        \"coordinates\": [";
-            String kProp = "]\n" +
-"      },\n" +
-"      \"properties\": \n" +
-"        {\"color\": \"desiredcolor\"";
-            String kTail = "}\n" +
-"    },";
-            return kFeature + name + kPoint + longitude + "," + latitude + kProp + kTail;
+            String pattern =  "\n{\n   \"type\": \"Feature\",\n" 
+                    + "   \"geometry\":\n       {\n        \"type\": \"Point\",\n" +
+                    "        \"coordinates\": [%s,%s]\n" +
+                    "       },\n" +
+                    "      \"properties\": \n" +         
+                    "        {\"id\": \"%s\", " +
+                    "\"street\": \"%s\", " +
+                    "\"color\": \"desiredcolor\"" +
+                    "}\n},";
+
+            return String.format(pattern, longitude, latitude, name, street);
         }
     }

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Tue, 12 Feb 2019 10:44:52 -0800
+#Sat, 16 Feb 2019 16:50:48 -0800
 
-Application.revision=259
+Application.revision=265
 
 Application.buildnumber=95

trunk/test/atmsdriver/model/PostmileCoordsTest.java

@@ -37 +37 @@
 
         System.out.println("load");
-        String line1 = "5 N 4.02, 33.33, -117.117\n5 S 3.56, 33.33, -117.117";
+        String line1 = "5 N 4.02, 33.33, -117.117,Dyer Rd\n5 S 3.56, 33.33, -117.117,Dyer Rd";
         Scanner scan = new Scanner(line1).useDelimiter("\\A"); 
         pmc = new PostmileCoords();
         pmc.load(scan);
         PostmileCoords.Postmile pm = new PostmileCoords.Postmile("5 N 4.02", "33.33", 
-                "-117.117");
+                "-117.117","Dyer Rd");
         assertEquals(pm,pmc.get(0));
         assert(pmc.size() == 2);
@@ -48 +48 @@
     public void testLoadwithPrefix() throws FileNotFoundException
     {
-
         System.out.println("load");
-        String line1 = "5 N R4.02, 33.33, -117.117\n5 S 3.56, 33.33, -117.117";
+        String line1 = "5 N R4.02, 33.33, -117.117,Dyer Rd\n5 S 3.56, 33.33, -117.117,Dyer Rd";
         Scanner scan = new Scanner(line1).useDelimiter("\\A"); 
         pmc = new PostmileCoords();
         pmc.load(scan);
         PostmileCoords.Postmile pm = new PostmileCoords.Postmile("5 N 4.02", "33.33", 
-                "-117.117");
+                "-117.117","Dyer Rd");
         assertEquals(pm,pmc.get(0));
         assert(pmc.size() == 2);
@@ -76 +75 @@
         PostmileCoords.Postmile result = pmc.find("5 N 4.02");
         assertNotNull(result);
-        PostmileCoords.Postmile pm = new PostmileCoords.Postmile("5 N 4.02", "33.33", "-117.117");
+        PostmileCoords.Postmile pm = new PostmileCoords.Postmile("5 N 4.02", "33.33", "-117.117","Dyer Rd");
         assertEquals(pm,result);
         PostmileCoords.Postmile result2 = pmc.find("X");
         assertNull(result2);
+        System.out.println(pm.toJson());
     }
 }