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

Merge branch 'discard-bad-cpr-latitudes'

Browse source
This commit is contained in:
Oliver Jowett 2014-09-25 16:10:27 +01:00
parent 3f9c859800 e5b3572e8b
commit af281592e8
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mode_s.c
View file

@ -2101,6 +2101,9 @@ void decodeCPR(struct aircraft *a, int fflag, int surface) {
if (rlat1 >= 270) rlat1 -= 360; if (rlat1 >= 270) rlat1 -= 360;
} }
// Check to see that the latitude is in range: -90 .. +90
if (rlat0 < -90 || rlat0 > 90 || rlat1 < -90 || rlat1 > 90) return;
// Check that both are in the same latitude zone, or abort. // Check that both are in the same latitude zone, or abort.
if (cprNLFunction(rlat0) != cprNLFunction(rlat1)) return; if (cprNLFunction(rlat0) != cprNLFunction(rlat1)) return;
@ -2177,6 +2180,12 @@ int decodeCPRrelative(struct aircraft *a, int fflag, int surface) {
rlat = AirDlat * (j + lat/131072); rlat = AirDlat * (j + lat/131072);
if (rlat >= 270) rlat -= 360; if (rlat >= 270) rlat -= 360;
// Check to see that the latitude is in range: -90 .. +90
if (rlat < -90 || rlat > 90) {
a->bFlags &= ~MODES_ACFLAGS_LATLON_REL_OK; // This will cause a quick exit next time if no global has been done
return (-1); // Time to give up - Latitude error
}
// Check to see that answer is reasonable - ie no more than 1/2 cell away // Check to see that answer is reasonable - ie no more than 1/2 cell away
if (fabs(rlat - a->lat) > (AirDlat/2)) { if (fabs(rlat - a->lat) > (AirDlat/2)) {
a->bFlags &= ~MODES_ACFLAGS_LATLON_REL_OK; // This will cause a quick exit next time if no global has been done a->bFlags &= ~MODES_ACFLAGS_LATLON_REL_OK; // This will cause a quick exit next time if no global has been done