Changeset 291 in tmcsimulator for trunk/src

Timestamp:

03/02/2019 03:08:18 PM (7 years ago)

Author:

jdalbey

Message:

file cleanup and reorganization

Location:

trunk/src

Files:

• cptms/cptms_map_v55.html (modified) (6 diffs)
• cptms/highways.json (deleted)
• cptms/scaling_dotsize_prototype.html (modified) (1 diff)
• cptms/stms_map_v54a.html (deleted)
• tmcsim/application.properties (modified) (1 diff)
• tmcsim/utilities/BuildHighwayFile.java (modified) (1 diff)

trunk/src/cptms/cptms_map_v55.html

@@ -82 +82 @@
     // Dot colors used in traffic model to indicate free-flowing, slowed, and stopped traffic
     // and their associated zvalues so slower traffic dots are more visible.
-    var colorZvalues = {"lime":10,"yellow":20,"red":30};
+    // white means a disabled spot
+    var colorZvalues = {"white":5,"lime":10,"yellow":20,"red":30};
 
     // Build a solid colored icon to use instead of the classic pin
@@ -116 +117 @@
         map.data.setStyle(function(feature) 
         {
-            //console.log(feature.getId() + " " + feature.getGeometry().get());
             // Get the postmile id 
             var name = feature.getId();
@@ -152 +152 @@
     function calcDistanceFactor()
     {
-        // 15 is maximum zoom, the point at which no adjusment is needed
+        // 15 is maximum zoom, the point at which no adjustment is needed
         return (.0005*(15-map.getZoom()));  
     }
@@ -162 +162 @@
     function adjustCoords(adjAmount)
     {
-        //console.log("adjusting coordinates");
         // Adjust the NB points a slight amount
         map.data.forEach(function(feature)
@@ -195 +194 @@
             // set zIndex for slowed traffic to a higher value so they overlap
             currentFeature.setProperty("zIndex", colorZvalues[newColor]);
-            //console.log(target+" updated to "+newColor);
         }
      }
@@ -341 +339 @@
             // fetch how much the map is currently zoomed
             currentZoom = map.getZoom(); 
-            //console.log("Zoom changed to ",currentZoom);
             // only bother adjusting within this range
             if ((currentZoom <16) && (currentZoom>10))

trunk/src/cptms/scaling_dotsize_prototype.html

@@ -7 +7 @@
       /* Set the size of the div element that contains the map */
       #mapdiv {
-        height: 550px;  // or  height: 100%
+        height: 550px;  
         width: 100%;  
        }

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Thu, 28 Feb 2019 10:42:26 -0800
+#Sat, 02 Mar 2019 15:51:02 -0800
 
-Application.revision=283
+Application.revision=289
 
-Application.buildnumber=101
+Application.buildnumber=102

trunk/src/tmcsim/utilities/BuildHighwayFile.java

@@ -30 +30 @@
 {
     final public static String filepath = "config/vds_data/old_vds_data/";
-    final public static String vdsFileName = "d12_vds_meta.txt";
+    final public static String vdsFileName = "d12_vds_meta_triangle.csv";
     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_fullmap.txt";
+    final public static String highwayFile = "highways_triangle.txt";
     /** A dictionary of ldsIDs to VDSids */
     Map<String,StationAddr> ldsDict;