make sure SBS positions out of receiver range are not used

wiedehopf · wiedehopf · commit 66a04fe8278b · 2024-08-22T18:58:29.000+02:00
diff --git a/track.c b/track.c
@@ -2490,8 +2490,13 @@ struct aircraft *trackUpdateFromMessage(struct modesMessage *mm) {
                     old_jaero = 1;
             }
         }
+        if (Modes.maxRange > 0 && Modes.userLocationValid) {
+            mm->receiver_distance = greatcircle(Modes.fUserLat, Modes.fUserLon, mm->decoded_lat, mm->decoded_lon, 0);
+        }
         if (old_jaero) {
             // avoid using already received positions for JAERO input
+        } else if (mm->receiver_distance > Modes.maxRange) {
+            // ignore positions out of receiver range
         } else if (mm->source == SOURCE_MLAT && mm->mlatEPU > 2 * a->mlatEPU
                 && imin((int)(3000.0f * logf((float)mm->mlatEPU / (float)a->mlatEPU)), TRACE_STALE * 3 / 4) > (int64_t) trackDataAge(mm->sysTimestamp, &a->pos_reliable_valid)
                 ) {

Original file line number	Diff line number	Diff line change
`@@ -2490,8 +2490,13 @@ struct aircraft trackUpdateFromMessage(struct modesMessage mm) {`
`2490`	`2490`	`old_jaero = 1;`
`2491`	`2491`	`}`
`2492`	`2492`	`}`
	`2493`	`+ if (Modes.maxRange > 0 && Modes.userLocationValid) {`
	`2494`	`+ mm->receiver_distance = greatcircle(Modes.fUserLat, Modes.fUserLon, mm->decoded_lat, mm->decoded_lon, 0);`
	`2495`	`+ }`
`2493`	`2496`	`if (old_jaero) {`
`2494`	`2497`	`// avoid using already received positions for JAERO input`
	`2498`	`+ } else if (mm->receiver_distance > Modes.maxRange) {`
	`2499`	`+ // ignore positions out of receiver range`
`2495`	`2500`	`} else if (mm->source == SOURCE_MLAT && mm->mlatEPU > 2 * a->mlatEPU`
`2496`	`2501`	`&& imin((int)(3000.0f * logf((float)mm->mlatEPU / (float)a->mlatEPU)), TRACE_STALE * 3 / 4) > (int64_t) trackDataAge(mm->sysTimestamp, &a->pos_reliable_valid)`
`2497`	`2502`	`) {`