";
var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(data.alt)) : parseInt(data.alt)).toLocaleString("us");
@@ -2759,7 +2781,7 @@ function mapInfoBox_handle_path_new(data, vehicle, date) {
html = "
";
html += "
"+data.serial+" ("+date+")
";
html += "
";
- html += "
"+roundNumber(data.lat, 5) + ', ' + roundNumber(data.lon, 5)+"
";
+ html += "
"+format_coordinates(data.lat, data.lon, data.serial)+"
";
var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(data.alt)) : parseInt(data.alt)).toLocaleString("us");
@@ -2893,20 +2915,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" +
@@ -2987,10 +2996,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;
}
};
@@ -3023,7 +3032,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];
@@ -3064,26 +3073,6 @@ function addPosition(position) {
weight: 3,
})
];
- }
- else if(vcallsign == "XX") {
- vehicle_type = "xmark";
- image_src = host_url + markers_url + "balloon-xmark.png";
- image_src_size = [48,38];
- image_src_offset = [0,-38];
-
- xmarkIcon = new L.icon({
- iconUrl: image_src,
- iconSize: image_src_size,
- iconAnchor: [24, 18],
- });
-
- marker = new L.Marker(point, {
- icon: xmarkIcon,
- title: vcallsign,
- zIndexOffset: Z_CAR,
- });
-
- marker.addTo(map);
} else {
vehicle_type = "balloon";
let colorHash = 0;
@@ -3096,9 +3085,7 @@ function addPosition(position) {
// All the balloon are red.
color_index = 0;
}
-
- 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];
@@ -3143,7 +3130,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;
@@ -3156,9 +3143,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],
@@ -3174,15 +3161,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],
@@ -3290,6 +3279,11 @@ function addPosition(position) {
color: balloon_colors[color_index],
opacity: 1,
weight: 3,
+ }),
+ new L.Polyline(point, {
+ color: "#fff",
+ opacity: 0.6,
+ weight: 6,
})
];
}
@@ -3401,11 +3395,13 @@ 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]);
+ map.removeLayer(vehicle_info["prediction_polyline"][1]);
}
- if (map.hasLayer(vehicle_info["prediction_launch_polyline"])) {
- map.removeLayer(vehicle_info["prediction_launch_polyline"]);
+ if (vehicle_info["prediction_launch_polyline"] && map.hasLayer(vehicle_info["prediction_launch_polyline"][0])) {
+ map.removeLayer(vehicle_info["prediction_launch_polyline"][0]);
+ map.removeLayer(vehicle_info["prediction_launch_polyline"][1]);
}
if (map.hasLayer(vehicle_info["prediction_target"])) {
map.removeLayer(vehicle_info["prediction_target"]);
@@ -4640,7 +4636,7 @@ function updateRecoveryMarker(recovery) {
html = "";
html += "
"+recovery.serial+(recovery.recovered ? " Recovered" : " Not Recovered")+"
";
html += "
";
- html += "
"+roundNumber(recovery.lat, 5) + ', ' + roundNumber(recovery.lon, 5)+"
";
+ html += "
"+format_coordinates(recovery.lat, recovery.lon, recovery.serial)+"
";
var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(recovery.alt)) : parseInt(recovery.alt)).toLocaleString("us");
@@ -4752,7 +4748,7 @@ function updateRecoveryPane(r){
html += "
";
html += "
"+r[i].serial+(r[i].recovered ? " Recovered by " : " Not Recovered by ")+r[i].recovered_by+"
";
- html += "
"+roundNumber(lat, 5) + ', ' + roundNumber(lon, 5)+"
";
+ html += "
"+format_coordinates(lat, lon, r[i].serial)+"
";
var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(alt)) : parseInt(alt)).toLocaleString("us");
diff --git a/js/station.js b/js/station.js
index 3a2f4a5..74f053c 100644
--- a/js/station.js
+++ b/js/station.js
@@ -179,7 +179,7 @@ function drawHistorical (data, station) {
html = "
";
html += "
"+serial+" ("+time+")
";
html += "
";
- html += "
Last Position: "+roundNumber(landing.lat, 5) + ', ' + roundNumber(landing.lon, 5)+"
";
+ html += "
Last Position: "+format_coordinates(landing.lat, landing.lon, serial)+"
";
var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(landing.alt)) : parseInt(landing.alt)).toLocaleString("us");
diff --git a/service-worker.js b/service-worker.js
index fc7d456..6416051 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -1,59 +1,47 @@
self.addEventListener('install', function(event) {
event.waitUntil(
- caches.open("{VER}").then(function(cache) {
+ caches.open(document.body.dataset.version).then(function(cache) {
return cache.addAll(
[
- '/css/mobile.css',
+ '/css/base.css',
+ '/css/skeleton.css',
+ '/css/layout.css',
+ '/css/habitat-font.css',
+ '/css/main.css',
'/css/leaflet.css',
'/css/leaflet.fullscreen.css',
+ '/css/skewt.css',
+ '/js/skewt.js',
+ '/js/aws-sdk-2.1029.0.min.js',
'/js/leaflet.js',
'/js/Leaflet.fullscreen.min.js',
'/js/L.Terminator.js',
- '/js/mobile.js',
+ '/js/L.TileLayer.NoGap.js',
+ '/js/paho-mqtt.js',
+ '/js/jquery-1.12.4-min.js',
+ '/js/iscroll.js',
+ '/js/chasecar.lib.js',
+ '/js/tracker.js',
+ '/js/app.js',
+ '/js/colour-map.js',
+ '/js/xdata.js',
+ '/js/station.js',
+ '/js/format.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',
+ '/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-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/target.svg',
'/img/markers/shadow.png',
'/img/markers/balloon-pop.png',
'/img/hab-spinner.gif',
- '/img/marker-you.gif',
- '/img/sondehub_logo.gif',
+ '/img/sondehub_logo.png',
'/favicon.ico',
'/font/HabitatFont.woff',
'/font/Roboto-regular.woff',
diff --git a/tools/pngout.exe b/tools/pngout.exe
deleted file mode 100755
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 100755
index a1cf0a0..0000000
Binary files a/tools/yuicompressor-2.4.8.jar and /dev/null differ