From 0c2487df30090649427795a6161900e6eee29857 Mon Sep 17 00:00:00 2001
From: ddeitterick <doug@deitterick.com>
Date: Fri, 1 Aug 2014 23:42:58 -0400
Subject: [PATCH 01/10] Add Degree Symbol to Track Value

Add the degree symbol to the "Track:" value in the plane details
section.
---
 public_html/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public_html/script.js b/public_html/script.js
index 05d29b7..85233e9 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -304,7 +304,7 @@ function refreshSelected() {
     
     html += '<tr><td>Track: ' 
 	if (selected && selected.vTrack) {
-	    html += selected.track + ' (' + normalizeTrack(selected.track, selected.vTrack)[1] +')';
+	    html += selected.track + '&deg;' + ' (' + normalizeTrack(selected.track, selected.vTrack)[1] +')';
 	} else {
 	    html += 'n/a';
 	}

From df4a8ce00b8fb559ec10ee5bf7acc592012d03fd Mon Sep 17 00:00:00 2001
From: ddeitterick <doug@deitterick.com>
Date: Sun, 3 Aug 2014 22:11:09 -0400
Subject: [PATCH 02/10] Change the Background Color for a Plotted Plane

Changed the background color for a plotted plane in the planes table to
something that was more easily visible.
---
 public_html/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public_html/style.css b/public_html/style.css
index 63d0a45..ef4bfd8 100644
--- a/public_html/style.css
+++ b/public_html/style.css
@@ -17,7 +17,7 @@ table#optionsTabs { width: 100%; font-size: small; font-family: monospace; backg
 #tableinfo { font-size: x-small; font-family: monospace; }
 #sudo_buttons { font-size: x-small; font-family: monospace; }
 
-.vPosition  { font-weight: bold; background-color: #f5fff5; }
+.vPosition  { font-weight: bold; background-color: #d5ffd5; }
 .squawk7500 { font-weight: bold; background-color: #ff5555; }
 .squawk7600 { font-weight: bold; background-color: #00ffff; }
 .squawk7700 { font-weight: bold; background-color: #ffff00; }

From 14ff25b87f070d019001d82c67c3a1ed2a4d7c43 Mon Sep 17 00:00:00 2001
From: Trevor Slocum <tslocum@gmail.com>
Date: Wed, 6 Aug 2014 19:31:05 -0700
Subject: [PATCH 03/10] Improve map display layout and styling

---
 public_html/gmap.html | 64 ++++++++++++++++++++-----------------------
 public_html/script.js |  6 +++-
 public_html/style.css | 16 ++++++-----
 3 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/public_html/gmap.html b/public_html/gmap.html
index 80afe02..1898e06 100644
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@@ -3,7 +3,7 @@
 		<link rel="stylesheet" type="text/css" href="style.css" />
 		<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
 		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-		<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
+		<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
 		<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false&libraries=geometry"></script>
 		<script type="text/javascript" src="config.js"></script>
 		<script type="text/javascript" src="planeObject.js"></script>
@@ -18,40 +18,36 @@
 		<div id="dialog-modal" title="Basic modal dialog" style="display:none;">
 			<p>The settings feature is coming soon. Keep checking GitHub.</p>
 		</div>
-		<div id="map_container">
-			<div id="map_canvas"></div>
-		</div>
-		<div id="sidebar_container">
-			<div id="sidebar_canvas">
-				<div id="timestamps" style="align: center">
-					<table width="100%"><tr>
-						<td>Local Time</td>
-						<td>
-							<canvas id="localclock" class="CoolClock:classic:40"></canvas>
-						</td>
-						<td>UTC Time</td>
-						<td>
-							<canvas id="gmtclock" class="CoolClock:classic:40::0"></canvas>
-						</td>
-					</tr></table>
-				</div>
-				<div id="sudo_buttons">
-					<table width="100%"><tr>
-						<td width="150" style="text-align: center;" class="pointer">
-						    [ <span onclick="resetMap();">Reset Map</span> ]
-						</td>
-						<td>&nbsp;</td>
-						<td width="150" style="text-align: center;" id="setings_button" class="pointer">
-						    [ <span onclick="optionsModal();">Settings</span> ]
-						</td>
-					</tr></table>
-				</div>
-
-				<div id="plane_detail"></div>
-				<div id="options"></div>
-				<div id="planes_table"></div>
-				<div id="plane_extension"></div>
+		<div id="map_canvas"></div>
+		<div id="sidebar_canvas">
+			<div id="timestamps" style="align: center">
+				<table width="100%"><tr>
+					<td>Local Time</td>
+					<td>
+						<canvas id="localclock" class="CoolClock:classic:40"></canvas>
+					</td>
+					<td>UTC Time</td>
+					<td>
+						<canvas id="gmtclock" class="CoolClock:classic:40::0"></canvas>
+					</td>
+				</tr></table>
 			</div>
+			<div id="sudo_buttons">
+				<table width="100%"><tr>
+					<td width="150" style="text-align: center;" class="pointer">
+						[ <span onclick="resetMap();">Reset Map</span> ]
+					</td>
+					<td>&nbsp;</td>
+					<td width="150" style="text-align: center;" id="setings_button" class="pointer">
+						[ <span onclick="optionsModal();">Settings</span> ]
+					</td>
+				</tr></table>
+			</div>
+
+			<div id="plane_detail"></div>
+			<div id="options"></div>
+			<div id="planes_table"></div>
+			<div id="plane_extension"></div>
 		</div>
 		<div id="SpecialSquawkWarning">
 		    <b>Squak 7x00 is reported and shown.</b><br>
diff --git a/public_html/script.js b/public_html/script.js
index 05d29b7..1fc8748 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -135,8 +135,12 @@ function initialize() {
 		center: new google.maps.LatLng(CenterLat, CenterLon),
 		zoom: ZoomLvl,
 		mapTypeId: google.maps.MapTypeId.ROADMAP,
+		mapTypeControl: true,
+		streetViewControl: false,
 		mapTypeControlOptions: {
-			mapTypeIds: mapTypeIds
+			mapTypeIds: mapTypeIds,
+			position: google.maps.ControlPosition.TOP_LEFT,
+			style: google.maps.MapTypeControlStyle.DROPDOWN_MENU
 		}
 	};
 
diff --git a/public_html/style.css b/public_html/style.css
index 63d0a45..b4dd94e 100644
--- a/public_html/style.css
+++ b/public_html/style.css
@@ -1,21 +1,23 @@
 html, body {
     margin: 0; padding: 0; background-color: #ffffff; font-family: Tahoma, Sans-Serif;
-    font-size: 10pt; overflow: auto;
+    font-size: 12pt; overflow: auto;
 }
-div#map_container     { float: left; width: 100%; height: 100%; }
-div#map_canvas        { height: 100%; margin-right: 420px; }
 
-div#sidebar_container { float: left; width: 410px; margin-left: -410px; height: 100%; overflow: auto; }
+div#map_canvas     { width: 100%; height: 100%; }
 
-div#SpecialSquawkWarning { position: absolute; bottom: 25px; right: 430px; border: 2px solid red;
+div#sidebar_canvas { position: absolute; top: 0px; right: 0px;
+	box-sizing:border-box; width: 410px;
+	background: #FFFFFF; padding: 0px 2px 2px 2px;
+	border-bottom-left-radius: 5px; z-index: 99; overflow: auto; }
+
+div#SpecialSquawkWarning { position: absolute; bottom: 25px; right: 0px; border: 2px solid red;
     background-color: #FFFFA3; opacity: 0.75; filter:alpha(opacity=75); padding: 5px;
     display: none; text-align: center; }
 
 table#optionsTabs { width: 100%; font-size: small; font-family: monospace; background-color: #ddd;
     border: 1px; border-color: #000000;}
 
-#tableinfo { font-size: x-small; font-family: monospace; }
-#sudo_buttons { font-size: x-small; font-family: monospace; }
+#tableinfo, #sudo_buttons { font-family: monospace; }
 
 .vPosition  { font-weight: bold; background-color: #f5fff5; }
 .squawk7500 { font-weight: bold; background-color: #ff5555; }

From b7d01c56158ba9f1cb60bbf73bc795df84d0d21b Mon Sep 17 00:00:00 2001
From: Trevor Slocum <tslocum@gmail.com>
Date: Thu, 7 Aug 2014 23:50:28 -0700
Subject: [PATCH 04/10] Don't restrict sidebar width

---
 public_html/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public_html/style.css b/public_html/style.css
index b4dd94e..aaa933f 100644
--- a/public_html/style.css
+++ b/public_html/style.css
@@ -6,9 +6,9 @@ html, body {
 div#map_canvas     { width: 100%; height: 100%; }
 
 div#sidebar_canvas { position: absolute; top: 0px; right: 0px;
-	box-sizing:border-box; width: 410px;
+	box-sizing: border-box; overflow: auto;
 	background: #FFFFFF; padding: 0px 2px 2px 2px;
-	border-bottom-left-radius: 5px; z-index: 99; overflow: auto; }
+	border-bottom-left-radius: 5px; z-index: 99; }
 
 div#SpecialSquawkWarning { position: absolute; bottom: 25px; right: 0px; border: 2px solid red;
     background-color: #FFFFA3; opacity: 0.75; filter:alpha(opacity=75); padding: 5px;

From 95ccb90c7672cd2ead019f1a18b83a116029c08d Mon Sep 17 00:00:00 2001
From: Oliver Jowett <oliver@mutability.co.uk>
Date: Wed, 24 Sep 2014 20:01:06 +0100
Subject: [PATCH 05/10] Fix --gain with fractional gain values.

---
 dump1090.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dump1090.c b/dump1090.c
index b3bef28..3454aa0 100644
--- a/dump1090.c
+++ b/dump1090.c
@@ -581,7 +581,7 @@ int main(int argc, char **argv) {
         if (!strcmp(argv[j],"--device-index") && more) {
             Modes.dev_index = verbose_device_search(argv[++j]);
         } else if (!strcmp(argv[j],"--gain") && more) {
-            Modes.gain = (int) atof(argv[++j])*10; // Gain is in tens of DBs
+            Modes.gain = (int) (atof(argv[++j])*10); // Gain is in tens of DBs
         } else if (!strcmp(argv[j],"--enable-agc")) {
             Modes.enable_agc++;
         } else if (!strcmp(argv[j],"--freq") && more) {

From e5b3572e8b27651b207be4f27a2fbb44bdce849a Mon Sep 17 00:00:00 2001
From: Oliver Jowett <oliver@mutability.co.uk>
Date: Thu, 25 Sep 2014 15:49:39 +0100
Subject: [PATCH 06/10] Reject out-of-range latitudes when doing CPR decoding.

If a CPR message with an undetected error is received this can produce out-of-range results for latitude.
e.g. even latitude of 78000, odd latitude of 0 produces a latitude index j=35 and rlat0 = 213.
---
 mode_s.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mode_s.c b/mode_s.c
index 34ddec1..3dc2806 100644
--- a/mode_s.c
+++ b/mode_s.c
@@ -2053,6 +2053,9 @@ void decodeCPR(struct aircraft *a, int fflag, int surface) {
         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.
     if (cprNLFunction(rlat0) != cprNLFunction(rlat1)) return;
 
@@ -2129,6 +2132,12 @@ int decodeCPRrelative(struct aircraft *a, int fflag, int surface) {
     rlat = AirDlat * (j + lat/131072);
     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 
     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

From 3eb39ab788254488a0bb91dc74216f4977e3bbdb Mon Sep 17 00:00:00 2001
From: Oliver Jowett <oliver@mutability.co.uk>
Date: Thu, 25 Sep 2014 21:45:46 +0100
Subject: [PATCH 07/10] Don't output message reception time in SBS format for
 remote messages.

For remotely received messages that have a mlat timestamp, we have no
useful way of turning that timestamp into a wallclock timestamp, so
don't try, or we'll just produce wildly wrong results (_days_ in error)
---
 net_io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net_io.c b/net_io.c
index 25abb88..2b0ed9a 100644
--- a/net_io.c
+++ b/net_io.c
@@ -336,8 +336,8 @@ void modesSendSBSOutput(struct modesMessage *mm) {
     // Fields 1 to 6 : SBS message type and ICAO address of the aircraft and some other stuff
     p += sprintf(p, "MSG,%d,111,11111,%06X,111111,", msgType, mm->addr); 
 
-    // Fields 7 & 8 are the current time and date
-    if (mm->timestampMsg) {                                       // Make sure the records' timestamp is valid before outputing it
+    // Fields 7 & 8 are the message reception time and date
+    if (mm->timestampMsg && !mm->remote) {                        // Make sure the records' timestamp is valid before outputing it
         epocTime = Modes.stSystemTimeBlk;                         // This is the time of the start of the Block we're processing
         offset   = (int) (mm->timestampMsg - Modes.timestampBlk); // This is the time (in 12Mhz ticks) into the Block
         offset   = offset / 12000;                                // convert to milliseconds

From aa063ba89fce9cafa24b9fbba72a0743f9b45cb2 Mon Sep 17 00:00:00 2001
From: Malcolm Robb <Support@ATTAvionics.com>
Date: Tue, 30 Sep 2014 16:35:15 +0100
Subject: [PATCH 08/10] Undo Parts of Pull request #29

The table sizing doesn't seem to work in M$ IE8 and IE9.
---
 public_html/gmap.html | 62 +++++++++++++++++++++++--------------------
 public_html/style.css | 15 +++++------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/public_html/gmap.html b/public_html/gmap.html
index 1898e06..96f412a 100644
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@@ -18,36 +18,40 @@
 		<div id="dialog-modal" title="Basic modal dialog" style="display:none;">
 			<p>The settings feature is coming soon. Keep checking GitHub.</p>
 		</div>
-		<div id="map_canvas"></div>
-		<div id="sidebar_canvas">
-			<div id="timestamps" style="align: center">
-				<table width="100%"><tr>
-					<td>Local Time</td>
-					<td>
-						<canvas id="localclock" class="CoolClock:classic:40"></canvas>
-					</td>
-					<td>UTC Time</td>
-					<td>
-						<canvas id="gmtclock" class="CoolClock:classic:40::0"></canvas>
-					</td>
-				</tr></table>
-			</div>
-			<div id="sudo_buttons">
-				<table width="100%"><tr>
-					<td width="150" style="text-align: center;" class="pointer">
-						[ <span onclick="resetMap();">Reset Map</span> ]
-					</td>
-					<td>&nbsp;</td>
-					<td width="150" style="text-align: center;" id="setings_button" class="pointer">
-						[ <span onclick="optionsModal();">Settings</span> ]
-					</td>
-				</tr></table>
-			</div>
+		<div id="map_container">
+			<div id="map_canvas"></div>
+		</div>
+		<div id="sidebar_container">
+			<div id="sidebar_canvas">
+				<div id="timestamps" style="align: center">
+					<table width="100%"><tr>
+						<td>Local Time</td>
+						<td>
+							<canvas id="localclock" class="CoolClock:classic:40"></canvas>
+						</td>
+						<td>UTC Time</td>
+						<td>
+							<canvas id="gmtclock" class="CoolClock:classic:40::0"></canvas>
+						</td>
+					</tr></table>
+				</div>
+				<div id="sudo_buttons">
+					<table width="100%"><tr>
+						<td width="150" style="text-align: center;" class="pointer">
+						    [ <span onclick="resetMap();">Reset Map</span> ]
+						</td>
+						<td>&nbsp;</td>
+						<td width="150" style="text-align: center;" id="setings_button" class="pointer">
+						    [ <span onclick="optionsModal();">Settings</span> ]
+						</td>
+					</tr></table>
+				</div>
 
-			<div id="plane_detail"></div>
-			<div id="options"></div>
-			<div id="planes_table"></div>
-			<div id="plane_extension"></div>
+				<div id="plane_detail"></div>
+				<div id="options"></div>
+				<div id="planes_table"></div>
+				<div id="plane_extension"></div>
+			</div>
 		</div>
 		<div id="SpecialSquawkWarning">
 		    <b>Squak 7x00 is reported and shown.</b><br>
diff --git a/public_html/style.css b/public_html/style.css
index eab51de..86cb053 100644
--- a/public_html/style.css
+++ b/public_html/style.css
@@ -1,23 +1,20 @@
 html, body {
     margin: 0; padding: 0; background-color: #ffffff; font-family: Tahoma, Sans-Serif;
-    font-size: 12pt; overflow: auto;
+    font-size: 10pt; overflow: auto;
 }
+div#map_container     { float: left; width: 100%; height: 100%; }
+div#map_canvas        { height: 100%; margin-right: 420px; }
 
-div#map_canvas     { width: 100%; height: 100%; }
+div#sidebar_container { float: left; width: 410px; margin-left: -410px; height: 100%; overflow: auto; }
 
-div#sidebar_canvas { position: absolute; top: 0px; right: 0px;
-	box-sizing: border-box; overflow: auto;
-	background: #FFFFFF; padding: 0px 2px 2px 2px;
-	border-bottom-left-radius: 5px; z-index: 99; }
-
-div#SpecialSquawkWarning { position: absolute; bottom: 25px; right: 0px; border: 2px solid red;
+div#SpecialSquawkWarning { position: absolute; bottom: 25px; right: 430px; border: 2px solid red;
     background-color: #FFFFA3; opacity: 0.75; filter:alpha(opacity=75); padding: 5px;
     display: none; text-align: center; }
 
 table#optionsTabs { width: 100%; font-size: small; font-family: monospace; background-color: #ddd;
     border: 1px; border-color: #000000;}
 
-#tableinfo, #sudo_buttons { font-family: monospace; }
+#tableinfo, #sudo_buttons { font-size: x-small; font-family: monospace; }
 
 .vPosition  { font-weight: bold; background-color: #d5ffd5; }
 .squawk7500 { font-weight: bold; background-color: #ff5555; }

From e3bbf7b26622f88c9ee828b89b17a4954ac5b864 Mon Sep 17 00:00:00 2001
From: Malcolm Robb <Support@ATTAvionics.com>
Date: Tue, 30 Sep 2014 16:36:56 +0100
Subject: [PATCH 09/10] Read Files are binary

When replaying recordings, the read files are binary, so the file open
needs to reflect this so that spurious end of file characters aren't
misinterpreted.
---
 dump1090.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dump1090.c b/dump1090.c
index 3454aa0..f88d03b 100644
--- a/dump1090.c
+++ b/dump1090.c
@@ -710,7 +710,7 @@ int main(int argc, char **argv) {
     } else {
         if (Modes.filename[0] == '-' && Modes.filename[1] == '\0') {
             Modes.fd = STDIN_FILENO;
-        } else if ((Modes.fd = open(Modes.filename,O_RDONLY)) == -1) {
+        } else if ((Modes.fd = open(Modes.filename, (O_RDONLY | O_BINARY))) == -1) {
             perror("Opening data file");
             exit(1);
         }

From 98c7c73d0647f7551cf98434ab7cf0009c8f91ec Mon Sep 17 00:00:00 2001
From: Oliver Jowett <oliver@mutability.co.uk>
Date: Wed, 1 Oct 2014 12:17:51 +0100
Subject: [PATCH 10/10] Only use O_BINARY on Win32

---
 dump1090.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dump1090.c b/dump1090.c
index f88d03b..7a7addd 100644
--- a/dump1090.c
+++ b/dump1090.c
@@ -710,7 +710,13 @@ int main(int argc, char **argv) {
     } else {
         if (Modes.filename[0] == '-' && Modes.filename[1] == '\0') {
             Modes.fd = STDIN_FILENO;
-        } else if ((Modes.fd = open(Modes.filename, (O_RDONLY | O_BINARY))) == -1) {
+        } else if ((Modes.fd = open(Modes.filename,
+#ifdef _WIN32
+                                    (O_RDONLY | O_BINARY)
+#else
+                                    (O_RDONLY)
+#endif
+                                    )) == -1) {
             perror("Opening data file");
             exit(1);
         }