Merge pull request #2 from BenchmarkSims/dev

update to functions

Author: MaxWaldorf

01_KTO_Interactive_Map/index.html

@@ -1616,7 +1616,7 @@
     <!-- Connectivity TAB -->
     <div id="Connections" class="tabcontent">
       <b>Collaboration</b><hr>
-      <input type="checkbox" id="imcs-secure" value="on" onchange="changedIMCS(this);"><label for="secure">&nbspSecure Connection</label><br><br>
+      <input type="checkbox" id="imcs-secure" value="on" onchange="changedIMCS(this);"><label for="imcs-secure">&nbspSecure Connection</label><br><br>
       <table width="95%">
         <tr><td align="right">Callsign</td><td><input type="text" id="imcs-callsign" name="callsign" onchange="changedIMCS(this);" style="width:130px"></td></tr>
         <tr><td align="right">Session</td><td><input type="text" id="imcs-session" name="session" onchange="changedIMCS(this);" style="width:130px"></td></tr>

02_Balkans_Interactive_Map/index.html

@@ -2103,7 +2103,7 @@
       <!-- Connectivity TAB -->
       <div id="Connections" class="tabcontent">
         <b>Collaboration</b><hr>
-        <input type="checkbox" id="imcs-secure" value="on" onchange="changedIMCS(this);"><label for="secure">&nbspSecure Connection</label><br><br>
+        <input type="checkbox" id="imcs-secure" value="on" onchange="changedIMCS(this);"><label for="imcs-secure">&nbspSecure Connection</label><br><br>
         <table width="95%">
           <tr><td align="right">Callsign</td><td><input type="text" id="imcs-callsign" name="callsign" onchange="changedIMCS(this);" style="width:130px"></td></tr>
           <tr><td align="right">Session</td><td><input type="text" id="imcs-session" name="session" onchange="changedIMCS(this);" style="width:130px"></td></tr>

03_ITO_Interactive_Map/index.html

@@ -1897,7 +1897,7 @@
       <!-- Connectivity TAB -->
       <div id="Connections" class="tabcontent">
         <b>Collaboration</b><hr>
-        <input type="checkbox" id="imcs-secure" value="on" onchange="changedIMCS(this);"><label for="secure">&nbspSecure Connection</label><br><br>
+        <input type="checkbox" id="imcs-secure" value="on" onchange="changedIMCS(this);"><label for="imcs-secure">&nbspSecure Connection</label><br><br>
         <table width="95%">
           <tr><td align="right">Callsign</td><td><input type="text" id="imcs-callsign" name="callsign" onchange="changedIMCS(this);" style="width:130px"></td></tr>
           <tr><td align="right">Session</td><td><input type="text" id="imcs-session" name="session" onchange="changedIMCS(this);" style="width:130px"></td></tr>

common/scripts/map_actions.js

@@ -1618,9 +1618,6 @@ window.onload = function(e) {
   this.addEventListener('mousemove', pointer_drag);
   this.addEventListener('mouseup',   pointer_end);
 
-  // Install the File handler
-  reader.addEventListener('load', processFile);
-
   // Trigger a Render
   updateToolbar();
 

common/scripts/map_draw.js

@@ -356,7 +356,7 @@ function getDopplerColor(scan) {
 // Draw the Radar from the fmap
 function drawDopplerRadar(ctx) {
     // Guard
-    if (fmap.radar.length == 0) return;
+    if (fmap.type.length == 0) return;
 
     // Set Transparency
     ctx.globalAlpha = 0.6;
@@ -374,8 +374,8 @@ function drawDopplerRadar(ctx) {
             var y = ((point.y + 1920) / 65) >> 0 ;
             if (x > 58) x = 58;
             if (y > 58) y = 58;
-            //console.log(x,y);
-            var scan = fmap.radar[y][x];
+
+            var scan = dopplerSense(x,y);
             var occluded = ((Math.random() * 15) >> 0) > 13;
             if (scan != 0 && !occluded) {
                 ctx.beginPath();

common/scripts/map_files.js

@@ -4,7 +4,6 @@
 // This file will process Mission.ini  and Pilot.ini files.
 // TODO: Process .fmap files for weather layer
 
-var reader = new FileReader();
 var filename = "";
 
 function processWhiteboard(data) {
@@ -30,31 +29,31 @@ function processWhiteboard(data) {
 // BMS fmap weather or Mission.ini and Pilot.ini can be dropped
 function processFile(e) {
 
-    if (typeof(reader.result) == "string") {
+    if (typeof(e.target.result) == "string") {
 
         // Process .ini file
         if (filename.endsWith(".ini")) {
-            processDataCartridge(reader.result);
+            processDataCartridge(e.target.result);
             refreshCanvas();
             return;
         }
         // Process .png file
         if (filename.endsWith(".png")) {
-            processWhiteboard(reader.result);
+            processWhiteboard(e.target.result);
             return;
         }
     }
-    if (typeof(reader.result) == "object") {
+    if (typeof(e.target.result) == "object") {
 
         // Process .fmap file
         if (filename.endsWith(".fmap")) {
-            processWeather(reader.result);
+            processWeather(e.target.result);
             refreshCanvas();
             return;
         }
         // Process GRIB2 file
         if (filename.startsWith("gfs.")) {
-            ProcessGrib2(reader.result);
+            ProcessGrib2(e.target.result);
             refreshCanvas();
             return;
         }
@@ -74,19 +73,22 @@ function allowDrop(ev) {
 // The .ini is for mission files
 // The .fmap is for the weather data
 // The .png is for restoring the Whiteboard
+// The gfs. is for importing GFS grib2 data
 function dropHandler(ev) {
-
     ev.preventDefault();
 
     if (ev.dataTransfer.items) {
+        // Initialize the File handler
+        var reader = new FileReader();
+        reader.addEventListener('load', processFile);
 
         // Use DataTransferItemList interface for Modern Browers
         for (let i = 0; i < ev.dataTransfer.items.length; i++) {
 
             // If dropped items aren't files, reject them
             if (ev.dataTransfer.items[i].kind === 'file') {
                 const file = ev.dataTransfer.items[i].getAsFile();
-                filename = file.name;
+                filename = file.name.repeat(1);
                 if (filename.endsWith(".ini"))   reader.readAsText(file);
                 if (filename.endsWith(".fmap"))  reader.readAsArrayBuffer(file);
                 if (filename.endsWith(".png"))   reader.readAsDataURL(file);

common/scripts/map_gfs.js

@@ -823,23 +823,27 @@ function gfsProcessGrib2Msg() {
             if (gfs_msg.s4.def.surface1_value != 0) return;
             gfsDecodeMsg('PRMSL', gfs.prmsl);
             gfsTranscodeMsg('PRMSL',gfs.prmsl, fmap.pressure);
+            gfs.prmsl.data = [];
             break;
 
         case gfsMsgType.VIS:
             if (gfs_msg.s4.def.surface1_value != 0) return;
             gfsDecodeMsg('VIS', gfs.vis);
             gfsTranscodeMsg('VIS', gfs.vis, fmap.visibility);
+            gfs.vis.data = [];
             break;
 
         case gfsMsgType.TMP:
             if (gfs_msg.s4.def.surface1_value != 2) return;
             gfsDecodeMsg('TMP', gfs.tmp);
             gfsTranscodeMsg('TMP',  gfs.tmp, fmap.temperature);
+            gfs.tmp.data = [];
             break;
 
         case gfsMsgType.TCDC:
             gfsDecodeMsg('TCDC', gfs.tcdc);
             gfsTranscodeCloudCoverage();
+            gfs.tcdc.data = [];
             break;
 
         case gfsMsgType.UGRD:
@@ -849,25 +853,31 @@ function gfsProcessGrib2Msg() {
         case gfsMsgType.VGRD:
             gfsDecodeMsg('VGRD', gfs.vgrd);
             gfsTranscodeWinds(); // UGRD and VGRD come in pairs
+            gfs.ugrd.data = [];
+            gfs.vgrd.data = [];
             break;
 
         case gfsMsgType.PRES:
             gfsDecodeMsg('PRES', gfs.pres);
             gfsTranscodeCloudBase();
             gfsTranscodeFogAltitude();
+            gfs.pres.data = [];
             break;
 
         case gfsMsgType.PRATE:
             gfsDecodeMsg('PRATE', gfs.prate);
             gfsTranscodeShowers();
+            gfs.prate.data = [];
             break;
 
         case gfsMsgType.APCP:
             gfsDecodeMsg('APCP', gfs.apcp);
+            gfs.apcp.data = [];
             break;
 
         case gfsMsgType.ACPCP:
             gfsDecodeMsg('ACPCP', gfs.acpcp);
+            gfs.acpcp.data = [];
             break;
         default:
             console.log("Warning: Unknown Message");
@@ -925,7 +935,6 @@ function ProcessGrib2(buffer){
     gfs_file.msg_cnt = 0;
 
     while (gfs_file.offset < gfs_file.bytes.length) {
-    //while (gfs_file.offset < gfs_file.bytes.length && gfs_file.msg_cnt < 55) {
         gfs_file.msg_cnt++;
         gfsReadGrib2Msg();
         gfsProcessGrib2Msg();
@@ -936,8 +945,8 @@ function ProcessGrib2(buffer){
     gfsAirmassDirSpd();
     gfsForecastTime();
 
-    // Generate the Doppler Radar and METARs
-    dopplerScan();
+    // Update Airport METAR
     updateAirportTitles();
     fmap.changed = true;
+    gfs_file.bytes = [];
 }

common/scripts/map_mission.js

@@ -58,36 +58,6 @@ var mission = {
     }
 };
 
-// List of Mission Text Abbreviations
-// This is used to keep the Objectives list remain within max 2 lines per
-// objective
-function abbreviate(text){
-    // Add as many abbreviations as needed
-    // This will keep the text within a line if possible
-    text = text.replace("Air Defense", "AD");
-    text = text.replace("Airbase", "AB");
-    text = text.replace("Depot", "Dep");
-    text = text.replace("Runway", "Rwy");
-    text = text.replace("Complex", "Cmplx");
-    text = text.replace("Tower", "Twr");
-    text = text.replace("Control", "Ctrl");
-    text = text.replace("Center", "Ctr");
-    text = text.replace("Factory", "Fac");
-    text = text.replace("Section", "Sec");
-    text = text.replace("Warehouse", "Wrhs");
-    text = text.replace("Maintenance", "Maint.");
-    text = text.replace("Hangar", "Hngr");
-    text = text.replace("Battalion", "BN");
-    text = text.replace("Brigade", "BDE");
-    text = text.replace("Defense", "Def.");
-    text = text.replace("Manufacturer", "Mfr.");
-    text = text.replace("Bridge Bridge", "Bridge");
-    text = text.replace("Village", "Vill.");
-    text = text.replace("Transport", "Tpt.");
-    text = text.replace("Station", "Sta.");
-    return text;
-  }
-
 // MISSION DATA PROCESSING
 function clearMissionData() {
     mission.ppts = [];
@@ -127,10 +97,7 @@ function isTargetWaypoint(index) {
 }
 
 function getSteerpointType(index) {
-    if (isTargetWaypoint(index)) {
-        return "TGT";
-    }
-    return "STPT";
+    return (isTargetWaypoint(index))?"TGT":"STPT";
 }
 
 // Parse and create ppt object
@@ -244,31 +211,24 @@ function getMissionTime() {
 
 function getTankerIndex() {
     for (var i = 0; i < mission.targets.length; i++) {
-        if (mission.targets[i].action == Action.Refuel) {
-            return i;
-        }
+        if (mission.targets[i].action == Action.Refuel) return i;
     }
     return -1;
 }
 
 function getHomePlateIndex() {
     for (var i = 0; i < mission.targets.length; i++) {
-        if (mission.targets[i].action == Action.Land) {
-            return i;
-        }
+        if (mission.targets[i].action == Action.Land) return i;
     }
     return -1;
 }
 
 function getAlternateIndex() {
     var index = getHomePlateIndex();
     for (var i = (index + 1); i < mission.targets.length; i++) {
-        if (mission.targets[i].action == Action.Land) {
-            index = i;
-            break;
-        }
+        if (mission.targets[i].action == Action.Land) return i;
     }
-    return index;
+    return -1;
 }
 
 function getEstimatedFuelUntil(index) {
@@ -317,9 +277,7 @@ function getMaxHomePlateDistance() {
 function getMissionDistance() {
     var distance = 0;
     for (var i = 0; i < mission.route.length; i++) {
-        if (mission.targets[i].action == Action.Land) {
-            break;
-        }
+        if (mission.targets[i].action == Action.Land) break;
         distance += mission.route[i].dist;
     }
     return(distance);

common/scripts/map_weather.js

@@ -24,7 +24,7 @@ var fmap = {
     turbulence: {top: 31000, bottom: 28000},
     contrail: [34000,28000,25000,2000],
     cells: 0,        // Total cells
-    type: [],        // [y][x] 1: Sunny, 1: Fair, 2: Poor, 3: Inclement
+    type: [],        // [y][x] 1: Sunny, 2: Fair, 3: Poor, 4: Inclement
     pressure: [],    // [y][x] hPa
     temperature: [], // [y][x] C
     wind: [],        // [y][x][alt] Direction and Speed in Kts at Altitudes (10 levels)
@@ -38,9 +38,6 @@ var fmap = {
     visibility: [], // 0 .. 60 km
     fog: [],        // 0 .. 10000 ft
 
-    // Simulated Doppler Radar using Weather Type, Pressure and Temperature
-    radar: [],
-
     // Analytics done on the data
     analytics: {
         pressure_min: 1060,
@@ -67,32 +64,22 @@ function isIMC(x,y){
 //
 // Frontal zones are based on 10C delta per 20NM
 // Tornado is 15% pressure drop with neighbors (Not Implemented)
-
 // Snow is determined by looking at the surface temperature being at or below 0C.
-//
-function dopplerScan() {
-
-    // Setup Doppler Radar Data
-    for (var y=0;y < fmap.dimension.y; y++) {
-        var scan = Array(fmap.dimension.x).fill(0);
-        fmap.radar.push(scan);
-        for (var x = 0;x < fmap.dimension.x; x++) {
-            var wx = 0;
-            // Initialize Rain and add extra scores
-            if (fmap.type[y][x] == 4 || fmap.shower == 1) {
-                wx++;
-                if (fmap.pressure[y][x] < 1004) wx++;
-                if (fmap.wind[x][y][0] > 20 ) wx++;
-                if (fmap.cloud.type == 1 && fmap.cloud.size < 2) wx=+2;
-            }
+function dopplerSense(x,y) {
+    var wx = 0;
+
+    if (fmap.type[y][x] == 4 || fmap.shower == 1) {
+        wx++;
+        if (fmap.pressure[y][x] < 1004) wx++;
+        if (fmap.wind[x][y][0] > 20 ) wx++;
+        if (fmap.cloud.type == 1 && fmap.cloud.size < 2) wx=+2;
+    }
 
-            // Check if is below zero C
-            if (fmap.temperature[y][x] <= 0) wx = -wx;
+    // Check if is below zero C
+    if (fmap.temperature[y][x] <= 0) wx = -wx;
 
-            // Assign Weather to Radar
-            fmap.radar[y][x] = wx;
-        }
-    }
+    // Assign Weather to Radar
+    return wx;
 }
 
 //
@@ -129,7 +116,6 @@ function clearWeather() {
     fmap.shower = [];
     fmap.visibility = [];
     fmap.fog = [];
-    fmap.radar = [];
     fmap.analytics = {
         pressure_min: 1060,
         pressure_max: 950,
@@ -158,8 +144,6 @@ function readMapInfo(buffer) {
 
 // Read the BMS Weather Type (1:Sunny, 2: Fair, 3: Poor, 4: Inclement)
 function readWeatherType(buffer) {
-    let view = new Uint32Array(buffer);
-
     const offset = 11;
     let type = new Int32Array(buffer);
 
@@ -635,9 +619,6 @@ function processWeather(buffer) {
 
     updateAirportTitles();
 
-    // Create Doppler Radar Scan
-    dopplerScan();
-
     // Tell the action layer weather has changed so it will redener the main canvas
     fmap.changed = true;
 }