X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMapTransform.java;h=384c1744bc0131eebaef87007f4c9d9cf6d9636a;hp=f5fc5ebe597531953d0a41413381198d558452a3;hb=00aca369c4070901e0400f291d5f269b5fb8015c;hpb=6ca2c42061b3c0160bf0137c9cd65989c522b826

diff --git a/altoslib/AltosMapTransform.java b/altoslib/AltosMapTransform.java
index f5fc5ebe..384c1744 100644
--- a/altoslib/AltosMapTransform.java
+++ b/altoslib/AltosMapTransform.java
@@ -39,10 +39,18 @@ public class AltosMapTransform {
 		return new AltosLatLon(lat,lon);
 	}
 
+	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 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));
 	}
@@ -71,12 +79,12 @@ 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));