X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosSiteMap.java;fp=altosui%2FAltosSiteMap.java;h=3ea4d0fd3548eb06bc296f35170739e7c0d22674;hp=d928dd5c1ce5e6d26ee32f42c5f56ec4f4a8fc2a;hb=ce1b19a012a2c1c623b03efb93b881e297736718;hpb=382c54a0d052c8975b57c995ef83bc8934bde242

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index d928dd5c..3ea4d0fd 100644
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -52,11 +52,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)
@@ -99,9 +101,11 @@ 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);
 	}
+	*/
 
 	ConcurrentHashMap<Point,AltosSiteMapTile> mapTiles = new ConcurrentHashMap<Point,AltosSiteMapTile>();
 	Point2D.Double centre;
@@ -181,8 +185,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++) {
@@ -417,7 +421,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 	public AltosSiteMap(int in_radius) {
 		radius = in_radius;
 
-		GrabNDrag scroller = new GrabNDrag(comp);
+		//GrabNDrag scroller = new GrabNDrag(comp);
 
 		comp.setLayout(layout);