projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Set idle mode frequency before starting link
[fw/altos]
/
altoslib
/
AltosMapTransform.java
diff --git
a/altoslib/AltosMapTransform.java
b/altoslib/AltosMapTransform.java
index b8f2910760baa6f22d09840ad80739d52e562cd6..9eac2654220150ac29ea114bf04b23015b41e45a 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_
8
;
+package org.altusmetrum.altoslib_
13
;
import java.io.*;
import java.lang.Math;
import java.io.*;
import java.lang.Math;
@@
-66,13
+67,13
@@
public class AltosMapTransform {
return lat_lon(screen_point(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;
double x, y;
double e;
- x = l
at_lon.l
on * 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 );
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);
}
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);
}
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));
}
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() {
private boolean has_location;
public boolean has_location() {