Skip to content

Use detailed API on sonde select #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheSkorm merged 4 commits into from
Jun 28, 2021
Merged

Use detailed API on sonde select #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e56c6ac
Merge pull request #1 from projecthorus/testing
LukePrior Jun 28, 2021
3bad502
Maybe enable GZIP?
LukePrior Jun 28, 2021
99336f0
use detailed API on select
LukePrior Jun 28, 2021
fcabe66
Merge branch 'testing' of https://github.com/LukePrior/sondehub-track…
LukePrior Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
<IfModule mod_deflate.c>
SetOutputFilter DEFLATE
# Compress HTML, CSS, JavaScript, Text, XML and fonts
AddOutputFilterByType DEFLATE application/javascript
AddOutputFilterByType DEFLATE application/rss+xml
AddOutputFilterByType DEFLATE application/vnd.ms-fontobject
AddOutputFilterByType DEFLATE application/x-font
AddOutputFilterByType DEFLATE application/x-font-opentype
AddOutputFilterByType DEFLATE application/x-font-otf
AddOutputFilterByType DEFLATE application/x-font-truetype
AddOutputFilterByType DEFLATE application/x-font-ttf
AddOutputFilterByType DEFLATE application/x-javascript
AddOutputFilterByType DEFLATE application/xhtml+xml
AddOutputFilterByType DEFLATE application/xml
AddOutputFilterByType DEFLATE font/opentype
AddOutputFilterByType DEFLATE font/otf
AddOutputFilterByType DEFLATE font/ttf
AddOutputFilterByType DEFLATE image/svg+xml
AddOutputFilterByType DEFLATE image/x-icon
AddOutputFilterByType DEFLATE text/css
AddOutputFilterByType DEFLATE text/html
AddOutputFilterByType DEFLATE text/javascript
AddOutputFilterByType DEFLATE text/plain
AddOutputFilterByType DEFLATE text/xml

# Remove browser bugs (only needed for ancient browsers)
BrowserMatch ^Mozilla/4 gzip-only-text/html
BrowserMatch ^Mozilla/4\.0[678] no-gzip
BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
Header append Vary User-Agent
</IfModule>

AddType text/cache-manifest .manifest
Expand Down
24 changes: 12 additions & 12 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>SondeHub Tracker</title>
<meta name="description" content="Live tracking of radiosonde flights. Data via SondeHub v2. Includes weather overlay, predictions, and access to historic radiosonde flights on sondehub." />
<meta name="author" content="Rossen Georgiev / Mark Jessop / Michaela Wheeler" />
<meta name="author" content="Rossen Georgiev / Mark Jessop / Michaela Wheeler / Luke Prior" />
<link rel="search" type="application/opensearchdescription+xml" href="opensearchspec.xml" title="Search on Sondebhub Tracker">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1"/>
<meta name="apple-mobile-web-app-title" content="Habhub Tracker">
<meta name="apple-mobile-web-app-title" content="SondeHub Tracker">
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon.png" />
Expand Down Expand Up @@ -71,48 +71,48 @@ <h2><i class="icon-question rfloat"></i>Welcome</h2>
<div id="motda">
<h4>Radiosondes?</h4>
To learn more check out our
<a href="https://www.youtube.com/watch?v=YBy-bXEWZeM" target="_blank">LCA video</a>.
<a href="https://www.youtube.com/watch?v=YBy-bXEWZeM" target="_blank" rel="noopener">LCA video</a>.

<h4>How do I receive?</h4>
Set up a receiver station using
<a href="https://github.com/projecthorus/radiosonde_auto_rx/wiki" target="_blank">auto_rx</a> or <a href="https://github.com/dl9rdz/rdz_ttgo_sonde" target="_blank">rdzTTGOsonde</a>.
<a href="https://github.com/projecthorus/radiosonde_auto_rx/wiki" target="_blank" rel="noopener">auto_rx</a> or <a href="https://github.com/dl9rdz/rdz_ttgo_sonde" target="_blank" rel="noopener">rdzTTGOsonde</a>.
<br/>

<h4>Recovered a Sonde?</h4>
Click the 'car' icon on the top-right to submit a recovery notification.

<h4>Support Us!</h4>
AWS hosting unfortunately does not come cheap.
If you use SondeHub regularly, please consider <a href="https://www.patreon.com/sondehub" target="_blank">supporting us on Patreon</a>, or with a <a href="https://sondehub.org/go/donate" target="_blank">donation on Paypal</a>.
If you use SondeHub regularly, please consider <a href="https://www.patreon.com/sondehub" target="_blank" rel="noopener">supporting us on Patreon</a>, or with a <a href="https://sondehub.org/go/donate" target="_blank" rel="noopener">donation on Paypal</a>.

<h4>Amateur HAB Launches?</h4>
You can find Amateur High-Altitude Balloon launches on the <a href="https://tracker.habhub.org/" target="_blank">HabHub Tracker</a>.
You can find Amateur High-Altitude Balloon launches on the <a href="https://tracker.habhub.org/" target="_blank" rel="noopener">HabHub Tracker</a>.

<h4>SondeHub Status Pages</h4>
You can find the status of the SondeHub Database on the <a href="https://sondehub.org/go/status" target="_blank">SondeHub Dashboard</a>.<br/>
You can view outages of the SondeHub Database at <a href="https://sondehub.statuspage.io/" target="_blank">SondeHub Status</a>.
You can find the status of the SondeHub Database on the <a href="https://sondehub.org/go/status" target="_blank" rel="noopener">SondeHub Dashboard</a>.<br/>
You can view outages of the SondeHub Database at <a href="https://sondehub.statuspage.io/" target="_blank" rel="noopener">SondeHub Status</a>.

</div>
<br/>
<h2>Under Beta!</h2>
<hr/>
This site uses data from the <a href="https://github.com/projecthorus/sondehub-infra/wiki" target="_blank">SondeHub v2</a> database, which will remove the radiosonde
This site uses data from the <a href="https://github.com/projecthorus/sondehub-infra/wiki" target="_blank" rel="noopener">SondeHub v2</a> database, which will remove the radiosonde
load from the Habitat tracking database. We are still working to being this tracker up to feature-parity with the previous
tracker, so some features like filtering by type are still in-progress.
<br/><br/>
Chase Cars can show up on the map using this tracker's chase-car features (look for the car icon at top-right)
or upload their position from <a href="https://github.com/projecthorus/chasemapper" target="_blank">Chasemapper</a> or <a href="https://github.com/dl9rdz/rdz_ttgo_sonde" target="_blank">rdzTTGOsonde</a>.
or upload their position from <a href="https://github.com/projecthorus/chasemapper" target="_blank" rel="noopener">Chasemapper</a> or <a href="https://github.com/dl9rdz/rdz_ttgo_sonde" target="_blank" rel="noopener">rdzTTGOsonde</a>.
<br/><br/>
<h2>Contribute</h2>
<hr/>
<p>
Did you know the tracker is open-source? Check it out on
<a href="https://github.com/projecthorus/sondehub-tracker" target="_blank">github/sondehub-tracker</a>.
<a href="https://github.com/projecthorus/sondehub-tracker" target="_blank" rel="noopener">github/sondehub-tracker</a>.
Bug reports, suggestions and pull requests are welcome.
<br/><br/>
A huge thanks to RGP for developing the mobile tracker that this site is based on.
<br/><br/>
You can also find us on IRC in <a href="https://kiwiirc.com/nextclient/irc.libera.chat/highaltitude" target="_blank">#highaltitude</a> at <b>libera.chat</b>.
You can also find us on IRC in <a href="https://kiwiirc.com/nextclient/irc.libera.chat/highaltitude" target="_blank" rel="noopener">#highaltitude</a> at <b>libera.chat</b>.
</p>
</div>
</div>
Expand Down
26 changes: 17 additions & 9 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ function load() {
} else {
map.addLayer(vehicles[key]["subhorizon_circle_title"]);
}
} catch(e){console.log(e);};
} catch(e){};
}
}
}
Expand Down Expand Up @@ -543,7 +543,7 @@ function load() {

function showLaunchSites() {
if (!launches) {
launches = new L.layerGroup([], {attribution: "© <a href='https://github.com/rs1729/RS/issues/15' target='_blank'>rs1729</a>"});
launches = new L.layerGroup([], {attribution: "© <a href='https://github.com/rs1729/RS/issues/15' target='_blank' rel='noopener'>rs1729</a>"});
$.getJSON("launchSites.json", function(json) {
for (var key in json) {
if (json.hasOwnProperty(key)) {
Expand Down Expand Up @@ -915,6 +915,7 @@ function followVehicle(vcallsign, noPan, force) {
}

if(follow_vehicle != vcallsign || force) {
refresh(vcallsign);
focusVehicle(vcallsign);

follow_vehicle = vcallsign;
Expand Down Expand Up @@ -1844,6 +1845,7 @@ function addPosition(position) {
listScroll.refresh();
listScroll.scrollToElement(_vehicle_idname);
followVehicle($(_vehicle_idname).attr('data-vcallsign'));
refresh(_vehicle_id);
};

marker.shadow = marker_shadow;
Expand Down Expand Up @@ -2502,11 +2504,13 @@ function graphAddPosition(vcallsign, new_data) {
var ajax_positions = null;
var ajax_inprogress = false;

function refresh() {
function refresh(serial) {
if(ajax_inprogress) {
clearTimeout(periodical);
periodical = setTimeout(refresh, 2000);
return;
if (serial === undefined) {
clearTimeout(periodical);
periodical = setTimeout(refresh, 2000);
return;
}
}

ajax_inprogress = true;
Expand All @@ -2521,7 +2525,11 @@ function refresh() {
var mode = wvar.mode.toLowerCase();
mode = (mode == "position") ? "latest" : mode.replace(/ /g,"");

var data_str = "mode="+mode+"&type=positions&format=json&max_positions=" + max_positions + "&position_id=" + position_id + "&vehicles=" + encodeURIComponent(wvar.query);
if (serial === undefined) {
var data_str = "mode="+mode+"&type=positions&format=json&max_positions=" + max_positions + "&position_id=" + position_id + "&vehicles=" + encodeURIComponent(wvar.query);
} else {
var data_str = "mode="+mode+"&type=positions&format=json&max_positions=" + max_positions + "&position_id=0&vehicles=" + encodeURIComponent(serial);
}

ajax_positions = $.ajax({
type: "GET",
Expand Down Expand Up @@ -2994,7 +3002,7 @@ function updateRecoveryMarker(recovery) {
html += "<div><b>Time:&nbsp;</b>"+formatDate(stringToDateUTC(recovery.datetime))+"</div>";
html += "<div><b>Reported by:&nbsp;</b>"+recovery.recovered_by+"</div>";
html += "<div><b>Notes:&nbsp;</b>"+$('<div>').text(recovery.description).html()+"</div>";
html += "<div><b>Flight Path:&nbsp;</b><a href='https://sondehub.org/card/"+recovery.serial+"' target='_blank'>"+recovery.serial+"</a></div>";
html += "<div><b>Flight Path:&nbsp;</b><a href='https://sondehub.org/card/"+recovery.serial+"' target='_blank' rel='noopener'>"+recovery.serial+"</a></div>";

html += "</div>";

Expand Down Expand Up @@ -3096,7 +3104,7 @@ function updateRecoveryPane(r){
html += "<div><b>Time:&nbsp;</b>"+formatDate(stringToDateUTC(r[i].datetime))+"</div>";
html += "<div><b>Reported by:&nbsp;</b>"+r[i].recovered_by+"</div>";
html += "<div><b>Notes:&nbsp;</b>"+$('<div>').text(r[i].description).html()+"</div>";
html += "<div><b>Flight Path:&nbsp;</b><a href='https://sondehub.org/card/"+r[i].serial+"' target='_blank'>"+r[i].serial+"</a></div>";
html += "<div><b>Flight Path:&nbsp;</b><a href='https://sondehub.org/card/"+r[i].serial+"' target='_blank' rel='noopener'>"+r[i].serial+"</a></div>";
html += "<hr style='margin:5px 0px'>";
html += "</div>";
}
Expand Down