Add version numbers to java libraries

[fw/altos] / altosui / AltosSiteMap.java

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index c258b3e5559728f364105d0794f89f4c8eba9784..f111e62d45066d0d4dd6e6295a4fb44df955a0c8 100644 (file)
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -18,19 +18,13 @@
 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.util.concurrent.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
        // preferred vertical step in a tile in naut. miles
@@ -59,11 +53,13 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
        // based on google js
        //  http://maps.gstatic.com/intl/en_us/mapfiles/api-3/2/10/main.js
        // search for fromLatLngToPoint and fromPointToLatLng
+       /*
        private static Point2D.Double pt(LatLng latlng, int zoom) {
                double scale_x = 256/360.0 * Math.pow(2, zoom);
                double scale_y = 256/(2.0*Math.PI) * Math.pow(2, zoom);
                return pt(latlng, scale_x, scale_y);
        }
+       */
 
        private static Point2D.Double pt(LatLng latlng,
                                         double scale_x, double scale_y)
@@ -106,11 +102,13 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
        private LatLng latlng(double x, double y) {
                return latlng(new Point2D.Double(x,y), scale_x, scale_y);
        }
+       /*
        private LatLng latlng(Point2D.Double pt) {
                return latlng(pt, scale_x, scale_y);
        }
+       */
 
-       HashMap<Point,AltosSiteMapTile> mapTiles = new HashMap<Point,AltosSiteMapTile>();
+       ConcurrentHashMap<Point,AltosSiteMapTile> mapTiles = new ConcurrentHashMap<Point,AltosSiteMapTile>();
        Point2D.Double centre;
 
        private Point2D.Double tileCoordOffset(Point p) {
@@ -188,8 +186,8 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
                AltosSiteMap asm = new AltosSiteMap(true);
                asm.centre = asm.getBaseLocation(lat, lng);
 
-               Point2D.Double p = new Point2D.Double();
-               Point2D.Double p2;
+               //Point2D.Double p = new Point2D.Double();
+               //Point2D.Double p2;
                int dx = -w/2, dy = -h/2;
                for (int y = dy; y < h+dy; y++) {
                        for (int x = dx; x < w+dx; x++) {
@@ -249,7 +247,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
                char chlng = lng < 0 ? 'W' : 'E';
                if (lat < 0) lat = -lat;
                if (lng < 0) lng = -lng;
-               return new File(AltosPreferences.mapdir(),
+               return new File(AltosUIPreferences.mapdir(),
                                String.format("map-%c%.6f,%c%.6f-%d.png",
                                              chlat, lat, chlng, lng, zoom));
        }