Plane Project, Animation, & Enhancements

README.md

@@ -53,6 +53,16 @@ In iteractive mode it is possible to have a less information dense but more
 all the recently seen aircrafts with some additional information such as
 altitude and flight number, extracted from the received Mode S packets.
 
+When using network server mode, you can quickly set your "home" location
+using Google Maps' address resolution by passing a ```--home``` string
+argument:
+
+    ./dump1090 --interactive --home "1600 Pennsylvania Ave NW, Washington, DC 20500"
+
+This will center the map, draw a general radar indicator, and use this
+base for calculating directionality and distance from you to the various
+transponders on the map.
+
 Using files as source of data
 ---
 

dump1090.c

@@ -422,6 +422,9 @@ void showHelp(void) {
 "--net-buffer <n>         TCP buffer size 64Kb * (2^n) (default: n=0, 64Kb)\n"
 "--lat <latitude>         Reference/receiver latitude for surface posn (opt)\n"
 "--lon <longitude>        Reference/receiver longitude for surface posn (opt)\n"
+"--home <string>          Google Maps Search String for setting \"Site\" in web UI (opt; overrides lat/long)\n"
+"                         (search strings can be addresses, human text, or lat/lon\n"
+"                         coords, eg. \"Voghera, Italy\" or \"Grand Canyon, AZ, US\")\n"
 "--fix                    Enable single-bits error correction using CRC\n"
 "--no-fix                 Disable single-bits error correction using CRC\n"
 "--no-crc-check           Disable messages with broken CRC (discouraged)\n"
@@ -445,6 +448,13 @@ void showHelp(void) {
 "                  p = Log frames with bad preamble\n"
 "                  n = Log network debugging info\n"
 "                  j = Log frames to frames.js, loadable by debug.html\n"
+"\n"
+"When running in --net mode, dump1090 will look for './public_html' by default\n"
+"to serve supporting files. This can be overridden with an environment setting\n"
+"of DUMP1090_WEB (e.g., \"DUMP1090_WEB=/path/to/the/dump1090/public_html\" - no\n"
+"trailing slash should be used).  Once set, the binary can be run from any path\n"
+"and it will be able to serve up the content correctly.\n"
+"\n"
     );
 }
 
@@ -600,62 +610,62 @@ void backgroundTasks(void) {
 //
 int verbose_device_search(char *s)
 {
-	int i, device_count, device, offset;
-	char *s2;
-	char vendor[256], product[256], serial[256];
-	device_count = rtlsdr_get_device_count();
-	if (!device_count) {
-		fprintf(stderr, "No supported devices found.\n");
-		return -1;
-	}
-	fprintf(stderr, "Found %d device(s):\n", device_count);
-	for (i = 0; i < device_count; i++) {
-		rtlsdr_get_device_usb_strings(i, vendor, product, serial);
-		fprintf(stderr, "  %d:  %s, %s, SN: %s\n", i, vendor, product, serial);
-	}
-	fprintf(stderr, "\n");
-	/* does string look like raw id number */
-	device = (int)strtol(s, &s2, 0);
-	if (s2[0] == '\0' && device >= 0 && device < device_count) {
-		fprintf(stderr, "Using device %d: %s\n",
-			device, rtlsdr_get_device_name((uint32_t)device));
-		return device;
-	}
-	/* does string exact match a serial */
-	for (i = 0; i < device_count; i++) {
-		rtlsdr_get_device_usb_strings(i, vendor, product, serial);
-		if (strcmp(s, serial) != 0) {
-			continue;}
-		device = i;
-		fprintf(stderr, "Using device %d: %s\n",
-			device, rtlsdr_get_device_name((uint32_t)device));
-		return device;
-	}
-	/* does string prefix match a serial */
-	for (i = 0; i < device_count; i++) {
-		rtlsdr_get_device_usb_strings(i, vendor, product, serial);
-		if (strncmp(s, serial, strlen(s)) != 0) {
-			continue;}
-		device = i;
-		fprintf(stderr, "Using device %d: %s\n",
-			device, rtlsdr_get_device_name((uint32_t)device));
-		return device;
-	}
-	/* does string suffix match a serial */
-	for (i = 0; i < device_count; i++) {
-		rtlsdr_get_device_usb_strings(i, vendor, product, serial);
-		offset = strlen(serial) - strlen(s);
-		if (offset < 0) {
-			continue;}
-		if (strncmp(s, serial+offset, strlen(s)) != 0) {
-			continue;}
-		device = i;
-		fprintf(stderr, "Using device %d: %s\n",
-			device, rtlsdr_get_device_name((uint32_t)device));
-		return device;
-	}
-	fprintf(stderr, "No matching devices found.\n");
-	return -1;
+    int i, device_count, device, offset;
+    char *s2;
+    char vendor[256], product[256], serial[256];
+    device_count = rtlsdr_get_device_count();
+    if (!device_count) {
+        fprintf(stderr, "No supported devices found.\n");
+        return -1;
+    }
+    fprintf(stderr, "Found %d device(s):\n", device_count);
+    for (i = 0; i < device_count; i++) {
+        rtlsdr_get_device_usb_strings(i, vendor, product, serial);
+        fprintf(stderr, "  %d:  %s, %s, SN: %s\n", i, vendor, product, serial);
+    }
+    fprintf(stderr, "\n");
+    /* does string look like raw id number */
+    device = (int)strtol(s, &s2, 0);
+    if (s2[0] == '\0' && device >= 0 && device < device_count) {
+        fprintf(stderr, "Using device %d: %s\n",
+            device, rtlsdr_get_device_name((uint32_t)device));
+        return device;
+    }
+    /* does string exact match a serial */
+    for (i = 0; i < device_count; i++) {
+        rtlsdr_get_device_usb_strings(i, vendor, product, serial);
+        if (strcmp(s, serial) != 0) {
+            continue;}
+        device = i;
+        fprintf(stderr, "Using device %d: %s\n",
+            device, rtlsdr_get_device_name((uint32_t)device));
+        return device;
+    }
+    /* does string prefix match a serial */
+    for (i = 0; i < device_count; i++) {
+        rtlsdr_get_device_usb_strings(i, vendor, product, serial);
+        if (strncmp(s, serial, strlen(s)) != 0) {
+            continue;}
+        device = i;
+        fprintf(stderr, "Using device %d: %s\n",
+            device, rtlsdr_get_device_name((uint32_t)device));
+        return device;
+    }
+    /* does string suffix match a serial */
+    for (i = 0; i < device_count; i++) {
+        rtlsdr_get_device_usb_strings(i, vendor, product, serial);
+        offset = strlen(serial) - strlen(s);
+        if (offset < 0) {
+            continue;}
+        if (strncmp(s, serial+offset, strlen(s)) != 0) {
+            continue;}
+        device = i;
+        fprintf(stderr, "Using device %d: %s\n",
+            device, rtlsdr_get_device_name((uint32_t)device));
+        return device;
+    }
+    fprintf(stderr, "No matching devices found.\n");
+    return -1;
 }
 //
 //=========================================================================
@@ -741,6 +751,8 @@ int main(int argc, char **argv) {
             Modes.fUserLat = atof(argv[++j]);
         } else if (!strcmp(argv[j],"--lon") && more) {
             Modes.fUserLon = atof(argv[++j]);
+        } else if (!strcmp(argv[j],"--home") && more) {
+            Modes.home = strdup(argv[++j]);
         } else if (!strcmp(argv[j],"--debug") && more) {
             char *f = argv[++j];
             while(*f) {

dump1090.h

@@ -322,6 +322,7 @@ struct {                             // Internal state
     // User details
     double fUserLat;                // Users receiver/antenna lat/lon needed for initial surface location
     double fUserLon;                // Users receiver/antenna lat/lon needed for initial surface location
+	char   *home;                   // Address lookup for net:map interface.
     int    bUserFlags;              // Flags relating to the user details
 
     // Interactive mode