X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMapPreload.java;h=5b99ec033ab5d1f3da4a86cfb00740b263f95063;hb=f41fe2291891b28327c332098bdc601bc75fc4c0;hp=d702dddfee70f59029a6a3356e019544d7444229;hpb=db2443fdbf65b65703217174303027c439124a83;p=fw%2Faltos

diff --git a/altosuilib/AltosUIMapPreload.java b/altosuilib/AltosUIMapPreload.java
index d702dddf..5b99ec03 100644
--- a/altosuilib/AltosUIMapPreload.java
+++ b/altosuilib/AltosUIMapPreload.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_2;
+package org.altusmetrum.altosuilib_7;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -26,7 +26,7 @@ import java.text.*;
 import java.lang.Math;
 import java.net.URL;
 import java.net.URLConnection;
-import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altoslib_7.*;
 
 class AltosUIMapPos extends Box {
 	AltosUIFrame	owner;
@@ -53,33 +53,33 @@ class AltosUIMapPos extends Box {
 		hemi.setSelectedIndex(h);
 	}
 
-	public double get_value() throws NumberFormatException {
+	public double get_value() throws ParseException {
 		int	h = hemi.getSelectedIndex();
 		String	d_t = deg.getText();
 		String	m_t = min.getText();
 		double 	d, m, v;
 		try {
-			d = Double.parseDouble(d_t);
-		} catch (NumberFormatException ne) {
+			d = AltosParse.parse_double_locale(d_t);
+		} catch (ParseException pe) {
 			JOptionPane.showMessageDialog(owner,
 						      String.format("Invalid degrees \"%s\"",
 								    d_t),
 						      "Invalid number",
 						      JOptionPane.ERROR_MESSAGE);
-			throw ne;
+			throw pe;
 		}
 		try {
 			if (m_t.equals(""))
 				m = 0;
 			else
-				m = Double.parseDouble(m_t);
-		} catch (NumberFormatException ne) {
+				m = AltosParse.parse_double_locale(m_t);
+		} catch (ParseException pe) {
 			JOptionPane.showMessageDialog(owner,
 						      String.format("Invalid minutes \"%s\"",
 								    m_t),
 						      "Invalid number",
 						      JOptionPane.ERROR_MESSAGE);
-			throw ne;
+			throw pe;
 		}
 		v = d + m/60.0;
 		if (h == 1)
@@ -142,9 +142,9 @@ class AltosUISite {
 		name = elements[0];
 
 		try {
-			latitude = Double.parseDouble(elements[1]);
-			longitude = Double.parseDouble(elements[2]);
-		} catch (NumberFormatException ne) {
+			latitude = AltosParse.parse_double_net(elements[1]);
+			longitude = AltosParse.parse_double_net(elements[2]);
+		} catch (ParseException pe) {
 			throw new ParseException(String.format("Invalid site line %s", line), 0);
 		}
 	}
@@ -171,6 +171,7 @@ class AltosUISites extends Thread {
 		try {
 			add(new AltosUISite(line));
 		} catch (ParseException pe) {
+			System.out.printf("parse exception %s\n", pe.toString());
 		}
 	}
 
@@ -209,6 +210,7 @@ class AltosUISites extends Thread {
 public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, ItemListener, AltosUIMapTileListener {
 	AltosUIFrame	owner;
 	AltosUIMap	map;
+	AltosUIMapCache	cache = new AltosUIMapCache();
 
 	AltosUIMapPos	lat;
 	AltosUIMapPos	lon;
@@ -326,7 +328,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 
 	/* AltosUIMapTileListener methods */
 
-	public void notify_tile(AltosUIMapTile tile, int status) {
+	public synchronized void notify_tile(AltosUIMapTile tile, int status) {
 		if (status == AltosUIMapStore.loading)
 			return;
 
@@ -353,6 +355,8 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 		}
 	}
 
+	public AltosUIMapCache cache() { return cache; }
+
 	public void set_sites() {
 		int	i = 1;
 		for (AltosUISite site : sites.sites) {
@@ -391,7 +395,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 						max_z = min_z;
 					r = (Integer) radius.getSelectedItem();
 					loading = true;
-				} catch (NumberFormatException ne) {
+				} catch (ParseException pe) {
 					load_button.setSelected(false);
 				}
 				start_load();
@@ -400,8 +404,6 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 	}
 
 	public AltosUIMapPreload(AltosUIFrame in_owner) {
-		System.out.printf("start creating preload ui\n");
-
 		owner = in_owner;
 
 		Container		pane = getContentPane();
@@ -602,7 +604,5 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 		pack();
 		setLocationRelativeTo(owner);
 		setVisible(true);
-
-		System.out.printf("done creating preload ui\n");
 	}
 }