From: Keith Packard <keithp@keithp.com>
Date: Sun, 7 Oct 2018 22:28:32 +0000 (-0600)
Subject: altos-mapd: Add --max-zoom to limit tile loading. Set default to 15.
X-Git-Tag: 1.8.7~3^2~1^2~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=746ad2c385046c77831b43291ef4335a11e5bfab

altos-mapd: Add --max-zoom to limit tile loading. Set default to 15.

This ensures that we won't end up serving huge numbers of high
resolution images.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/map-server/altos-mapd/AltosMapd.java b/map-server/altos-mapd/AltosMapd.java
index 1be1655d..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);
 	}
 
@@ -69,6 +72,10 @@ public class AltosMapd implements AltosLaunchSiteListener {
 	}
 
 	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));
@@ -156,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();
 			}
diff --git a/map-server/altos-mapd/altos-mapd-default b/map-server/altos-mapd/altos-mapd-default
index 40d283a2..1611f0b6 100644
--- a/map-server/altos-mapd/altos-mapd-default
+++ b/map-server/altos-mapd/altos-mapd-default
@@ -1,3 +1,4 @@
 MAPKEY=/home/altos-mapd/google-maps-api-key
 MAPDIR=/home/altos-mapd/maps
 LAUNCHSITES=/var/www/html/launch-sites.txt
+MAXZOOM=17
diff --git a/map-server/altos-mapd/altos-mapd.service b/map-server/altos-mapd/altos-mapd.service
index d6f01da1..ba263c2a 100644
--- a/map-server/altos-mapd/altos-mapd.service
+++ b/map-server/altos-mapd/altos-mapd.service
@@ -8,7 +8,7 @@ Type=simple
 User=altos-mapd
 Restart=always
 EnvironmentFile=/etc/default/altos-mapd-default
-ExecStart=/usr/bin/altos-mapd --key $MAPKEY --mapdir $MAPDIR --launch-sites $LAUNCHSITES
+ExecStart=/usr/bin/altos-mapd --key $MAPKEY --mapdir $MAPDIR --launch-sites $LAUNCHSITES --max-zoom $MAXZOOM
 
 [Install]
 WantedBy=multi-user.target