projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/micropeak-v2.0: Functionally complete.
[fw/altos]
/
altoslib
/
AltosMapTransform.java
diff --git
a/altoslib/AltosMapTransform.java
b/altoslib/AltosMapTransform.java
index b6d4f4356af8166b4dd3322092aaa2ce9682dd39..ba9d1ae46121ca5ce72895562dd13ec736e88a38 100644
(file)
--- a/
altoslib/AltosMapTransform.java
+++ b/
altoslib/AltosMapTransform.java
@@
-16,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_1
2
;
+package org.altusmetrum.altoslib_1
4
;
import java.io.*;
import java.lang.Math;
import java.io.*;
import java.lang.Math;
@@
-67,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 );
@@
-82,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);
}
@@
-102,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() {