X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=map-server%2Faltos-mapd%2FAltosMapd.java;h=29528541beaf08a3fcfe3bfc3eddeedaf5ee2e22;hb=cf3e524e50a6fae2862efb404c9918b74438e9c9;hp=b4105861049c3e648639e75d86a6e09e236d0c7a;hpb=839e3a413a60c6a61851a94cc299de701ab5c277;p=fw%2Faltos

diff --git a/map-server/altos-mapd/AltosMapd.java b/map-server/altos-mapd/AltosMapd.java
index b4105861..29528541 100644
--- a/map-server/altos-mapd/AltosMapd.java
+++ b/map-server/altos-mapd/AltosMapd.java
@@ -32,6 +32,8 @@ public class AltosMapd implements AltosLaunchSiteListener {
 
 	public final static int scale = 1;
 
+	public static int max_zoom = 17;
+
 	public static double valid_radius = 17000;	/* 17km */
 
 	public String map_dir = null;
@@ -40,7 +42,8 @@ public class AltosMapd implements AltosLaunchSiteListener {
 
 	public void usage() {
 		System.out.printf("usage: altos-mapd [--mapdir <map-directory] [--launch-sites <launch-sites-file>]\n" +
-				  "                  [--radius <valid-radius-m> [--port <port>] [--key <key-file>]\n");
+				  "                  [--radius <valid-radius-m> [--port <port>] [--key <key-file>]\n" +
+				  "                  [--max-zoom <max-zoom-level>\n");
 		System.exit(1);
 	}
 
@@ -57,7 +60,27 @@ public class AltosMapd implements AltosLaunchSiteListener {
 		}
 	}
 
-	public static boolean check_lat_lon(double lat, double lon) {
+	private static boolean west_of(double a, double b) {
+		double	diff = b - a;
+
+		while (diff >= 360.0)
+			diff -= 360.0;
+		while (diff <= -360.0)
+			diff += 360.0;
+
+		return diff >= 0;
+	}
+
+	public static boolean check_lat_lon(double lat, double lon, int zoom) {
+
+		if (zoom > max_zoom)
+			return false;
+
+		AltosMapTransform	transform = new AltosMapTransform(px_size, px_size, zoom, new AltosLatLon(lat, lon));
+
+		AltosLatLon		upper_left = transform.screen_lat_lon(new AltosPointInt(0, 0));
+		AltosLatLon		lower_right = transform.screen_lat_lon(new AltosPointInt(px_size, px_size));
+
 		synchronized (launch_sites_ready) {
 			if (launch_sites == null) {
 				try {
@@ -73,8 +96,34 @@ public class AltosMapd implements AltosLaunchSiteListener {
 		}
 
 		for (AltosLaunchSite site : launch_sites) {
+
+			/* Figure out which point in the tile to
+			 * measure to the site That's one of the edges
+			 * or the site location depend on where the
+			 * site is in relation to the tile
+			 */
+
+			double		check_lon;
+
+			if (west_of(site.longitude, upper_left.lon))
+				check_lon = upper_left.lon;
+			else if (west_of(lower_right.lon, site.longitude))
+				check_lon = lower_right.lon;
+			else
+				check_lon = site.longitude;
+
+			double		check_lat;
+
+			if (site.latitude < lower_right.lat)
+				check_lat = lower_right.lat;
+			else if (upper_left.lat < site.latitude)
+				check_lat = upper_left.lat;
+			else
+				check_lat = site.latitude;
+
 			AltosGreatCircle gc = new AltosGreatCircle(site.latitude, site.longitude,
-								   lat, lon);
+								   check_lat, check_lon);
+
 			if (gc.distance <= valid_radius)
 				return true;
 		}
@@ -114,6 +163,13 @@ public class AltosMapd implements AltosLaunchSiteListener {
 			} else if (args[i].equals("--key") && i < args.length-1) {
 				key_file = args[i+1];
 				skip = 2;
+			} else if (args[i].equals("--max-zoom") && i < args.length-1) {
+				try {
+					max_zoom = AltosParse.parse_int(args[i+1]);
+				} catch (ParseException pe) {
+					usage();
+				}
+				skip = 2;
 			} else {
 				usage();
 			}