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

Added metric-option to web-view

Browse source 
Added option to show values in metric system.
Metric = false; // true|false

Removed unused conversion from aircraftsToJson() at dump1090.c-file.
Tweaked distance calculation to use google map api.

	modified:   dump1090.c
	modified:   public_html/config.js
	modified:   public_html/gmap.html
	modified:   public_html/script.js
This commit is contained in:
terribl 2013-05-28 12:15:18 +03:00
parent ca314fcf2c
commit 3000baf184
4 changed files with 39 additions and 39 deletions

9
dump1090.c
View file

@ -3487,7 +3487,7 @@ int decodeHexMessage(struct client *c, char *hex) {
return (0);
}
/* Return a description of planes in json. */
/* Return a description of planes in json. No metric conversion. */
char *aircraftsToJson(int *len) {
time_t now = time(NULL);
struct aircraft *a = Modes.aircrafts;
@ -3498,7 +3498,6 @@ char *aircraftsToJson(int *len) {
l = snprintf(p,buflen,"[\n");
p += l; buflen -= l;
while(a) {
int altitude = a->altitude, speed = a->speed;
int position = 0;
int track = 0;
@ -3507,11 +3506,6 @@ char *aircraftsToJson(int *len) {
continue;
}
/* Convert units to metric if --metric was specified. */
if (Modes.metric) {
altitude = (int) (altitude / 3.2828);
speed = (int) (speed * 1.852);
}
if (a->bFlags & MODES_ACFLAGS_LATLON_VALID) {
position = 1;
@ -3521,6 +3515,7 @@ char *aircraftsToJson(int *len) {
track = 1;
}
// No metric conversion
l = snprintf(p,buflen,
"{\"hex\":\"%06x\", \"squawk\":\"%04x\", \"flight\":\"%s\", \"lat\":%f, "
"\"lon\":%f, \"validposition\":%d, \"altitude\":%d, \"track\":%d, \"validtrack\":%d,"