fixed distance calculation

Former-commit-id: f7b76dd49db3daa4875348b62a43aad917fc90a9

dump1090/dump1090.REMOVED.git-id

@@ -1 +1 @@
-e328571ee755d40455f14ff797c85de516b3cf0c
+991767a65daecf769ad18d4cff2b6ccf858da843

dump1090/dump1090.o.REMOVED.git-id

@@ -1 +0,0 @@
-f9454b21fbaa395742eefee887a437a2bcf85b60

dump1090/interactive.c

@@ -30,6 +30,8 @@
 
 #include "dump1090.h"
 #include <math.h>
+#include <locale.h>
+#include <wchar.h>
 
 //
 // ============================= Utility functions ==========================
@@ -435,13 +437,14 @@ void interactiveShowData(void) {
 #else
     cls();
 #endif
+    setlocale(LC_ALL,"");
 
 //\xiB[30;47m
     if (Modes.interactive_rtl1090 == 0) {
         printf (
 // original version "Hex     Mode  Sqwk  Flight   Alt    Spd  Hdg    Lat      Long   Sig  Msgs   Ti%c\n", progress);
 // pitft version "\x1B[30;47m\e[1mFlight   Alt    Spd  Lat      Long     \n", progress);
-    "\x1B[30;47m\e[1mFlight   Alt(m) m/s  Dst(km)  H ", progress);
+    "\x1B[30;47m\e[1mFlight  Zm    m/s  D(km)  %lc  S",0x25cb);
     } else {
         printf (
 "Hex    Flight   Alt      V/S GS  TT  SSR  G*456^ Msgs    Seen %c\n", progress);
@@ -489,13 +492,13 @@ void interactiveShowData(void) {
                 char strLat[8]                = " ";
                 char strLon[9]                = " ";
 
-                char strD[8]                = " ";
+                char strD[6]                = " ";
                 char cLat = ' ';
                 char cLon = ' ';
 
                 unsigned char * pSig       = a->signalLevel;
                 unsigned int signalAverage = (pSig[0] + pSig[1] + pSig[2] + pSig[3] + 
-                                              pSig[4] + pSig[5] + pSig[6] + pSig[7] + 3) >> 3; 
+                                              pSig[4] + pSig[5] + pSig[6] + pSig[7] + 3) >> 9;   //up to 4 bars
 
                 if (a->bFlags & MODES_ACFLAGS_AOG) {
                     snprintf(strFl, 6," grnd");
@@ -514,17 +517,17 @@ void interactiveShowData(void) {
 
                 if (a->bFlags & MODES_ACFLAGS_LATLON_VALID) {
 
-                    float dLon = a->lon+87.6651033;
-                    float dLat = a->lat-***REMOVED***;
+                    double dLon = a->lon+87.6651033;
+                    double dLat = a->lat-***REMOVED***;
 
                     snprintf(strLat, 8,"%7.03f", dLat);
                     snprintf(strLon, 9,"%8.03f", dLon);
 
-                    float x = dLon * cos(((a->lat+***REMOVED***)/2.0f) * M_PI / 180.0f);
-                    float y = dLat;
-                    float d = sqrt(x*x + y*y) * 6371.0f;
+                    double x = dLon * M_PI / 180.0f * cos(((a->lat+***REMOVED***)/2.0f) * M_PI / 180.0f);
+                    double y = dLat * M_PI / 180.0f;
+                    double d = sqrt(x*x + y*y) * 6371.0;
 
-                    if(fabsf(dLon) < .01 && fabsf(dLat) > fabsf(dLon)) {
+                    if(fabs(dLon) < .01 && fabs(dLat) > fabs(dLon)) {
                         cLon = ' ';
                     } else {
                         if(dLon < 0) {
@@ -535,7 +538,7 @@ void interactiveShowData(void) {
                     }
                  
            
-                    if(fabsf(dLat) < .01 && fabsf(dLon) > fabsf(dLat)) {
+                    if(fabs(dLat) < .01 && fabs(dLon) > fabs(dLat)) {
                         cLat = ' ';
                     } else {
                         if(dLat < 0) {
@@ -545,16 +548,16 @@ void interactiveShowData(void) {
                         }      
                     }
 
-                    snprintf(strD, 8,"%7.03f", d);
+                    snprintf(strD, 6,"%5.01f", d);
 
 		    //formatted for terminusBold 10x16
-                    printf("\n\x1B[%d;31m%-8s \x1B[%d;32m%5s  \x1B[%d;33m%3s \x1B[%d;34m%8s  \x1B[%d;36m%c%c",
+                    printf("\n\x1B[%d;31m%-8s\x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%6s \x1B[%d;36m%c%c \x1B[%d;37m%lc",
                         count%2, a->flight, 
                         count%2, strFl, 
                         count%2, strGs,
                         count%2, strD, 
-                        count%2, cLat, cLon);
-
+                        count%2, cLat, cLon,
+                        count%2, 0x2581 + (wint_t) (2*signalAverage));
                     count++;
                 } else {
                     numNoDir++;

dump1090/mode_s.o.REMOVED.git-id

@@ -1 +1 @@
-d5ebbbdea727d372f6d868a8f114fdb2c4dfe1f5
+bdd60b55bc0624ff84544a794ae21d71eaf0adc8

dump1090/view1090.REMOVED.git-id

@@ -1 +1 @@
-e8e8d968d4f4aec851cfe3bae4e8ad926f7f7b65
+27c08896dac8d6200ae9a0c8901d939002697c2a