From 7d66db5b5052de4e2f9dd6677d9b9f0646b94291 Mon Sep 17 00:00:00 2001 From: Tag Date: Thu, 7 Jan 2021 15:54:27 -0800 Subject: [PATCH 1/3] remote station distance and azimuth in lookup if available --- package.nw/lib/gt.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index 7e8dc712..ba4a6a9e 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -15008,6 +15008,20 @@ function displayLookupObject(lookup, gridPass, fromCache = false) worker += makeRow("County", lookup, "county"); worker += makeRow("Latitude", lookup, "lat"); worker += makeRow("Longitude", lookup, "lon"); + if ( getLookProp(lookup, "lat").length > 0 && getLookProp(lookup, "lon").length > 0 ) + { + worker += "Distance" + + parseInt( + MyCircle.distance( + g_myLat, + g_myLon, + Number(lookup["lat"]), Number(lookup["lon"]), + distanceUnit.value + ) * MyCircle.validateRadius(distanceUnit.value) + ) + distanceUnit.value.toLowerCase() + ""; + let bearing = parseInt( MyCircle.bearing( g_myLat, g_myLon, Number(lookup["lat"]), Number(lookup["lon"]) ) ); + worker += "Azimuth" + bearing + "°"; + } worker += makeRow("Grid", lookup, "grid", true); if ( getLookProp(lookup, "gtGrid").length > 0 && From 4d5016f8026e9939b35b5b55886af4bb255f50ba Mon Sep 17 00:00:00 2001 From: Tag Date: Thu, 7 Jan 2021 16:12:16 -0800 Subject: [PATCH 2/3] Fixup for eslint --- package.nw/lib/gt.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index ba4a6a9e..9f77a109 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -15008,18 +15008,18 @@ function displayLookupObject(lookup, gridPass, fromCache = false) worker += makeRow("County", lookup, "county"); worker += makeRow("Latitude", lookup, "lat"); worker += makeRow("Longitude", lookup, "lon"); - if ( getLookProp(lookup, "lat").length > 0 && getLookProp(lookup, "lon").length > 0 ) + if (getLookProp(lookup, "lat").length > 0 && getLookProp(lookup, "lon").length > 0) { worker += "Distance" + parseInt( MyCircle.distance( g_myLat, g_myLon, - Number(lookup["lat"]), Number(lookup["lon"]), + Number(lookup.lat]), Number(lookup.lon), distanceUnit.value ) * MyCircle.validateRadius(distanceUnit.value) ) + distanceUnit.value.toLowerCase() + ""; - let bearing = parseInt( MyCircle.bearing( g_myLat, g_myLon, Number(lookup["lat"]), Number(lookup["lon"]) ) ); + let bearing = parseInt(MyCircle.bearing(g_myLat, g_myLon, Number(lookup.lat), Number(lookup.lon))); worker += "Azimuth" + bearing + "°"; } worker += makeRow("Grid", lookup, "grid", true); From 4957e35f603b46a628919ca61b7d208e3c1cb309 Mon Sep 17 00:00:00 2001 From: Tag Date: Thu, 7 Jan 2021 16:14:51 -0800 Subject: [PATCH 3/3] eslint fix part 2 --- package.nw/lib/gt.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index 9f77a109..23b71d08 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -15015,11 +15015,11 @@ function displayLookupObject(lookup, gridPass, fromCache = false) MyCircle.distance( g_myLat, g_myLon, - Number(lookup.lat]), Number(lookup.lon), + Number(lookup.lat), Number(lookup.lon), distanceUnit.value ) * MyCircle.validateRadius(distanceUnit.value) ) + distanceUnit.value.toLowerCase() + ""; - let bearing = parseInt(MyCircle.bearing(g_myLat, g_myLon, Number(lookup.lat), Number(lookup.lon))); + let bearing = parseInt(MyCircle.bearing(g_myLat, g_myLon, Number(lookup.lat), Number(lookup.lon))); worker += "Azimuth" + bearing + "°"; } worker += makeRow("Grid", lookup, "grid", true);