Index: trunk/test/atmsdriver/model/HighwaysTest.java
===================================================================
--- trunk/test/atmsdriver/model/HighwaysTest.java	(revision 243)
+++ trunk/test/atmsdriver/model/HighwaysTest.java	(revision 248)
@@ -29,37 +29,37 @@
             writer.println("32 0 2");
             writer.println("1210831 1 5 S 0.9 8 CALAFIA");
-            writer.println("1210832 ML_1");
-            writer.println("1210833 ML_2");
-            writer.println("1210834 ML_3");
-            writer.println("1210835 ML_4");
-            writer.println("1210836 PASSAGE");
-            writer.println("1210837 DEMAND");
-            writer.println("1210838 QUEUE");
-            writer.println("1210839 RAMP_OFF");
+            writer.println("1210832 ML ML_1");
+            writer.println("1210833 ML ML_2");
+            writer.println("1210834 ML ML_3");
+            writer.println("1210835 ML ML_4");
+            writer.println("1210836 PA PASSAGE");
+            writer.println("1210837 DM DEMAND");
+            writer.println("1210838 QU QUEUE");
+            writer.println("1210839 FR RAMP_OFF");
             writer.println("1210845 2 5 S 1.49 9 EL CAMINO REAL");
-            writer.println("1210846 ML_1");
-            writer.println("1210847 ML_2");
-            writer.println("1210848 ML_3");
-            writer.println("1210849 ML_4");
-            writer.println("1210850 RAMP_ON");
-            writer.println("1210851 PASSAGE");
-            writer.println("1210853 DEMAND");
-            writer.println("1210854 QUEUE");
-            writer.println("1210855 RAMP_OFF");
+            writer.println("1210846 ML ML_1");
+            writer.println("1210847 ML ML_2");
+            writer.println("1210848 ML ML_3");
+            writer.println("1210849 ML ML_4");
+            writer.println("1210850 OR RAMP_ON");
+            writer.println("1210851 PA PASSAGE");
+            writer.println("1210853 DM DEMAND");
+            writer.println("1210854 QU QUEUE");
+            writer.println("1210855 FR RAMP_OFF");
             writer.println("74 0 1");
             writer.println("1204203 2 5 N 1.26 13 MAGDALENA");
-            writer.println("1204205 RAMP_ON");
-            writer.println("1204206 QUEUE");
-            writer.println("1204207 DEMAND");
-            writer.println("1204208 PASSAGE");
-            writer.println("1204210 RAMP_OFF");
-            writer.println("1204212 ML_1");
-            writer.println("1204213 ML_2");
-            writer.println("1204214 ML_3");
-            writer.println("1204215 ML_4");
-            writer.println("1204217 OS_1");
-            writer.println("1204218 OS_2");
-            writer.println("1204219 OS_3");
-            writer.println("1204220 OS_4");
+            writer.println("1204205 OR RAMP_ON");
+            writer.println("1204206 QU QUEUE");
+            writer.println("1204207 DM DEMAND");
+            writer.println("1204208 PA PASSAGE");
+            writer.println("1204210 FR RAMP_OFF");
+            writer.println("1204212 ML ML_1");
+            writer.println("1204213 ML ML_2");
+            writer.println("1204214 ML ML_3");
+            writer.println("1204215 ML ML_4");
+            writer.println("1204217 OS OS_1");
+            writer.println("1204218 OS OS_2");
+            writer.println("1204219 OS OS_3");
+            writer.println("1204220 OS OS_4");
             writer.close();
         } catch (Exception e) {
@@ -97,12 +97,11 @@
         System.out.println("toJson");
         Highways highways = new Highways(
-                "config/vds_data/highways_fullmap.txt",
+                "test/atmsdriver/model/ldssample.txt",
                 "localhost", 8080);
-        highways.getHighwayByRouteNumber(5).stations.get(0).loops.get(0).vol = 1;
+        //highways.getHighwayByRouteNumber(5).stations.get(0).loops.get(0).vol = 1;
         String result = highways.toJson();
         System.out.println(result);
-        assertTrue(result.startsWith(expToJson1));
-    }
-    String expToJson1 = ""; 
+        assertTrue(result.indexOf("33.416348") > 0);
+    }
    
 
Index: trunk/test/atmsdriver/model/PostmileCoordsTest.java
===================================================================
--- trunk/test/atmsdriver/model/PostmileCoordsTest.java	(revision 244)
+++ trunk/test/atmsdriver/model/PostmileCoordsTest.java	(revision 248)
@@ -37,10 +37,24 @@
 
         System.out.println("load");
-        String line1 = "ORA 4 5.55, 33.33, -117.117\nORA 4 6.66, 33.33, -117.117";
+        String line1 = "5 N 4.02, 33.33, -117.117\n5 S 3.56, 33.33, -117.117";
         Scanner scan = new Scanner(line1).useDelimiter("\\A"); 
         pmc = new PostmileCoords();
         pmc.load(scan);
-        PostmileCoords.Postmile pm = new PostmileCoords.Postmile("ORA 4 5.55", "33.33", "-117.117");
-        assertEquals(pmc.get(0),pm);
+        PostmileCoords.Postmile pm = new PostmileCoords.Postmile("5 N 4.02", "33.33", 
+                "-117.117");
+        assertEquals(pm,pmc.get(0));
+        assert(pmc.size() == 2);
+    }
+    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";
+        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");
+        assertEquals(pm,pmc.get(0));
         assert(pmc.size() == 2);
     }
@@ -60,7 +74,7 @@
         System.out.println("find");
         testLoad();
-        PostmileCoords.Postmile result = pmc.find("ORA 4 6.66");
+        PostmileCoords.Postmile result = pmc.find("5 N 4.02");
         assertNotNull(result);
-        PostmileCoords.Postmile pm = new PostmileCoords.Postmile("ORA 4 6.66", "33.33", "-117.117");
+        PostmileCoords.Postmile pm = new PostmileCoords.Postmile("5 N 4.02", "33.33", "-117.117");
         assertEquals(pm,result);
         PostmileCoords.Postmile result2 = pmc.find("X");