Changeset 269 in tmcsimulator

Timestamp:

02/21/2019 02:34:48 PM (7 years ago)

Author:

jdalbey

Message:

PostmileCoords?.java: Add new fields for perpendicular vector (x and y components). This enables adjusting the dot position along line perpendicular to the highway when the map is zoomed.

Location:

trunk

Files:

• src/atmsdriver/model/PostmileCoords.java (modified) (5 diffs)
• src/tmcsim/application.properties (modified) (1 diff)
• test/atmsdriver/model/PostmileCoordsTest.java (modified) (2 diffs)

trunk/src/atmsdriver/model/PostmileCoords.java

@@ -64 +64 @@
             }  
             String revisedpm = nameparts[0] + " " + nameparts[1] + " " + statepm;
-            Postmile pm = new Postmile(revisedpm,fields[1],fields[2],fields[3]);
+            Postmile pm;
+            // If the file has 6 fields per line, include the perpx,y values
+            if (fields.length == 6)
+            {
+                pm = new Postmile(revisedpm,fields[1],fields[2],fields[3],fields[4],fields[5]);
+            }
+            else // otherwise assume the file has just 4 fields
+            {
+                pm = new Postmile(revisedpm,fields[1],fields[2],fields[3]);
+            }
             postmileList.add(pm);
         }
         }
-        catch (Exception ex)
+        catch (Exception ex)  // probably badly formatted file
         {
             ex.printStackTrace();
@@ -88 +97 @@
         String longitude; // the longitude coordinate for this postmile
         String street; // cross street name
+        /* These fields are used by the map to adjust position of dot when zoomed */
+        String perpx="0";  // perpendicular vector, x-component (default value)
+        String perpy="0";  // perpendicular vector, y-component (default value)
         public Postmile(String name, String lat, String longitude, String street)
         {
@@ -94 +106 @@
             this.longitude = longitude.trim();
             this.street = street.trim();
+        }
+        // This constructor is used if the file contains data for perpendicular vectors
+        public Postmile(String name, String lat, String longitude, String street, String perpx, String perpy)
+        {
+            this.name = name.trim();
+            this.latitude = lat.trim();
+            this.longitude = longitude.trim();
+            this.street = street.trim();
+            this.perpx = perpx.trim();
+            this.perpy = perpy.trim();
         }
         public boolean nameEquals(String target)
@@ -112 +134 @@
         @Override public String toString()
         {
-            return name + ": " + latitude +","+ longitude +","+ street;
+            return name + ": " + latitude +","+ longitude +","+ street+","+ perpx +","+ perpy;
         }
         public String toJson()
@@ -123 +145 @@
                     "   \"properties\": \n" +         
                     "       {\"street\": \"%s\", " +
-                    "\"color\": \"desiredcolor\"" +
+                    "\"color\": \"desiredcolor\", " +
+                    "\"perpx\": \"%s\", " +
+                    "\"perpy\": \"%s\"" +
                     "}\n},";
 
-            return String.format(pattern, name, longitude, latitude, street);
+            return String.format(pattern, name, longitude, latitude, street, perpx, perpy);
         }
     }

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sun, 17 Feb 2019 10:04:13 -0800
+#Thu, 21 Feb 2019 15:22:00 -0800
 
-Application.revision=266
+Application.revision=268
 
 Application.buildnumber=95

trunk/test/atmsdriver/model/PostmileCoordsTest.java

@@ -54 +54 @@
         pmc.load(scan);
         PostmileCoords.Postmile pm = new PostmileCoords.Postmile("5 N 4.02", "33.33", 
-                "-117.117","Dyer Rd");
+                "-117.117","Dyer Rd","0","0");
+        assertEquals(pm,pmc.get(0));
+        assert(pmc.size() == 2);
+    }
+    public void testLoadNoPerps() throws FileNotFoundException
+    {
+
+        System.out.println("load");
+        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","Dyer Rd","0","0");
+        assertEquals(pm,pmc.get(0));
+        assert(pmc.size() == 2);
+    }
+    public void testLoadPerps() throws FileNotFoundException
+    {
+
+        System.out.println("load");
+        String line1 = "5 N 4.02, 33.33, -117.117,Dyer Rd,.1,.1\n5 S 3.56, 33.33, -117.117,Dyer Rd,.2,.2";
+        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","Dyer Rd",".1",".1");
         assertEquals(pm,pmc.get(0));
         assert(pmc.size() == 2);
@@ -75 +101 @@
         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","Dyer Rd");
+        PostmileCoords.Postmile pm = new PostmileCoords.Postmile("5 N 4.02", "33.33", "-117.117","Dyer Rd", "0.547592", "0.836745");
         assertEquals(pm,result);
         PostmileCoords.Postmile result2 = pmc.find("X");