Skip to content

first stage of showing station launch time info #107

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
LukePrior merged 2 commits into from
Aug 19, 2021
Merged

first stage of showing station launch time info #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a32d10c
update australian times
LukePrior Aug 19, 2021
74af0c0
show next launch
LukePrior Aug 19, 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
28 changes: 27 additions & 1 deletion js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,33 @@ function showLaunchSites() {
sondes = sondes.replace(new RegExp("\\b82\\b"), "LMS6-1680 (possible to track)");
sondes = sondes.replace(new RegExp("\\b84\\b"), "iMet-54 (possible to track)");
var marker = new L.circleMarker(latlon, {color: '#696969', fillColor: "white", radius: 8});
var popup = new L.popup({ autoClose: false, closeOnClick: false }).setContent("<font style='font-size: 13px'>" + json[key].station_name + "</font><br><br><b>Sondes launched:</b> " + sondes);
if (json[key].hasOwnProperty('times')) {
var tempDate = null;
for (var i = 0; i < json[key]['times'].length; i++) {
var date = new Date();
var now = new Date();
var time = json[key]['times'][i].split(":");
date.setUTCHours(time[0]);
date.setUTCMinutes(time[1]);
date.setSeconds(0);
if (date < now) {
date.setDate(date.getDate() + 1);
}
if (tempDate) {
if (date < tempDate) {
tempDate = date;
var popup = new L.popup({ autoClose: false, closeOnClick: false }).setContent("<font style='font-size: 13px'>" + json[key].station_name + "</font><br><br><b>Sondes launched:</b> " + sondes +
"<br><b>Next launch:</b> " + date.toString());
}
} else {
tempDate = date;
var popup = new L.popup({ autoClose: false, closeOnClick: false }).setContent("<font style='font-size: 13px'>" + json[key].station_name + "</font><br><br><b>Sondes launched:</b> " + sondes +
"<br><b>Next launch:</b> " + date.toString());
}
}
} else {
var popup = new L.popup({ autoClose: false, closeOnClick: false }).setContent("<font style='font-size: 13px'>" + json[key].station_name + "</font><br><br><b>Sondes launched:</b> " + sondes);
}
marker.bindPopup(popup);
launches.addLayer(marker);
}
Expand Down
6 changes: 3 additions & 3 deletions launchSites.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
{"station":"94430","rs_types":["42"],"lat":-26.6136,"lon":118.5372,"alt":522,"station_name":"Meekatharra Airport (Australia)"},
{"station":"94461","rs_types":["41"],"lat":-25.0342,"lon":128.3011,"alt":580,"station_name":"Giles (Australia)"},
{"station":"94510","rs_types":["42"],"lat":-26.4139,"lon":146.2558,"alt":306,"station_name":"Charleville Airport (Australia)"},
{"station":"94578","rs_types":["41"],"lat":-27.3917,"lon":153.1292,"alt":4,"station_name":"Brisbane Airport M. O (Australia)","times":["17:00","23:15"]},
{"station":"94578","rs_types":["41"],"lat":-27.3917,"lon":153.1292,"alt":4,"station_name":"Brisbane Airport M. O (Australia)","times":["17:15","23:15"]},
{"station":"94610","rs_types":["41"],"lat":-31.9275,"lon":115.9764,"alt":20,"station_name":"Belmont Perth Airport (Australia)","times":["11:15"]},
{"station":"94637","rs_types":["42"],"lat":-30.7847,"lon":121.4533,"alt":367,"station_name":"Kalgoorlie Boulder Amo (Australia)"},
{"station":"94638","rs_types":["42"],"lat":-33.83,"lon":121.8925,"alt":25,"station_name":"Esperance (Australia)"},
Expand All @@ -667,10 +667,10 @@
{"station":"94672","rs_types":["41"],"lat":-34.9525,"lon":138.5203,"alt":6,"station_name":"Adelaide Airport (Australia)","times":["11:15","23:15"]},
{"station":"94711","rs_types":["42"],"lat":-31.4839,"lon":145.8294,"alt":264,"station_name":"Cobar (Australia)"},
{"station":"94750","rs_types":["41"],"lat":-34.9469,"lon":150.5353,"alt":122,"station_name":"Nowra Ran Air Station (Australia)"},
{"station":"94767","rs_types":["41"],"lat":-33.9464,"lon":151.1731,"alt":6,"station_name":"Sydney Airport (Australia)"},
{"station":"94767","rs_types":["41"],"lat":-33.9464,"lon":151.1731,"alt":6,"station_name":"Sydney Airport (Australia)","times":["18:15"]},
{"station":"94776","rs_types":["42"],"lat":-32.7933,"lon":151.8358,"alt":9,"station_name":"Williamtown Aerodrome (Australia)","times":["23:15"]},
{"station":"94802","rs_types":["42"],"lat":-34.9414,"lon":117.8022,"alt":71,"station_name":"Albany Airport (Australia)"},
{"station":"94821","rs_types":["42"],"lat":-37.7472,"lon":140.7739,"alt":65,"station_name":"Mount Gambier Aerodrome (Australia)"},
{"station":"94821","rs_types":["42"],"lat":-37.7472,"lon":140.7739,"alt":65,"station_name":"Mount Gambier Aerodrome (Australia)","times":["23:15"]},
{"station":"94866","rs_types":["41"],"lat":-37.6656,"lon":144.8322,"alt":132,"station_name":"Melbourne Airport (Australia)","times":["11:15","23:15"]},
{"station":"-1","rs_types":["41"],"lat":-37.689883,"lon":144.947375,"alt":119,"station_name":"Melbourne BoM Training Annex (Training and Ozonesondes) (Australia)"},
{"station":"94910","rs_types":["42"],"lat":-35.1583,"lon":147.4572,"alt":221,"station_name":"Wagga Airport (Australia)"},
Expand Down