Bump java lib versions in preparation for 1.9.2

[fw/altos] / altoslib / AltosMapTransform.java

diff --git a/altoslib/AltosMapTransform.java b/altoslib/AltosMapTransform.java
index f5fc5ebe597531953d0a41413381198d558452a3..ba9d1ae46121ca5ce72895562dd13ec736e88a38 100644 (file)
--- 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_14;
 
 import java.io.*;
 import java.lang.Math;
@@ -39,21 +40,40 @@ 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));
        }
 
-       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 );
 
@@ -62,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);
        }
@@ -71,17 +95,21 @@ 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));
        }
 
+       public AltosPointDouble screen(double lat, double lon) {
+               return screen(point(lat, lon));
+       }
+
        private boolean has_location;
 
        public boolean has_location() {
@@ -98,4 +126,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;
+       }
 }