From e5b1adae9b23b98a6321986f5cd67c9d3166b87f Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Sun, 21 Nov 2010 10:34:39 +1000 Subject: AltosSiteMap: better gps check, lower zoom --- ao-tools/altosui/AltosSiteMap.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ao-tools/altosui/AltosSiteMap.java b/ao-tools/altosui/AltosSiteMap.java index 5f5e30f0..72a65b15 100644 --- a/ao-tools/altosui/AltosSiteMap.java +++ b/ao-tools/altosui/AltosSiteMap.java @@ -34,7 +34,7 @@ import java.awt.geom.Line2D; public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay { // max vertical step in a tile in naut. miles - static final double tile_size_nmi = 1.0; + static final double tile_size_nmi = 2.0; static final int px_size = 512; @@ -211,10 +211,10 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay { boolean initialised = false; public void show(AltosState state, int crc_errors) { // if insufficient gps data, nothing to update - if (!state.gps_ready) { + if (!state.gps.locked) { if (state.pad_lat == 0 && state.pad_lon == 0) return; - if (state.ngps < 3) + if (state.gps.nsat < 4) return; } -- cgit v1.2.3 From 878913551a1e4e3c8f2b39fa4aeb234880735a1c Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Sun, 21 Nov 2010 10:55:22 +1000 Subject: AltosSiteMap: explain tile size better --- ao-tools/altosui/AltosSiteMap.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ao-tools/altosui/AltosSiteMap.java b/ao-tools/altosui/AltosSiteMap.java index 72a65b15..e222e2c8 100644 --- a/ao-tools/altosui/AltosSiteMap.java +++ b/ao-tools/altosui/AltosSiteMap.java @@ -33,8 +33,10 @@ import java.awt.geom.Point2D; import java.awt.geom.Line2D; public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay { - // max vertical step in a tile in naut. miles - static final double tile_size_nmi = 2.0; + // preferred vertical step in a tile in naut. miles + // will actually choose a step size between x and 2x, where this + // is 1.5x + static final double tile_size_nmi = 1.5; static final int px_size = 512; @@ -117,7 +119,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay { scale_x = 256/360.0 * Math.pow(2, zoom); scale_y = 256/(2.0*Math.PI) * Math.pow(2, zoom); locn = pt(lat, lng); - north_step = pt(lat+tile_size_nmi/60.0, lng); + north_step = pt(lat+tile_size_nmi*4/3/60.0, lng); if (locn.y - north_step.y > px_size) break; } while (zoom < 22); -- cgit v1.2.3