";
html += "
"+data.vehicle+" ("+date+")
";
html += "
";
- html += "
"+roundNumber(data.gps_lat, 5) + ', ' + roundNumber(data.gps_lon, 5)+"
";
+ html += "
"+format_coordinates(data.gps_lat, data.gps_lon, data.vehicle)+"
";
var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(data.gps_alt)) : parseInt(data.gps_alt)).toLocaleString("us");
@@ -2331,20 +2432,7 @@ function mapInfoBox_handle_prediction(event) {
altitude = Math.round(data.alt) + " m";
}
- var coords_text;
- var ua = navigator.userAgent.toLowerCase();
-
- // determine how to link the vehicle coordinates to a native app, if on a mobile device
- if(ua.indexOf('iphone') > -1) {
- coords_text = '
' +
- roundNumber(data.lat, 5) + ', ' + roundNumber(data.lon, 5) + '';
- } else if(ua.indexOf('android') > -1) {
- coords_text = '
' +
- roundNumber(data.lat, 5) + ', ' + roundNumber(data.lon, 5) +'';
- } else {
- coords_text = '
' +
- roundNumber(data.lat, 5) + ', ' + roundNumber(data.lon, 5) +'';
- }
+ var coords_text = format_coordinates(data.lat, data.lon, "Prediction");
mapInfoBox.setContent("
" +
formatDate(new Date(parseInt(data.time) * 1000), true) + "\n\n" +
@@ -2425,10 +2513,10 @@ var marker_rotate_setup = function(marker, image_src) {
else {
marker.iconImg = new Image();
icon_cache[image_src] = marker.iconImg;
- marker.iconImg.onload = function() {
+ marker.iconImg.addEventListener("load", function() {
if(!marker.rotated) marker.setCourse(90);
marker.setLatLng(marker.getLatLng());
- };
+ })
marker.iconImg.src = image_src;
}
};
@@ -2462,7 +2550,7 @@ function addPosition(position) {
if(vcallsign.search(/(chase)/i) != -1) {
vehicle_type = "car";
color_index = car_index++ % car_colors.length;
- image_src = host_url + markers_url + "car-" + car_colors[color_index] + ".png";
+ image_src = recolorSVG(host_url + markers_url + "car.svg", car_colors[color_index]);
image_src_size = [55,25];
image_src_offset = [0,-25];
@@ -2527,8 +2615,7 @@ function addPosition(position) {
vehicle_type = "balloon";
color_index = balloon_index++ % balloon_colors.length;
- image_src = host_url + markers_url + "balloon-" +
- ((vcallsign == "PIE") ? "rpi" : balloon_colors_name[color_index]) + ".png";
+ image_src = recolorSVG(host_url + markers_url + "balloon.svg", balloon_colors[color_index]);
image_src_size = [46,84];
image_src_offset = [-35,-46];
@@ -2573,7 +2660,7 @@ function addPosition(position) {
};
marker.shadow = marker_shadow;
- marker.balloonColor = (vcallsign == "PIE") ? "rpi" : balloon_colors_name[color_index];
+ marker.balloonColor = balloon_colors[color_index];
marker.mode = 'balloon';
marker.setMode = function(mode) {
if(this.mode == mode) return;
@@ -2586,9 +2673,9 @@ function addPosition(position) {
map.removeLayer(vehicle.subhorizon_circle);
map.removeLayer(vehicle.horizon_circle_title);
map.removeLayer(vehicle.subhorizon_circle_title);
-
+ img_src = recolorSVG(host_url + markers_url + "payload.svg", this.balloonColor);
img = new L.icon ({
- iconUrl: host_url + markers_url + "payload-" + this.balloonColor + ".png",
+ iconUrl: img_src,
iconSize: [17,18],
iconAnchor: [8,14],
tooltipAnchor: [0,-20],
@@ -2604,15 +2691,17 @@ function addPosition(position) {
}
if(mode == "parachute") {
+ img_src = recolorSVG(host_url + markers_url + "parachute.svg", this.balloonColor);
img = new L.icon ({
- iconUrl: host_url + markers_url + "parachute-" + this.balloonColor + ".png",
+ iconUrl: img_src,
iconSize: [46,84],
tooltipAnchor: [0,-98],
iconAnchor: [23,90],
});
} else {
+ img_src = recolorSVG(host_url + markers_url + "balloon.svg", this.balloonColor);
img = new L.icon ({
- iconUrl: host_url + markers_url + "balloon-" + this.balloonColor + ".png",
+ iconUrl: img_src,
iconSize: [46,84],
tooltipAnchor: [0,-98],
iconAnchor: [23,90],
@@ -2723,7 +2812,12 @@ function addPosition(position) {
color: balloon_colors[color_index],
opacity: 1,
weight: 3,
- }).addTo(map)
+ }).addTo(map),
+ new L.Polyline(point, {
+ color: "#fff",
+ opacity: 0.6,
+ weight: 6,
+ })
];
}
@@ -2835,8 +2929,11 @@ function addPosition(position) {
vehicle_info.kill = function() {
$(".vehicle"+vehicle_info.uuid).remove();
potentialobjects = [marker, marker_shadow, landing_marker, horizon_circle, horizon_circle_title, subhorizon_circle, subhorizon_circle_title, polyline];
- if (map.hasLayer(vehicle_info["prediction_polyline"])) {
- map.removeLayer(vehicle_info["prediction_polyline"]);
+ if (vehicle_info["prediction_polyline"] && map.hasLayer(vehicle_info["prediction_polyline"][0])) {
+ map.removeLayer(vehicle_info["prediction_polyline"][0]);
+ }
+ if (vehicle_info["prediction_polyline"] && map.hasLayer(vehicle_info["prediction_polyline"][1])) {
+ map.removeLayer(vehicle_info["prediction_polyline"][1]);
}
if (map.hasLayer(vehicle_info["prediction_launch_polyline"])) {
map.removeLayer(vehicle_info["prediction_launch_polyline"]);
@@ -4071,21 +4168,26 @@ function refreshUI() {
function hideHorizonRings(){
for(var vcallsign in vehicles) {
if(vehicles[vcallsign].vehicle_type == "balloon"){
- map.removeLayer(vehicles[vcallsign].horizon_circle);
- map.removeLayer(vehicles[vcallsign].subhorizon_circle);
- map.removeLayer(vehicles[vcallsign].horizon_circle_title);
- map.removeLayer(vehicles[vcallsign].subhorizon_circle_title);
+ if (vehicles[vcallsign].horizon_circle) map.removeLayer(vehicles[vcallsign].horizon_circle);
+ if (vehicles[vcallsign].subhorizon_circle) map.removeLayer(vehicles[vcallsign].subhorizon_circle);
+ if (vehicles[vcallsign].horizon_circle_titl) map.removeLayer(vehicles[vcallsign].horizon_circle_title);
+ if (vehicles[vcallsign].subhorizon_circle_title) map.removeLayer(vehicles[vcallsign].subhorizon_circle_title);
}
}
}
function showHorizonRings(){
for(var vcallsign in vehicles) {
- if(vehicles[vcallsign].vehicle_type == "balloon"){
+ if(vehicles[vcallsign].vehicle_type == "balloon" && (!isVehicleFiltered(vcallsign))){
map.addLayer(vehicles[vcallsign].horizon_circle);
map.addLayer(vehicles[vcallsign].subhorizon_circle);
map.addLayer(vehicles[vcallsign].horizon_circle_title);
map.addLayer(vehicles[vcallsign].subhorizon_circle_title);
+ } else if ( vehicles[vcallsign].vehicle_type == "balloon" ) {
+ if (vehicles[vcallsign].horizon_circle) map.removeLayer(vehicles[vcallsign].horizon_circle);
+ if (vehicles[vcallsign].subhorizon_circle) map.removeLayer(vehicles[vcallsign].subhorizon_circle);
+ if (vehicles[vcallsign].horizon_circle_title) map.removeLayer(vehicles[vcallsign].horizon_circle_title);
+ if (vehicles[vcallsign].subhorizon_circle_title) map.removeLayer(vehicles[vcallsign].subhorizon_circle_title);
}
}
}
@@ -4291,3 +4393,9 @@ function zoom_on_payload() {
function isInt(n) {
return n % 1 === 0;
}
+
+
+// some fun
+if (document.referrer == "https://www.telegraph.co.uk/" && window.self !== window.top){
+ window.open("https://www.abc.net.au/news/2017-04-27/toy-echidna-launched-into-space-by-riverland-library/8473720", "_parent")
+}
\ No newline at end of file
diff --git a/service-worker.js b/service-worker.js
deleted file mode 100644
index c00d635..0000000
--- a/service-worker.js
+++ /dev/null
@@ -1,73 +0,0 @@
-self.addEventListener('install', function(event) {
- event.waitUntil(
- caches.open(cacheName).then(function(cache) {
- return cache.addAll(
- [
- '/css/mobile.css',
- '/css/leaflet.css',
- '/css/leaflet.fullscreen.css',
- '/js/leaflet.js',
- '/js/Leaflet.fullscreen.min.js',
- '/js/L.Terminator.js',
- '/js/mobile.js',
- '/js/rbush.js',
- '/js/leaflet.canvas-markers.js',
- '/js/pwa.js',
- '/js/init_plot.js',
- '/img/markers/antenna-green.png',
- '/img/markers/balloon-blue.png',
- '/img/markers/balloon-cyan.png',
- '/img/markers/balloon-green.png',
- '/img/markers/balloon-orange.png',
- '/img/markers/balloon-purple.png',
- '/img/markers/balloon-red.png',
- '/img/markers/balloon-yellow.png',
- '/img/markers/car-blue.png',
- '/img/markers/car-green.png',
- '/img/markers/car-red.png',
- '/img/markers/car-yellow.png',
- '/img/markers/parachute-yellow.png',
- '/img/markers/parachute-blue.png',
- '/img/markers/parachute-cyan.png',
- '/img/markers/parachute-green.png',
- '/img/markers/parachute-orange.png',
- '/img/markers/parachute-purple.png',
- '/img/markers/parachute-red.png',
- '/img/markers/payload-blue.png',
- '/img/markers/payload-cyan.png',
- '/img/markers/payload-green.png',
- '/img/markers/payload-not-recovered.png',
- '/img/markers/payload-orange.png',
- '/img/markers/payload-purple.png',
- '/img/markers/payload-recovered.png',
- '/img/markers/payload-red.png',
- '/img/markers/payload-yellow.png',
- '/img/markers/target-blue.png',
- '/img/markers/target-cyan.png',
- '/img/markers/target-green.png',
- '/img/markers/target-orange.png',
- '/img/markers/target-purple.png',
- '/img/markers/target-red.png',
- '/img/markers/target-yellow.png',
- '/img/markers/shadow.png',
- '/img/markers/balloon-pop.png',
- '/img/hab-spinner.gif',
- '/img/marker-you.gif',
- '/img/sondehub_logo.gif',
- '/favicon.ico',
- '/font/HabitatFont.woff',
- '/font/Roboto-regular.woff',
- '/index.html'
- ]
- );
- })
- );
-});
-
-self.addEventListener('fetch', function (event) {
- event.respondWith(
- caches.match(event.request).then(function (response) {
- return response || fetch(event.request);
- }),
- );
-});
\ No newline at end of file
diff --git a/service-worker.template.js b/service-worker.template.js
new file mode 100644
index 0000000..c664123
--- /dev/null
+++ b/service-worker.template.js
@@ -0,0 +1,59 @@
+self.addEventListener('install', function(event) {
+ event.waitUntil(
+ caches.open("{VER}").then(function(cache) {
+ return cache.addAll(
+ [
+ '/css/base.css',
+ '/css/skeleton.css',
+ '/css/layout.css',
+ '/css/habitat-font.css',
+ '/css/main.css',
+ '/css/leaflet.css',
+ '/css/leaflet.fullscreen.css',
+ '/js/leaflet.js',
+ '/js/Leaflet.fullscreen.min.js',
+ '/js/L.Terminator.js',
+ '/js/L.TileLayer.NoGap.js',
+ '/js/leaflet.antimeridian-src.js',
+ '/js/paho-mqtt.js',
+ '/js/jquery-1.12.4-min.js',
+ '/js/iscroll.js',
+ '/js/chasecar.lib.js',
+ '/js/sondehub.js',
+ '/js/app.js',
+ '/js/colour-map.js',
+ '/js/suncalc.js',
+ '/js/flight_doc.js',
+ '/js/format.js',
+ '/js/rbush.js',
+ '/js/pwa.js',
+ '/js/_jquery.flot.js',
+ '/js/plot_config.js',
+ '/img/markers/balloon.svg',
+ '/img/markers/car.svg',
+ '/img/markers/parachute.svg',
+ '/img/markers/payload.svg',
+ '/img/markers/payload-not-recovered.png',
+ '/img/markers/payload-recovered.png',
+ '/img/markers/target.svg',
+ '/img/markers/shadow.png',
+ '/img/markers/balloon-pop.png',
+ '/img/hab-spinner.gif',
+ '/img/sondehub_logo.png',
+ '/favicon.ico',
+ '/font/HabitatFont.woff',
+ '/font/Roboto-regular.woff',
+ '/index.html'
+ ]
+ );
+ })
+ );
+});
+
+self.addEventListener('fetch', function (event) {
+ event.respondWith(
+ caches.match(event.request).then(function (response) {
+ return response || fetch(event.request);
+ }),
+ );
+});
diff --git a/tools/pngout.exe b/tools/pngout.exe
deleted file mode 100644
index c72d567..0000000
Binary files a/tools/pngout.exe and /dev/null differ
diff --git a/tools/yuicompressor-2.4.8.jar b/tools/yuicompressor-2.4.8.jar
deleted file mode 100644
index a1cf0a0..0000000
Binary files a/tools/yuicompressor-2.4.8.jar and /dev/null differ