Index: trunk/src/atmsdriver/model/Station.java
===================================================================
--- trunk/src/atmsdriver/model/Station.java	(revision 184)
+++ trunk/src/atmsdriver/model/Station.java	(revision 186)
@@ -88,13 +88,21 @@
         return oppTotVol;
     }
-
-    /**
-     * Returns the station metadata in condensed form. This is just a quick
-     * script function to make a proper highway metadata configuration file, so
-     * that we can read the network faster.
-     *
-     * @return station metadata
-     */
-    public String getStationMeta()
+    
+    /** Returns a string of highways data. If MetaDataOnly is true, you get a full
+     *  dump of the highways meta data, which does not include dynamic loop values,
+     *  and does include the string location names. If MetaDataOnly is false,
+     *  dynamic loop values are included, and unnecessary information like string
+     *  location values are included.
+     * 
+     *  The FEPSimulator takes in the toCondensedFormat() output, with a MetaDataOnly
+     *  value of false, over the socket.
+     * 
+     *  The MetaDataOnly flag should be used to get a full dump of the highways
+     *  information. This was used to get the highways_fullmap.txt output.
+     * 
+     * @param MetaDataOnly Whether you want meta data, or a full dump for FEPSim
+     * @return String, highways data in condensed format
+     */
+    public String toCondensedFormat(boolean MetaDataOnly)
     {
         StringBuilder build = new StringBuilder();
@@ -111,9 +119,12 @@
         build.append(Integer.toString(loops.size()));
         build.append(" ");
-        build.append(this.location);
+        if(MetaDataOnly)
+        {
+            build.append(this.location);
+        }
         build.append("\n");
         for (LoopDetector loop : loops)
         {
-            build.append(loop.getLoopMeta());
+            build.append(loop.toCondensedFormat(MetaDataOnly));
         }
         return build.toString();
Index: trunk/src/atmsdriver/model/FEPLine.java
===================================================================
--- trunk/src/atmsdriver/model/FEPLine.java	(revision 184)
+++ trunk/src/atmsdriver/model/FEPLine.java	(revision 186)
@@ -37,9 +37,20 @@
     }
     
-    /**
-     * Returns the FEPLine meta data in string format
-     * @return FEPLine metadata
+    /** Returns a string of highways data. If MetaDataOnly is true, you get a full
+     *  dump of the highways meta data, which does not include dynamic loop values,
+     *  and does include the string location names. If MetaDataOnly is false,
+     *  dynamic loop values are included, and unnecessary information like string
+     *  location values are included.
+     * 
+     *  The FEPSimulator takes in the toCondensedFormat() output, with a MetaDataOnly
+     *  value of false, over the socket.
+     * 
+     *  The MetaDataOnly flag should be used to get a full dump of the highways
+     *  information. This was used to get the highways_fullmap.txt output.
+     * 
+     * @param MetaDataOnly Whether you want meta data, or a full dump for FEPSim
+     * @return String, highways data in condensed format
      */
-    public String getLineMeta()
+    public String toCondensedFormat(boolean MetaDataOnly)
     {
         StringBuilder build = new StringBuilder();
@@ -50,7 +61,7 @@
         build.append(Integer.toString(this.stations.size()));
         build.append("\n");
-        for (Station station : stations)
+        for(Station station : stations)
         {
-            build.append(station.getStationMeta());
+            build.append(station.toCondensedFormat(MetaDataOnly));
         }
         return build.toString();
Index: trunk/src/atmsdriver/model/Highways.java
===================================================================
--- trunk/src/atmsdriver/model/Highways.java	(revision 184)
+++ trunk/src/atmsdriver/model/Highways.java	(revision 186)
@@ -354,24 +354,32 @@
         }
     }
-
-    /**
-     * Returns the highways metadata in condensed form. This function took the 
-     * highways model and wrote it into condensed form. It is also useful for
-     * testing.
-     *
-     * @return the highways meta data string
-     */
-    public String getHighwaysMeta()
-    {
-            StringBuilder build = new StringBuilder();
-            build.append(lines.size());
-            build.append("\n");
-            for (FEPLine line : lines)
-            {
-                build.append(line.getLineMeta());
-            }
-            return build.toString();
-    }
-
+    
+    /** Returns a string of highways data. If MetaDataOnly is true, you get a full
+     *  dump of the highways meta data, which does not include dynamic loop values,
+     *  and does include the string location names. If MetaDataOnly is false,
+     *  dynamic loop values are included, and unnecessary information like string
+     *  location values are included.
+     * 
+     *  The FEPSimulator takes in the toCondensedFormat() output, with a MetaDataOnly
+     *  value of false, over the socket.
+     * 
+     *  The MetaDataOnly flag should be used to get a full dump of the highways
+     *  information. This was used to get the highways_fullmap.txt output.
+     * 
+     * @param MetaDataOnly Whether you want meta data, or a full dump for FEPSim
+     * @return String, highways data in condensed format
+     */
+    public String toCondensedFormat(boolean MetaDataOnly)
+    {
+        StringBuilder build = new StringBuilder();
+        build.append(lines.size());
+        build.append("\n");
+        for(FEPLine line : lines)
+        {
+            build.append(line.toCondensedFormat(MetaDataOnly));
+        }
+        return build.toString();
+    }
+    
     /**
      * Returns the Highways model data in XML format.
Index: trunk/src/atmsdriver/model/LoopDetector.java
===================================================================
--- trunk/src/atmsdriver/model/LoopDetector.java	(revision 184)
+++ trunk/src/atmsdriver/model/LoopDetector.java	(revision 186)
@@ -68,13 +68,20 @@
     }
     
-    /**
-     * Returns the loop metadata in condensed form.
-     * This is just a quick script function to make a proper highway
-     * metadata configuration file, so that we can read the network
-     * faster.
-     * 
-     * @return loop metadata
-     */
-    public String getLoopMeta()
+    /** Returns a string of highways data. If MetaDataOnly is true, you get a full
+     *  dump of the highways meta data, which does not include dynamic loop values,
+     *  and does include the string location names. If MetaDataOnly is false,
+     *  dynamic loop values are included, and unnecessary information like string
+     *  location values are included.
+     * 
+     *  The FEPSimulator takes in the toCondensedFormat() output, with a MetaDataOnly
+     *  value of false, over the socket.
+     * 
+     *  The MetaDataOnly flag should be used to get a full dump of the highways
+     *  information. This was used to get the highways_fullmap.txt output.
+     * 
+     * @param MetaDataOnly Whether you want meta data, or a full dump for FEPSim
+     * @return String, highways data in condensed format
+     */
+    public String toCondensedFormat(boolean MetaDataOnly)
     {
         StringBuilder build = new StringBuilder();
@@ -83,5 +90,17 @@
         build.append(Integer.toString(this.laneNum));
         build.append(" ");
-        build.append(this.loopLocation);
+        if(!MetaDataOnly)
+        {
+            build.append(" ");
+            build.append(this.occ);
+            build.append(" ");
+            build.append(this.vol);
+            build.append(" ");
+            build.append(this.spd);
+        }
+        else
+        {
+            build.append(this.loopLocation);
+        }
         build.append("\n");
         return build.toString();