X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMap.java;h=5f1b7ae6f03429a4db89c39ad38763e59c6e05b6;hb=52149fd81df45f37f5097850795f290f463c43ef;hp=5b981d14e6113f2fa9d24c5a3616168295329c9d;hpb=2524730217e6972f3d0f04a9954350ba1964a83a;p=fw%2Faltos diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java index 5b981d14..5f1b7ae6 100644 --- a/altosuilib/AltosUIMap.java +++ b/altosuilib/AltosUIMap.java @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_13; +package org.altusmetrum.altosuilib_14; import java.awt.*; import java.awt.event.*; @@ -28,7 +28,7 @@ import java.awt.geom.*; import java.util.*; import java.util.concurrent.*; import javax.imageio.*; -import org.altusmetrum.altoslib_13.*; +import org.altusmetrum.altoslib_14.*; public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosMapInterface { @@ -148,16 +148,16 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM public void mouseMoved(MouseEvent e) { AltosMapPathPoint point = map.nearest(e.getPoint().x, e.getPoint().y); - if (nearest_mark == null) - nearest_mark = map.add_mark(point.gps.lat, - point.gps.lon, - point.state); - else { - nearest_mark.lat_lon.lat = point.gps.lat; - nearest_mark.lat_lon.lon = point.gps.lon; - nearest_mark.state = point.state; - } if (point != null) { + if (nearest_mark == null) + nearest_mark = map.add_mark(point.gps.lat, + point.gps.lon, + point.state); + else { + nearest_mark.lat_lon.lat = point.gps.lat; + nearest_mark.lat_lon.lon = point.gps.lon; + nearest_mark.state = point.state; + } nearest_label.setText(String.format("%9.2f sec %s%s%s%s", point.time, pos(point.gps.lat,