From b173316df0d3fafdffa52b5bc3ca8c345ff0351e Mon Sep 17 00:00:00 2001
From: Matthias Wirth <matthias.wirth@gmail.com>
Date: Tue, 31 Mar 2020 09:41:04 +0200
Subject: [PATCH] use server side wind data for globeIndex

---
 html/index.html     |  4 ++--
 html/planeObject.js |  3 +++
 html/script.js      | 28 +++++++++++++++++++---------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/html/index.html b/html/index.html
index c469bca..128d027 100644
--- a/html/index.html
+++ b/html/index.html
@@ -332,7 +332,7 @@
 						</div>
 						<div class="infoRowLine">
 							<div class="infoHeading infoRowFluid fourColumnSection1">
-								<span title="Calculated Wind direction">Direction</span>:
+								<span title="Calculated wind is blowing out of this direction">Direction (from)</span>:
 							</div>
 							<div class="infoData infoRowFluid fourColumnSection2">
 								<span id="selected_wd">n/a</span>
@@ -340,7 +340,7 @@
 						</div>
 						<div class="infoRowLine">
 							<div class="infoHeading infoRowFluid fourColumnSection1">
-								<span title="The aircraft's nose heading relative to ground track">Crab angle</span>:
+								<span title="The aircrafts heading relative to its ground track">Crab angle</span>:
 							</div>
 							<div class="infoData infoRowFluid fourColumnSection2">
 								<span id="selected_crab">n/a</span>
diff --git a/html/planeObject.js b/html/planeObject.js
index c6460fa..2a81d83 100644
--- a/html/planeObject.js
+++ b/html/planeObject.js
@@ -1211,6 +1211,9 @@ PlaneObject.prototype.updateData = function(now, last, data, init) {
     this.geom_rate = data.geom_rate;
     this.rc = data.rc;
     this.squawk = data.squawk;
+    this.wd = data.wd;
+    this.ws = data.ws;
+    this.oat = data.oat;
 
     // fields with more complex behaviour
 
diff --git a/html/script.js b/html/script.js
index 6abf03b..9e2ff5c 100644
--- a/html/script.js
+++ b/html/script.js
@@ -1725,10 +1725,10 @@ function refreshSelected() {
     let crab = null;
     let heading = null;
     let track = selected.track;
-    if (magResult && selected.mag_heading != null && selected.track != null) {
-        heading = selected.mag_heading + magResult.dec;
-    } else if (selected.true_heading != null && selected.track != null) {
+    if (selected.true_heading != null && selected.track != null) {
         heading = selected.true_heading;
+    } else if (magResult && selected.mag_heading != null && selected.track != null) {
+        heading = selected.mag_heading + magResult.dec;
     }
     if (heading != null && heading < 0)
         heading += 360;
@@ -1742,7 +1742,12 @@ function refreshSelected() {
             crab += 360;
     }
 
-    if (magResult && selected.gs != null && selected.tas != null && selected.track != null && selected.mag_heading != null) {
+    $('#selected_mag_heading').text(format_track_brief(selected.mag_heading));
+
+    if (selected.wd != null && selected.ws != null) {
+        $('#selected_wd').text(format_track_brief(selected.wd, true));
+        $('#selected_ws').text(format_speed_long(selected.ws, DisplayUnits));
+    } else if (!globeIndex && magResult && selected.gs != null && selected.tas != null && selected.track != null && selected.mag_heading != null) {
 
         const trk = (Math.PI / 180) * selected.track;
         const hdg = (Math.PI / 180) * heading;
@@ -1764,17 +1769,22 @@ function refreshSelected() {
         $('#selected_ws').text('n/a');
     }
 
-    $('#selected_crab').text(format_track_brief(crab));
 
-    $('#selected_mag_heading').text(format_track_brief(selected.mag_heading));
-
-    if (selected.true_heading == null && heading != null)
+    if (!globeIndex && selected.true_heading == null && heading != null)
         $('#selected_true_heading').text(format_track_brief(heading));
     else
         $('#selected_true_heading').text(format_track_brief(selected.true_heading));
 
+    if (globeIndex && selected.true_heading == null)
+        crab = null;
+
+    $('#selected_crab').text(format_track_brief(crab));
+
+
     let temp = null;
-    if (selected.mach != null && selected.tas != null) {
+    if (selected.oat != null) {
+        $('#selected_temp').text(Math.round(selected.oat)  + ' °C');
+    } else if (!globeIndex && selected.mach != null && selected.tas != null) {
         temp = Math.pow((selected.tas / 661.47 / selected.mach), 2) * 288.15 - 273.15;
         $('#selected_temp').text(Math.round(temp)  + ' °C');
     } else {