X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMapTransform.java;h=9eac2654220150ac29ea114bf04b23015b41e45a;hb=8554da3b6c05c1094045f4fb21b43c183029408f;hp=ae78befaa2a3f9d7b1290e351c769fca8a8f7eb2;hpb=7041c386cdf37716f8daf0bc1a9204db620e3de9;p=fw%2Faltos

diff --git a/altoslib/AltosMapTransform.java b/altoslib/AltosMapTransform.java
index ae78befa..9eac2654 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_9;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.lang.Math;
@@ -66,13 +67,13 @@ public class AltosMapTransform {
 		return lat_lon(screen_point(screen));
 	}
 
-	public AltosPointDouble point(AltosLatLon lat_lon) {
+	public  AltosPointDouble point(double lat, double lon) {
 		double x, y;
 		double e;
 
-		x = lat_lon.lon * scale_x;
+		x = lon * scale_x;
 
-		e = Math.sin(Math.toRadians(lat_lon.lat));
+		e = Math.sin(Math.toRadians(lat));
 		e = Math.max(e,-(1-1.0E-15));
 		e = Math.min(e,  1-1.0E-15 );
 
@@ -81,6 +82,10 @@ public class AltosMapTransform {
 		return new AltosPointDouble(x, y);
 	}
 
+	public AltosPointDouble point(AltosLatLon lat_lon) {
+		return point(lat_lon.lat, lat_lon.lon);
+	}
+
 	public AltosPointDouble screen(AltosPointDouble point) {
 		return new AltosPointDouble(point.x - offset_x, point.y - offset_y);
 	}
@@ -101,6 +106,10 @@ public class AltosMapTransform {
 		return screen(point(lat_lon));
 	}
 
+	public AltosPointDouble screen(double lat, double lon) {
+		return screen(point(lat, lon));
+	}
+
 	private boolean has_location;
 
 	public boolean has_location() {