ao-tools/ao-dump-up: Document --wait flag

[fw/altos] / altosuilib / AltosUIMap.java

diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java
index 7f114e3745a3b915208dd4740b9f5ba8dbe5afc7..8dfdba64c8bca8da70beb0f8462e6c2e3882341c 100644 (file)
--- a/altosuilib/AltosUIMap.java
+++ b/altosuilib/AltosUIMap.java
@@ -106,7 +106,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
                }
 
                private boolean is_drag_event(MouseEvent e) {
-                       return e.getModifiers() == InputEvent.BUTTON1_MASK;
+                       return e.getModifiersEx() == InputEvent.BUTTON1_DOWN_MASK;
                }
 
                /* MouseMotionListener methods */
@@ -264,6 +264,21 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 
                        if (image != null) {
                                g.drawImage(image, point.x, point.y, null);
+/*
+ * Useful when debugging map fetching problems
+ *
+                               String message = String.format("%.6f %.6f", center.lat, center.lon);
+                               g.setFont(tile_font);
+                               g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+                               Rectangle2D bounds = tile_font.getStringBounds(message, g.getFontRenderContext());
+
+                               float x = px_size / 2.0f;
+                               float y = px_size / 2.0f;
+                               x = x - (float) bounds.getWidth() / 2.0f;
+                               y = y + (float) bounds.getHeight() / 2.0f;
+                               g.setColor(Color.RED);
+                               g.drawString(message, (float) point_double.x + x, (float) point_double.y + y);
+*/
                        } else {
                                g.setColor(Color.GRAY);
                                g.fillRect(point.x, point.y, px_size, px_size);
@@ -281,7 +296,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
                                                message = "Network error";
                                                break;
                                        case AltosMapTile.forbidden:
-                                               message = "Outside of launch area";
+                                               message = "Outside of known launch areas";
                                                break;
                                        }
                                        if (message != null && tile_font != null) {