Merge branch 'sitemap' into buttonbox

Conflicts:
	ao-tools/altosui/AltosSiteMap.java

diff --cc ao-tools/altosui/AltosFlightUI.java
Simple merge

diff --cc ao-tools/altosui/AltosSiteMap.java
index 50177d4e84b9a564c16bc64349a58cfd33af3b46,e222e2c8cc88e592a8f90627d24c2986a33b54b8..2c5420619eda46a36ae29a1b91eda1a7a371c047
--- 1/ao-tools/altosui/AltosSiteMap.java
--- 2/ao-tools/altosui/AltosSiteMap.java
+++ b/ao-tools/altosui/AltosSiteMap.java
@@@ -211,10 -213,10 +213,12 @@@ public class AltosSiteMap extends JScro
        boolean initialised = false;
        public void show(AltosState state, int crc_errors) {
                // if insufficient gps data, nothing to update
-               if (state.gps == null || !state.gps.locked) {
++              if (state.gps == null)
++                      return;
+               if (!state.gps.locked) {
                        if (state.pad_lat == 0 && state.pad_lon == 0)
                                return;
-                       if (state.ngps < 3)
+                       if (state.gps.nsat < 4)
                                return;
                }