From fdfd0dfecdeb28e548f34ddcacfbd3f713e93889 Mon Sep 17 00:00:00 2001 From: Matthias Wirth Date: Mon, 2 Mar 2020 19:02:34 +0100 Subject: [PATCH] range rings stuff --- html/index.html | 4 +- html/script.js | 102 ++++++++++++++++++++++++++---------------------- 2 files changed, 58 insertions(+), 48 deletions(-) diff --git a/html/index.html b/html/index.html index faf5d57..0d949d2 100644 --- a/html/index.html +++ b/html/index.html @@ -542,10 +542,10 @@
NEXRAD Weather
-
+
Selected Aircraft Trail
diff --git a/html/script.js b/html/script.js index d0da635..9138235 100644 --- a/html/script.js +++ b/html/script.js @@ -81,6 +81,7 @@ var traceDateString = null; var icaoParam = null; var globalScale = 1; var newWidth = lineWidth; +var SitePosInitialized = false; var adsbexchange = false; if (SiteName == "adsbexchange.com tar1090") @@ -1071,6 +1072,9 @@ function parse_history() { if (globeIndex) geoFindMe(); + else { + initSitePos(); + } if (!icaoFilter && globeIndex) toggleTableInView(true); @@ -1101,13 +1105,6 @@ function parse_history() { if (localStorage['sidebar_visible'] == "false") toggleSidebarVisibility(); - if (SitePosition) { - sortByDistance(); - } else { - sortByAltitude(); - } - - if (hideButtons) { $('#large_mode_control').hide(); $('#header_top').hide(); @@ -1170,15 +1167,6 @@ function initialize_map() { MapType_tar1090 = localStorage['MapType_tar1090']; } - // Set SitePosition - if (SiteLat != null && SiteLon != null) { - SitePosition = [SiteLon, SiteLat]; - } else { - SitePosition = null; - PlaneRowTemplate.cells[9].style.display = 'none'; // hide distance column - document.getElementById("distance").style.display = 'none'; // hide distance header - } - // Maybe hide flag info if (!ShowFlags) { PlaneRowTemplate.cells[1].style.display = 'none'; // hide flag column @@ -1206,7 +1194,8 @@ function initialize_map() { title: 'Site position and range rings', source: new ol.source.Vector({ features: StaticFeatures, - }) + }), + visible: !adsbexchange, })); trailLayers = new ol.layer.Group({ @@ -1355,36 +1344,11 @@ function initialize_map() { // handle the layer settings pane checkboxes OLMap.once('postrender', function(e) { toggleLayer('#nexrad_checkbox', 'nexrad'); - toggleLayer('#sitepos_checkbox', 'site_pos'); + //toggleLayer('#sitepos_checkbox', 'site_pos'); toggleLayer('#actrail_checkbox', 'ac_trail'); toggleLayer('#acpositions_checkbox', 'ac_positions'); }); - // Add home marker if requested - if (SitePosition) { - - if (SiteShow) { - var markerStyle = new ol.style.Style({ - image: new ol.style.Circle({ - radius: 7, - snapToPixel: false, - fill: new ol.style.Fill({color: 'black'}), - stroke: new ol.style.Stroke({ - color: 'white', width: 2 - }) - }) - }); - - var feature = new ol.Feature(new ol.geom.Point(ol.proj.fromLonLat(SitePosition))); - feature.setStyle(markerStyle); - StaticFeatures.push(feature); - } - - if (SiteCircles) { - createSiteCircleFeatures(); - } - } - if (localStorage['MapDim'] === "true" || (MapDim && localStorage['MapDim'] == null)) { toggleMapDim(true); } @@ -1622,6 +1586,29 @@ function initialize_map() { function createSiteCircleFeatures() { // Clear existing circles first + if (!SitePosition) + return; + + if (SiteShow) { + var markerStyle = new ol.style.Style({ + image: new ol.style.Circle({ + radius: 7, + snapToPixel: false, + fill: new ol.style.Fill({color: 'black'}), + stroke: new ol.style.Stroke({ + color: 'white', width: 2 + }) + }) + }); + + var feature = new ol.Feature(new ol.geom.Point(ol.proj.fromLonLat(SitePosition))); + feature.setStyle(markerStyle); + StaticFeatures.push(feature); + } + + if (!SiteCircles) + return; + SiteCircleFeatures.forEach(function(circleFeature) { StaticFeatures.remove(circleFeature); }); @@ -2709,7 +2696,7 @@ function onDisplayUnitsChanged(e) { refreshTableInfo(); // Redraw range rings - if (SitePosition !== null && SitePosition !== undefined && SiteCircles) { + if (SitePosition != null && SiteCircles) { createSiteCircleFeatures(); } @@ -3845,12 +3832,13 @@ function setLineWidth() { function geoFindMe() { function success(position) { - CenterLat = DefaultCenterLat = position.coords.latitude; - CenterLon = DefaultCenterLon = position.coords.longitude; + SiteLat = CenterLat = DefaultCenterLat = position.coords.latitude; + SiteLon = CenterLon = DefaultCenterLon = position.coords.longitude; if (localStorage['geoFindMeFirstVisit'] == undefined) { OLMap.getView().setCenter(ol.proj.fromLonLat([CenterLon, CenterLat])); localStorage['geoFindMeFirstVisit'] = 'no'; } + initSitePos(); } function error() { @@ -3871,3 +3859,25 @@ window.mobilecheck = function() { (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera); return check; }; + +function initSitePos() { + if (SitePosInitialized) + return; + + if (SitePosition) { + sortByDistance(); + } else { + sortByAltitude(); + } + + // Set SitePosition + if (SiteLat != null && SiteLon != null) { + SitePosition = [SiteLon, SiteLat]; + // Add home marker if requested + createSiteCircleFeatures(); + } else { + SitePosition = null; + PlaneRowTemplate.cells[9].style.display = 'none'; // hide distance column + document.getElementById("distance").style.display = 'none'; // hide distance header + } +}