X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosSiteMapPreload.java;h=66399557e6813289da168fd511bcc711a84e442f;hp=972765aea446fc28e80b94e81ecee9fe7175003f;hb=43b1797189095c402e1c35bdc317c4196e180e66;hpb=81cac174c80ee42d9e94c6500da7c4c760c3ce67

diff --git a/altosui/AltosSiteMapPreload.java b/altosui/AltosSiteMapPreload.java
index 972765ae..66399557 100644
--- a/altosui/AltosSiteMapPreload.java
+++ b/altosui/AltosSiteMapPreload.java
@@ -18,21 +18,15 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.image.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.MouseInputAdapter;
-import javax.imageio.ImageIO;
-import javax.swing.table.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.lang.Math;
-import java.awt.geom.Point2D;
-import java.awt.geom.Line2D;
 import java.net.URL;
 import java.net.URLConnection;
+import org.altusmetrum.altosuilib_1.*;
 
 class AltosMapPos extends Box {
 	AltosUI		owner;
@@ -183,7 +177,7 @@ class AltosSites extends Thread {
 	public void run() {
 		try {
 			URLConnection uc = url.openConnection();
-			int length = uc.getContentLength();
+			//int length = uc.getContentLength();
 			
 			InputStreamReader in_stream = new InputStreamReader(uc.getInputStream(), Altos.unicode_set);
 			BufferedReader in = new BufferedReader(in_stream);
@@ -204,7 +198,7 @@ class AltosSites extends Thread {
 		sites = new LinkedList<AltosSite>();
 		preload = in_preload;
 		try {
-			url = new URL("http://gag.com/~keithp/launch-sites.txt");
+			url = new URL(Altos.launch_sites_url);
 		} catch (java.net.MalformedURLException e) {
 			notify_complete();
 		}
@@ -212,14 +206,14 @@ class AltosSites extends Thread {
 	}
 }
 
-public class AltosSiteMapPreload extends JDialog implements ActionListener, ItemListener {
+public class AltosSiteMapPreload extends AltosUIDialog implements ActionListener, ItemListener {
 	AltosUI		owner;
 	AltosSiteMap	map;
 
 	AltosMapPos	lat;
 	AltosMapPos	lon;
 
-	final static int	radius = 4;
+	final static int	radius = 5;
 	final static int	width = (radius * 2 + 1);
 	final static int	height = (radius * 2 + 1);
 
@@ -312,6 +306,7 @@ public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
 					final double	latitude = lat.get_value();
 					final double	longitude = lon.get_value();
 					map.setBaseLocation(latitude,longitude);
+					map.draw_circle(latitude,longitude);
 					loading = true;
 					bgLoad thread = new bgLoad(map);
 					thread.start();
@@ -331,7 +326,7 @@ public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
 
 		pane.setLayout(new GridBagLayout());
 
-		map = new AltosSiteMap(4);
+		map = new AltosSiteMap(radius);
 
 		c.fill = GridBagConstraints.BOTH;
 		c.anchor = GridBagConstraints.CENTER;
@@ -469,4 +464,4 @@ public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
 		setLocationRelativeTo(owner);
 		setVisible(true);
 	}
-}
\ No newline at end of file
+}