Index: trunk/webapps/cptms/js/cctvLayer.js
===================================================================
--- trunk/webapps/cptms/js/cctvLayer.js	(revision 357)
+++ trunk/webapps/cptms/js/cctvLayer.js	(revision 405)
@@ -63,23 +63,18 @@
         nearVDS = map.data.getFeatureById(event.feature.getProperty("nearVDS"));
         currentColor = nearVDS.getProperty("color");
-        // Currently, Fast and Slow images are stored in separate folders.
-        // As Neil gets actual images collated, we will change this to a file name scheme
+        // file name scheme
         // rte-id-velocity.jpg 
         // rte is route number, e.g., 055
         // id is 4-digit camera id, e.g., 0012
         // vel is traffic velocity: "freeflow", "slow", or "stopped"
-        var imgDir = "CCTVFast/";
-        if (currentColor == "red" || currentColor == "yellow")
-        {
-            imgDir = "CCTVSlow/"
-        }
-        var label = "freeflow";
+        var imgDir = "CCTV/";
+        var label = "-day-freeflow";
         if (currentColor == "red")
         {
-            label = "stopped";
+            label = "-day-stopped";
         }
         if (currentColor == "yellow")
         {
-            label = "slow";
+            label = "-day-slow";
         }
 
@@ -92,5 +87,5 @@
         // image from fast or slow directories
         {
-            cctv_infowindow.setContent('<div style="font-weight:bold;font-family: monospace">' +  cctvIndex + "&nbsp;" + cctvLocation + "&nbsp;" +label+ "<BR>" + imgTag + imgDir + cctvIndex + '.jpg">' + "</div>");
+            cctv_infowindow.setContent('<div style="font-weight:bold;font-family: monospace">' +  cctvIndex + "&nbsp;" + cctvLocation + "&nbsp;" +label+ "<BR>" + imgTag + imgDir + cctvIndex + label +'.jpg">' + "</div>");
         }
         cctv_infowindow.setPosition(event.feature.getGeometry().get());