[hamradio-commits] [dump1090] 160/389: Added flags to json for valid position and heading As MalcolmRobb suggested.

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch master
in repository dump1090.

commit e65e873c135ebfeb59980680683fca4b6926b19a
Author: terribl <terri at rannalla.net>
Date:   Sat May 11 23:36:11 2013 +0300

    Added flags to json for valid position and heading
    As MalcolmRobb suggested.
    
    	modified:   dump1090.c
    	modified:   public_html/script.js
---
 dump1090.c            | 16 +++++++++++++---
 public_html/script.js |  7 ++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/dump1090.c b/dump1090.c
index c32e6b2..9f00840 100644
--- a/dump1090.c
+++ b/dump1090.c
@@ -3323,18 +3323,28 @@ char *aircraftsToJson(int *len) {
     p += l; buflen -= l;
     while(a) {
         int altitude = a->altitude, speed = a->speed;
-
+        int position = 0;
+        int track = 0;
+        
         /* 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;
+        }
+        
+        if (a->bFlags & MODES_ACFLAGS_HEADING_VALID) {
+            track = 1;
+        }
+        
         l = snprintf(p,buflen,
             "{\"hex\":\"%06x\", \"squawk\":\"%04x\", \"flight\":\"%s\", \"lat\":%f, "
-            "\"lon\":%f, \"altitude\":%d, \"track\":%d, "
+            "\"lon\":%f, \"validposition\":%d, \"altitude\":%d, \"track\":%d, \"validtrack\":%d,"
             "\"speed\":%d, \"messages\":%ld, \"seen\":%d},\n",
-            a->addr, a->modeA, a->flight, a->lat, a->lon, a->altitude, a->track,
+            a->addr, a->modeA, a->flight, a->lat, a->lon, position, a->altitude, a->track, track,
             a->speed, a->messages, (int)(now - a->seen));
         p += l; buflen -= l;
         
diff --git a/public_html/script.js b/public_html/script.js
index 42db4b8..9168c19 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -118,8 +118,8 @@ function fetchData() {
             stillhere[plane.hex] = true;
             plane.flight = $.trim(plane.flight);
             
-            if (plane.lat != 0 && plane.lon != 0) {
-                // Show only planes with position
+            // Show only planes with position
+            if (plane.validposition == 1) {
                 var marker = null;
                 PlanesOnMap++;
                 
@@ -175,7 +175,8 @@ function fetchData() {
             }
         }
         
-        refreshTableInfo() ;
+        refreshTableInfo();
+        refreshSelectedInfo();
     });
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git