Changeset 338 in tmcsimulator for trunk/src/tmcsim

Timestamp:

03/21/2019 08:55:34 AM (7 years ago)

Author:

jdalbey

Message:

Add items to adhoc_incidents.xml, add unavailable image for cctv files not found - and corresponding code in cctvLayer.js. Make HAR messages upper case.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• utilities/BuildHighwayFile.java (modified) (5 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sat, 16 Mar 2019 16:37:53 -0700
+#Wed, 20 Mar 2019 14:40:29 -0700
 
-Application.revision=311
+Application.revision=337
 
 Application.buildnumber=108

trunk/src/tmcsim/utilities/BuildHighwayFile.java

@@ -29 +29 @@
 public class BuildHighwayFile
 {
-    final public static String filepath = "config/vds_data/old_vds_data/";
-    final public static String vdsFileName = "d12_vds_meta_triangle.csv";
+    final public static String dirpath = "config/vds_data/old_vds_data/";
+    final public static String vdsFileName = "d12_vds_meta.txt";
     final public static String loopFileName = "cleaned_chu_atms_loop_data.txt";
     final public static String ldsFileName = "cleaned_chu_atms_lds_data.txt";
-    final public static String highwayFile = "highways_triangle.txt";
+    final public static String highwayFile = "highways_complete.txt";
     /** A dictionary of ldsIDs to VDSids */
     Map<String,StationAddr> ldsDict;
@@ -54 +54 @@
         try
         {
-            PrintWriter hwyWriter = new PrintWriter(new File(filepath+highwayFile));
+            PrintWriter hwyWriter = new PrintWriter(new File(dirpath+highwayFile));
             hwyWriter.print(feplines.size()+"\n");
             // for each fep line
@@ -108 +108 @@
         try
         {
-            Scanner loopScanner = new Scanner(new File(filepath+loopFileName));
+            Scanner loopScanner = new Scanner(new File(dirpath+loopFileName));
             
             loopScanner.nextLine();  // Skip the column headers
@@ -217 +217 @@
         try
         {
-            Scanner vdsScanner = new Scanner(new File(filepath+vdsFileName));
+            Scanner vdsScanner = new Scanner(new File(dirpath+vdsFileName));
             
             // Read the tab-delimited vds file
@@ -252 +252 @@
         try
         {
-            Scanner ldsScanner = new Scanner(new File(filepath+ldsFileName));
+            Scanner ldsScanner = new Scanner(new File(dirpath+ldsFileName));
             
             ldsScanner.nextLine();  // Skip the column headers