Changeset 405 in tmcsimulator for trunk


Ignore:
Timestamp:
05/15/2019 02:10:45 PM (7 years ago)
Author:
jdalbey
Message:

Remove HAR , Lane Closure columns from CMSmonitor. Change cctvLayer to user filename instead of folder for img categories.

Location:
trunk/webapps
Files:
223 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/webapps/cmsmonitor/index.html

    r401 r405  
    2525 
    2626.left { 
    27   width: 50%; 
     27  width: 100%; 
    2828} 
    2929 
    … …  
    6868    <h2>Active CMS Messages</h2> 
    6969    <p id="msgs"></p> 
    70   </div> 
    71   <div class="column middle" > 
    72     <h2>Active HAR Messages</h2> 
    73     <p>Not implemented yet.</p> 
    74   </div> 
    75   <div class="column right" > 
    76     <h2>Active Lane Closures</h2> 
    77     <p>Not implemented yet.</p> 
    7870  </div> 
    7971</div> 

  • trunk/webapps/common/js/revision_number.dat

    r404 r405  
    11 
    2     var revisionNumber = "403"; 
     2    var revisionNumber = "404"; 
    33     

  • trunk/webapps/cptms/js/cctvLayer.js

    r357 r405  
    6363        nearVDS = map.data.getFeatureById(event.feature.getProperty("nearVDS")); 
    6464        currentColor = nearVDS.getProperty("color"); 
    65         // Currently, Fast and Slow images are stored in separate folders. 
    66         // As Neil gets actual images collated, we will change this to a file name scheme 
     65        // file name scheme 
    6766        // rte-id-velocity.jpg  
    6867        // rte is route number, e.g., 055 
    6968        // id is 4-digit camera id, e.g., 0012 
    7069        // vel is traffic velocity: "freeflow", "slow", or "stopped" 
    71         var imgDir = "CCTVFast/"; 
    72         if (currentColor == "red" || currentColor == "yellow") 
    73         { 
    74             imgDir = "CCTVSlow/" 
    75         } 
    76         var label = "freeflow"; 
     70        var imgDir = "CCTV/"; 
     71        var label = "-day-freeflow"; 
    7772        if (currentColor == "red") 
    7873        { 
    79             label = "stopped"; 
     74            label = "-day-stopped"; 
    8075        } 
    8176        if (currentColor == "yellow") 
    8277        { 
    83             label = "slow"; 
     78            label = "-day-slow"; 
    8479        } 
    8580 
    … …  
    9287        // image from fast or slow directories 
    9388        { 
    94             cctv_infowindow.setContent('<div style="font-weight:bold;font-family: monospace">' +  cctvIndex + "&nbsp;" + cctvLocation + "&nbsp;" +label+ "<BR>" + imgTag + imgDir + cctvIndex + '.jpg">' + "</div>"); 
     89            cctv_infowindow.setContent('<div style="font-weight:bold;font-family: monospace">' +  cctvIndex + "&nbsp;" + cctvLocation + "&nbsp;" +label+ "<BR>" + imgTag + imgDir + cctvIndex + label +'.jpg">' + "</div>"); 
    9590        } 
    9691        cctv_infowindow.setPosition(event.feature.getGeometry().get()); 
Note: See TracChangeset for help on using the changeset viewer.