Changeset 372 in tmcsimulator for trunk

Timestamp:

04/16/2019 09:15:32 AM (7 years ago)

Author:

jdalbey

Message:

more dir reorg

Location:

trunk/webapps

Files:

• cgi-bin (moved) (moved from trunk/webapps/cptms/cgi-bin)
• cmsmonitor (added)
• cmsmonitor/cms_monitor.html (moved) (moved from trunk/webapps/cptms/cms_monitor.html)
• common (added)
• common/js (added)
• common/js/fileutils.js (moved) (moved from trunk/webapps/cptms/js/common.js) (1 diff)
• cptms/index.html (moved) (moved from trunk/webapps/cptms/cptms.html) (5 diffs)
• cptms/js/cmsLayer.js (modified) (2 diffs)
• cptms/js/harLayer.js (modified) (2 diffs)
• dynamicdata (added)
• dynamicdata/cms_messages.json (moved) (moved from trunk/webapps/cptms/cms_messages.json)
• dynamicdata/har_messages.json (moved) (moved from trunk/webapps/cptms/har_messages.json)
• dynamicdata/highway_status.json (moved) (moved from trunk/webapps/cptms/highway_status.json)
• dynamicdata/sim_elapsedtime.json (moved) (moved from trunk/webapps/cptms/sim_elapsedtime.json)
• dynamicdata/sim_scriptname.json (moved) (moved from trunk/webapps/cptms/sim_scriptname.json)
• einotebook (moved) (moved from trunk/webapps/notebook)
• einotebook/index.html (modified) (1 diff)
• einotebook/maps/index.html (modified) (1 diff)

trunk/webapps/common/js/fileutils.js

@@ -22 +22 @@
     }
 
-
-    function handleDialogClose(id)
-    {
-        // hide the display
-        document.getElementById(id).style.display = 'none'
-    }
-
-

trunk/webapps/cptms/index.html

@@ -59 +59 @@
         <button onclick="handleCMSsubmit();">Send >></button><br><br>
         <button onclick="handleCMSclear();">Clear >></button><br><br>
-        <button onclick="handleDialogClose('cms-dialog');">Close </button>
+        <button onclick="hideElementById('cms-dialog');">Close </button>
         </div>
         <div id="cms-message-display"  style="display: block;">Current:
@@ -83 +83 @@
         <button onclick="handleHARsubmit();">Send >></button>
         <button onclick="handleHARclear();">Clear >></button>
-        <button onclick="handleDialogClose('har-dialog');">Close </button><br><br>
+        <button onclick="hideElementById('har-dialog');">Close </button><br><br>
         </div>
         <div id="har-message-display"  style="display: block;">Current:<br>
@@ -126 +126 @@
     };
 
-    var kVDSstatusFile = "highway_status.json"; // dynamic json data file created by CADserver
+    var kVDSstatusFile = "../dynamicdata/highway_status.json"; // dynamic json data file created by CADserver
     var kMapStartupFile = "data_layers/highways_startup.json"; // initial (static) highways file used once at startup
     var kCMSfile = "data_layers/cms_locations_D12.gjson"; // CMS locations 
@@ -199 +199 @@
             if ((currentZoom < 16) && (currentZoom > 10))
             {
-                // magic formula controls distance between dots
+                // clever formula controls distance between dots
                 adjustCoords(calcDistanceFactor());
             }
@@ -207 +207 @@
 
     </script>
-    <script  src="js/common.js"></script>
+    <script  src="../common/js/fileutils.js"></script>
+    <script  src="../common/js/displayutils.js"></script> 
     <script  src="js/vdsLayer.js"></script>
     <script  src="js/cmsLayer.js"></script>

trunk/webapps/cptms/js/cmsLayer.js

@@ -75 +75 @@
         span.onclick = function()
         {
-            handleDialogClose('cms-dialog');
+            hideElementById('cms-dialog');
         }
     });
@@ -186 +186 @@
     function loadAllcmsMessages()
     {
-        loadJSON("cms_messages.json", function(response)
+        loadJSON("../dynamicdata/cms_messages.json", function(response)
         {
             // Parse JSON string into object

trunk/webapps/cptms/js/harLayer.js

@@ -67 +67 @@
         span.addEventListener('click',function()
         {
-            handleDialogClose('har-dialog');
+            hideElementById('har-dialog');
         });
     });
@@ -139 +139 @@
     function loadAllharMessages()
     {
-        loadJSON("har_messages.json", function(response)
+        loadJSON("../dynamicdata/har_messages.json", function(response)
         {
             // Parse JSON string into object

trunk/webapps/einotebook/index.html

@@ -8 +8 @@
     <link rel="stylesheet" type="text/css" href="notebook.css"> 
     <link rel="stylesheet" type="text/css" href="ipadapp.css">
-    <script type="text/javascript" src="../js/common.js"></script> 
+    <script type="text/javascript" src="../common/js/fileutils.js"></script> 
     <script type="text/javascript" src="scripts/cookies.js"></script>
     <script type="text/javascript" src="scripts/Events.js"></script>

trunk/webapps/einotebook/maps/index.html

@@ -33 +33 @@
             <div id="googleMapContent" style="display:none;"><iframe frameborder=0 width=740 height=600 
                 scrolling=no src=googleMap.html marginheight=0 marginwidth=0></iframe></div>
+
         <div id="atmsMapContent" style="display:inline;"><iframe frameborder=0 width=740 height=600 
+                scrolling=no src="../../cptms/index.html" marginheight=0 marginwidth=0></iframe></div>
+<!--        <div id="atmsMapContent" style="display:inline;"><iframe frameborder=0 width=740 height=600 
                 scrolling=no src="../../cptms.html" marginheight=0 marginwidth=0></iframe></div>
+-->
     </center>
   </body>