projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altoslib
/
AltosMapTransform.java
diff --git
a/altoslib/AltosMapTransform.java
b/altoslib/AltosMapTransform.java
index e0e8afb095af2f956b4fceddf8ba0a85f4f2a979..6bc6c6f809baaa114dcb6928c94f0b49ceea601b 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
*
* 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
*
* 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.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
7
;
+package org.altusmetrum.altoslib_
13
;
import java.io.*;
import java.lang.Math;
import java.io.*;
import java.lang.Math;
@@
-39,6
+40,10
@@
public class AltosMapTransform {
return new AltosLatLon(lat,lon);
}
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(AltosPointInt screen) {
return new AltosPointDouble(screen.x + offset_x, screen.y + offset_y);
}
@@
-47,6
+52,13
@@
public class AltosMapTransform {
return new AltosPointDouble(screen.x + offset_x, screen.y + offset_y);
}
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(AltosPointInt screen) {
return lat_lon(screen_point(screen));
}
@@
-106,4
+118,12
@@
public class AltosMapTransform {
offset_x = centre_pt.x - width / 2.0;
offset_y = centre_pt.y - height / 2.0;
}
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;
+ }
}
}