Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

11 files changed, 41 insertions, 12 deletions

diff --git a/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub b/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub
index c661d3e1..16966918 100755
--- a/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub
+++ b/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub
diff --git a/configure.ac b/configure.ac
index 6e02f968..7f7eec93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,13 +18,13 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.8.6.1)
+AC_INIT([altos], 1.8.7)
 ANDROID_VERSION=17
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE=2018-06-17
+RELEASE_DATE=2018-10-08
 AC_SUBST(RELEASE_DATE)
 
 VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml
index 2f8b69fb..18bc644d 100644
--- a/doc/altusmetrum-docinfo.xml
+++ b/doc/altusmetrum-docinfo.xml
@@ -48,10 +48,11 @@
   <?dbhtml filename="altusmetrum-revhistory.html"?>
   <revision>
     <revnumber>1.8.7</revnumber>
-    <date>6 Oct  2018</date>
+    <date>8 Oct  2018</date>
     <revremark>
       Include TeleMega v3.0 firmware in release. Fix TeleBT v4.0 RF
-      calibration to factory value when reflashing.
+      calibration to factory value when reflashing. Fix map images.
+      Fix Mac OS X support.
     </revremark>
   </revision>
   <revision>
diff --git a/doc/micropeak-docinfo.xml b/doc/micropeak-docinfo.xml
index f4d9eaff..6fab12b8 100644
--- a/doc/micropeak-docinfo.xml
+++ b/doc/micropeak-docinfo.xml
@@ -33,9 +33,9 @@
   <?dbhtml filename="micropeak-revhistory.html"?>
   <revision>
     <revnumber>1.8.7</revnumber>
-    <date>6 October 2018</date>
+    <date>8 October 2018</date>
     <revremark>
-      Poll for MicroPeak USB while the device dialog is open.
+      Poll for MicroPeak USB while the device dialog is open. Fix Mac OS X support.
     </revremark>
   </revision>
   <revision>
diff --git a/doc/release-notes-1.8.7.inc b/doc/release-notes-1.8.7.inc
index e6837232..f8b7b103 100644
--- a/doc/release-notes-1.8.7.inc
+++ b/doc/release-notes-1.8.7.inc
@@ -8,7 +8,7 @@
 
 	* Include TeleMega v3.0 firmware
 	
-	== AltosUI, TeleGPS
+	== AltosUI, TeleGPS, MicroPeak
 
 	* Poll for new devices while Device dialog is displayed
 
@@ -25,8 +25,13 @@
 	* Add documentation about forcing TeleMini RF parameters to
           known values.
 
-	== MicroPeak
+	* Create a proxy server for Google Maps to re-enable map
+          images
 
-	* Poll for new devices while Device dialog is displayed
+	* Fix Java version info in all distributed jar files so that
+          applications will run with standard Mac OS X Java.
+
+	* Replace JavaApplicationStub for Mac OS X so that
+          applications will run with Oracle Java.
 
 	
diff --git a/doc/telegps-docinfo.xml b/doc/telegps-docinfo.xml
index 5e347cfd..4d3533de 100644
--- a/doc/telegps-docinfo.xml
+++ b/doc/telegps-docinfo.xml
@@ -10,7 +10,7 @@
   <email>keithp@keithp.com</email>
 </author>
 <copyright>
-  <year>2015</year>
+  <year>2018</year>
   <holder>Bdale Garbee and Keith Packard</holder>
 </copyright>
 <mediaobject>
@@ -38,6 +38,14 @@
 <revhistory>
   <?dbhtml filename="telegps-revhistory.html"?>
   <revision>
+    <revnumber>1.8.7</revnumber>
+    <date>08 Oct 2018</date>
+    <revremark>
+      Fix TeleBT v4.0 RF calibration to factory value when
+      reflashing. Fix map images. Fix Mac OS X support.
+    </revremark>
+  </revision>
+  <revision>
     <revnumber>1.8.3</revnumber>
     <date>11 Dec 2017</date>
     <revremark>
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
diff --git a/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub b/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub
index c661d3e1..16966918 100755
--- a/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub
+++ b/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub
diff --git a/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub b/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub
index c661d3e1..16966918 100755
--- a/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub
+++ b/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub