X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMapTransform.java;h=b6d4f4356af8166b4dd3322092aaa2ce9682dd39;hp=f5fc5ebe597531953d0a41413381198d558452a3;hb=110e4818b85781c33d683b7b7e7f2864a1223c5c;hpb=29edc37a8de56cb6eb028e3bf3f56aa70f109eba

diff --git a/altoslib/AltosMapTransform.java b/altoslib/AltosMapTransform.java
index f5fc5ebe..b6d4f435 100644
--- a/altoslib/AltosMapTransform.java
+++ b/altoslib/AltosMapTransform.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.lang.Math;
@@ -39,10 +40,29 @@ public class AltosMapTransform {
 		return new AltosLatLon(lat,lon);
 	}
 
+	public AltosLatLon lat_lon (AltosPointInt point) {
+		return lat_lon(new AltosPointDouble(point.x, point.y));
+	}
+
+	public AltosPointDouble screen_point(AltosPointInt screen) {
+		return new AltosPointDouble(screen.x + offset_x, screen.y + offset_y);
+	}
+
 	public AltosPointDouble screen_point(AltosPointDouble screen) {
 		return new AltosPointDouble(screen.x + offset_x, screen.y + offset_y);
 	}
 
+	public double hypot(AltosLatLon a, AltosLatLon b) {
+		AltosPointDouble	a_pt = point(a);
+		AltosPointDouble	b_pt = point(b);
+
+		return Math.hypot(a_pt.x - b_pt.x, a_pt.y - b_pt.y);
+	}
+
+	public AltosLatLon screen_lat_lon(AltosPointInt screen) {
+		return lat_lon(screen_point(screen));
+	}
+
 	public AltosLatLon screen_lat_lon(AltosPointDouble screen) {
 		return lat_lon(screen_point(screen));
 	}
@@ -71,12 +91,12 @@ public class AltosMapTransform {
 					 (int) (point.y - offset_y + 0.5));
 	}
 
-//	public Rectangle screen(AltosMapRectangle map_rect) {
-//		AltosPoint2D	ul = screen(map_rect.ul);
-//		AltosPoint2D	lr = screen(map_rect.lr);
-//
-//		return new Rectangle((int) ul.x, (int) ul.y, (int) (lr.x - ul.x), (int) (lr.y - ul.y));
-//	}
+	public AltosRectangle screen(AltosMapRectangle map_rect) {
+		AltosPointDouble	ul = screen(map_rect.ul);
+		AltosPointDouble	lr = screen(map_rect.lr);
+
+		return new AltosRectangle((int) ul.x, (int) ul.y, (int) (lr.x - ul.x), (int) (lr.y - ul.y));
+	}
 
 	public AltosPointDouble screen(AltosLatLon lat_lon) {
 		return screen(point(lat_lon));
@@ -98,4 +118,12 @@ public class AltosMapTransform {
 		offset_x = centre_pt.x - width / 2.0;
 		offset_y = centre_pt.y - height / 2.0;
 	}
+
+	public static double lon_from_distance(double lat, double distance) {
+		double c = AltosGreatCircle.earth_radius * Math.cos(lat * Math.PI / 180) * 2 * Math.PI;
+
+		if (c < 10)
+			return 0;
+		return distance/c * 360.0;
+	}
 }