AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

More WIP on the webmap, mostly fixing up track history.

Browse source
This commit is contained in:
Oliver Jowett 2015-01-06 01:00:44 +00:00
parent 1f06abf67d
commit e8a62293c2
3 changed files with 79 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net_io.c
View file

@ -696,7 +696,7 @@ char *generateAircraftJson(int *len) {
if (a->bFlags & MODES_ACFLAGS_CALLSIGN_VALID) if (a->bFlags & MODES_ACFLAGS_CALLSIGN_VALID)
p += snprintf(p, end-p, ",\"flight\":\"%s\"", a->flight); p += snprintf(p, end-p, ",\"flight\":\"%s\"", a->flight);
if (a->bFlags & MODES_ACFLAGS_LATLON_VALID) if (a->bFlags & MODES_ACFLAGS_LATLON_VALID)
p += snprintf(p, end-p, ",\"lat\":%f,\"lon\":%f", a->lat, a->lon); p += snprintf(p, end-p, ",\"lat\":%f,\"lon\":%f,\"seen_pos\":%d", a->lat, a->lon, (int)(now - a->seenLatLon));
if ((a->bFlags & MODES_ACFLAGS_AOG_VALID) && (a->bFlags & MODES_ACFLAGS_AOG)) if ((a->bFlags & MODES_ACFLAGS_AOG_VALID) && (a->bFlags & MODES_ACFLAGS_AOG))
p += snprintf(p, end-p, ",\"altitude\":\"ground\""); p += snprintf(p, end-p, ",\"altitude\":\"ground\"");
else if (a->bFlags & MODES_ACFLAGS_ALTITUDE_VALID) else if (a->bFlags & MODES_ACFLAGS_ALTITUDE_VALID)

119
public_html/planeObject.js
View file

@ -1,8 +1,4 @@
var planeObject = { var planeObject = {
oldlat : null,
oldlon : null,
oldalt : null,
// Basic location information // Basic location information
altitude : null, altitude : null,
speed : null, speed : null,
@ -24,8 +20,9 @@ var planeObject = {
marker : null, marker : null,
markerColor : MarkerColor, markerColor : MarkerColor,
lines : [], lines : [],
trackdata : new Array(),
trackline : new Array(), tracklinesegs : [],
last_position_time : null,
// When was this last updated? // When was this last updated?
updated : null, updated : null,
@ -33,19 +30,62 @@ var planeObject = {
// Appends data to the running track so we can get a visual tail on the plane // Appends data to the running track so we can get a visual tail on the plane
// Only useful for a long running browser session. // Only useful for a long running browser session.
funcAddToTrack : function(){ updateTrack : function() {
// TODO: Write this function out var here = new google.maps.LatLng(this.latitude, this.longitude);
this.trackdata.push([this.latitude, this.longitude, this.altitude, this.track, this.speed]); if (this.tracklinesegs.length == 0) {
this.trackline.push(new google.maps.LatLng(this.latitude, this.longitude)); // Brand new track
}, //console.log(this.icao + " new track");
var newseg = { track : new google.maps.MVCArray([here,here]),
line : null,
head_update : this.last_position_time,
tail_update : this.last_position_time,
estimated : false };
this.tracklinesegs.push(newseg);
} else {
var lastseg = this.tracklinesegs[this.tracklinesegs.length - 1];
var lastpos = lastseg.track.getAt(lastseg.track.getLength() - 1);
var elapsed = (this.last_position_time - lastseg.head_update);
if (elapsed > 5) {
// >5s gap in data, put an estimated segment in
//console.log(this.icao + " discontinuity seen: " + lastpos.lat() + "," + lastpos.lng() + " -> " + here.lat() + "," + here.lng());
var estseg = { track : new google.maps.MVCArray([lastpos, here]),
line : null,
estimated : true };
var newseg = { track : new google.maps.MVCArray([here,here]),
line : null,
head_update : this.last_position_time,
tail_update : this.last_position_time,
estimated : false };
this.tracklinesegs.push(estseg);
this.tracklinesegs.push(newseg);
} else if (elapsed > 0) {
// New position data
// We only retain some historical points, at 5+ second intervals,
// plus the most recent point
if (this.last_position_time - lastseg.tail_update >= 5) {
// enough time has elapsed; retain the last point and add a new one
//console.log(this.icao + " retain last point");
lastseg.track.push(here);
lastseg.tail_update = lastseg.head_update;
} else {
// replace the last point with the current position
lastseg.track.setAt(lastseg.track.getLength()-1, here);
}
lastseg.head_update = this.last_position_time;
}
}
},
// This is to remove the line from the screen if we deselect the plane // This is to remove the line from the screen if we deselect the plane
funcClearLine : function() { funcClearLine : function() {
if (this.line) { for (var i = 0; i < this.tracklinesegs.length; ++i) {
this.line.setMap(null); var seg = this.tracklinesegs[i];
this.line = null; if (seg.line !== null) {
} seg.line.setMap(null);
}, seg.line = null;
}
}
},
// Should create an icon for us to use on the map... // Should create an icon for us to use on the map...
funcGetIcon : function() { funcGetIcon : function() {
@ -127,11 +167,6 @@ var planeObject = {
// Update our data // Update our data
funcUpdateData : function(receiver_now,data){ funcUpdateData : function(receiver_now,data){
// So we can find out if we moved
var oldlat = this.latitude;
var oldlon = this.longitude;
var oldalt = this.altitude;
// Update all of our data // Update all of our data
this.updated = new Date().getTime(); this.updated = new Date().getTime();
this.icao = data.hex; this.icao = data.hex;
@ -147,6 +182,7 @@ var planeObject = {
if (typeof data.lat !== "undefined") { if (typeof data.lat !== "undefined") {
this.latitude = data.lat; this.latitude = data.lat;
this.longitude = data.lon; this.longitude = data.lon;
this.last_position_time = receiver_now - data.seen_pos;
} }
if (typeof data.flight !== "undefined") if (typeof data.flight !== "undefined")
this.flight = data.flight; this.flight = data.flight;
@ -161,10 +197,7 @@ var planeObject = {
this.marker.setMap(null); this.marker.setMap(null);
this.marker = null; this.marker = null;
} }
if (this.line) { this.funcClearLines();
this.line.setMap(null);
this.line = null;
}
if (SelectedPlane == this.icao) { if (SelectedPlane == this.icao) {
if (this.is_selected) { if (this.is_selected) {
this.is_selected = false; this.is_selected = false;
@ -177,12 +210,9 @@ var planeObject = {
// Is the position valid? // Is the position valid?
if (!this.reapable && typeof data.lat !== "undefined") { if (!this.reapable && typeof data.lat !== "undefined") {
// Detech if the plane has moved this.updateTrack();
if (oldlat != this.latitude || oldlon != this.longitude) { if (this.is_selected) {
this.funcAddToTrack(); this.funcUpdateLines();
if (this.is_selected) {
this.line = this.funcUpdateLines();
}
} }
this.marker = this.funcUpdateMarker(); this.marker = this.funcUpdateMarker();
@ -223,18 +253,21 @@ var planeObject = {
// TODO: Make this multi colored based on options // TODO: Make this multi colored based on options
// altitude (default) or speed // altitude (default) or speed
funcUpdateLines: function() { funcUpdateLines: function() {
if (this.line) { for (var i = 0; i < this.tracklinesegs.length; ++i) {
var path = this.line.getPath(); var seg = this.tracklinesegs[i];
path.push(new google.maps.LatLng(this.latitude, this.longitude)); if (seg.line === null) {
} else { // console.log("create line for seg " + i + " with " + seg.track.getLength() + " points" + (seg.estimated ? " (estimated)" : ""));
this.line = new google.maps.Polyline({ // for (var j = 0; j < seg.track.getLength(); j++) {
strokeColor: '#000000', // console.log(" point " + j + " at " + seg.track.getAt(j).lat() + "," + seg.track.getAt(j).lng());
// }
seg.line = new google.maps.Polyline({
strokeColor: (seg.estimated ? '#804040' : '#000000'),
strokeOpacity: 1.0, strokeOpacity: 1.0,
strokeWeight: 3, strokeWeight: (seg.estimated ? 2 : 3),
map: GoogleMap, map: GoogleMap,
path: this.trackline path: seg.track });
}); }
} }
return this.line; }
}
}; };

5
public_html/script.js
View file

@ -25,7 +25,6 @@ function fetchData() {
SpecialSquawk = false; SpecialSquawk = false;
// Loop through all the planes in the data packet // Loop through all the planes in the data packet
console.log("I was called\n");
var now = data.now; var now = data.now;
var acs = data.aircraft; var acs = data.aircraft;
for (var j=0; j < acs.length; j++) { for (var j=0; j < acs.length; j++) {
@ -370,8 +369,8 @@ function refreshSelected() {
} }
function trackShortName(track) { function trackShortName(track) {
var trackIndex = Math.floor((track+22.5) / 45); var trackIndex = Math.floor((track+22.5) / 45) % 8;
if ((trackIndex < 0) || (trackIndex >= 8)) if (trackIndex < 0)
return "n/a"; return "n/a";
return ["N","NE","E","SE","S","SW","W","NW"][trackIndex]; return ["N","NE","E","SE","S","SW","W","NW"][trackIndex];
} }