altoslib: Allow map preloading to be aborted

[fw/altos] / altosuilib / AltosUIMapPreloadNew.java

diff --git a/altosuilib/AltosUIMapPreloadNew.java b/altosuilib/AltosUIMapPreloadNew.java
index 3269bbddbdeaaa35535483b90dd61978584b0049..3e4a604fa80cd6356bb25a0b37cb6a25831aebaf 100644 (file)
--- a/altosuilib/AltosUIMapPreloadNew.java
+++ b/altosuilib/AltosUIMapPreloadNew.java
@@ -131,7 +131,6 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
        JComboBox<AltosLaunchSite>      site_list;
 
        JToggleButton   load_button;
-       boolean         loading;
        JButton         close_button;
 
        JCheckBox[]     maptypes = new JCheckBox[AltosMap.maptype_terrain - AltosMap.maptype_hybrid + 1];
@@ -147,14 +146,19 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
        Double[]        radius_km = { 2.0, 5.0, 10.0, 20.0, 30.0 };
        Double          radius_def_km = 10.0;
 
+       AltosMapLoader  loader;
 
        static final String[]   lat_hemi_names = { "N", "S" };
        static final String[]   lon_hemi_names = { "E", "W" };
 
        double  latitude, longitude;
 
+       long    loader_notify_time;
+
        /* AltosMapLoaderListener interfaces */
        public void loader_start(final int max) {
+               loader_notify_time = System.currentTimeMillis();
+
                SwingUtilities.invokeLater(new Runnable() {
                                public void run() {
                                        pbar.setMaximum(max);
@@ -167,6 +171,13 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
        }
 
        public void loader_notify(final int cur, final int max, final String name) {
+               long    now = System.currentTimeMillis();
+
+               if (now - loader_notify_time < 100)
+                       return;
+
+               loader_notify_time = now;
+
                SwingUtilities.invokeLater(new Runnable() {
                                public void run() {
                                        pbar.setValue(cur);
@@ -176,12 +187,12 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
        }
 
        public void loader_done(int max) {
+               loader = null;
                SwingUtilities.invokeLater(new Runnable() {
                                public void run() {
                                        pbar.setValue(0);
                                        pbar.setString("");
                                        load_button.setSelected(false);
-                                       loading = false;
                                }
                        });
        }
@@ -216,11 +227,14 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
        public void actionPerformed(ActionEvent e) {
                String  cmd = e.getActionCommand();
 
-               if (cmd.equals("close"))
+               if (cmd.equals("close")) {
+                       if (loader != null)
+                               loader.abort();
                        setVisible(false);
+               }
 
                if (cmd.equals("load")) {
-                       if (!loading) {
+                       if (loader == null) {
                                try {
                                        latitude = lat.get_value();
                                        longitude = lon.get_value();
@@ -231,14 +245,13 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
                                        Double r = (Double) radius.getSelectedItem();
 
                                        if (AltosPreferences.imperial_units())
-                                               r = AltosConvert.distance.inverse(r);
+                                               r = AltosConvert.miles_to_meters(r);
                                        else
                                                r = r * 1000;
-                                       loading = true;
 
-                                       new AltosMapLoader(map.map, this,
-                                                          latitude, longitude,
-                                                          min_z, max_z, r, all_types());
+                                       loader = new AltosMapLoader(map.map, this,
+                                                                   latitude, longitude,
+                                                                   min_z, max_z, r, all_types());
 
                                } catch (ParseException pe) {
                                        load_button.setSelected(false);