From 7f5cdd0aeb68104f474ad1736360df39dd174006 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 7 Oct 2018 14:26:27 -0700 Subject: doc: Note that 1.8.7 fixes map images Signed-off-by: Keith Packard --- doc/altusmetrum-docinfo.xml | 2 +- doc/release-notes-1.8.7.inc | 2 ++ doc/telegps-docinfo.xml | 10 +++++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml index 2f8b69fb..114c155c 100644 --- a/doc/altusmetrum-docinfo.xml +++ b/doc/altusmetrum-docinfo.xml @@ -51,7 +51,7 @@ 6 Oct 2018 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. diff --git a/doc/release-notes-1.8.7.inc b/doc/release-notes-1.8.7.inc index e6837232..19d9c29b 100644 --- a/doc/release-notes-1.8.7.inc +++ b/doc/release-notes-1.8.7.inc @@ -25,6 +25,8 @@ * Add documentation about forcing TeleMini RF parameters to known values. + * Create a proxy server for Google Maps to re-enable map images + == MicroPeak * Poll for new devices while Device dialog is displayed diff --git a/doc/telegps-docinfo.xml b/doc/telegps-docinfo.xml index 5e347cfd..68a1d2d8 100644 --- a/doc/telegps-docinfo.xml +++ b/doc/telegps-docinfo.xml @@ -10,7 +10,7 @@ keithp@keithp.com - 2015 + 2018 Bdale Garbee and Keith Packard @@ -37,6 +37,14 @@ + + 1.8.7 + 07 Oct 2018 + + Fix TeleBT v4.0 RF calibration to factory value when + reflashing. Fix map images. + + 1.8.3 11 Dec 2017 -- cgit v1.2.3 From 746ad2c385046c77831b43291ef4335a11e5bfab Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 7 Oct 2018 16:28:32 -0600 Subject: 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 --- map-server/altos-mapd/AltosMapd.java | 16 +++++++++++++++- map-server/altos-mapd/altos-mapd-default | 1 + map-server/altos-mapd/altos-mapd.service | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) 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 ]\n" + - " [--radius [--port ] [--key ]\n"); + " [--radius [--port ] [--key ]\n" + + " [--max-zoom \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 -- cgit v1.2.3 From cd75ca767b616900d7df4596907f4f5b00517ad4 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 7 Oct 2018 23:25:25 -0700 Subject: Switch to universal JavaApplicationStub for Mac OS X The binary JavaApplicationStub only supports Mac JRE 6, even if you install a later JRE from Oracle it will still run our apps with the Mac version. This replacement JavaApplicationStub is a shell script which comes from here: https://github.com/tofi86/universalJavaApplicationStub I've tested it with Oracle JRE 10 installed and AltosUI came up fine, and has access to our devices and networking. Signed-off-by: Keith Packard --- .../AltosUI.app/Contents/MacOS/JavaApplicationStub | Bin 61296 -> 31253 bytes .../Contents/MacOS/JavaApplicationStub | Bin 61296 -> 31253 bytes .../TeleGPS.app/Contents/MacOS/JavaApplicationStub | Bin 61296 -> 31253 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub b/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub index c661d3e1..16966918 100755 Binary files a/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub and b/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub differ diff --git a/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub b/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub index c661d3e1..16966918 100755 Binary files a/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub and b/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub differ diff --git a/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub b/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub index c661d3e1..16966918 100755 Binary files a/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub and b/telegps/TeleGPS.app/Contents/MacOS/JavaApplicationStub differ -- cgit v1.2.3 From 625981b96e99a5dbec8180016d5e2c291378a21f Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 7 Oct 2018 23:31:04 -0700 Subject: doc: Note fixes for Mac OS X Signed-off-by: Keith Packard --- doc/altusmetrum-docinfo.xml | 3 ++- doc/micropeak-docinfo.xml | 4 ++-- doc/release-notes-1.8.7.inc | 11 +++++++---- doc/telegps-docinfo.xml | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml index 114c155c..18bc644d 100644 --- a/doc/altusmetrum-docinfo.xml +++ b/doc/altusmetrum-docinfo.xml @@ -48,10 +48,11 @@ 1.8.7 - 6 Oct 2018 + 8 Oct 2018 Include TeleMega v3.0 firmware in release. Fix TeleBT v4.0 RF calibration to factory value when reflashing. Fix map images. + Fix Mac OS X support. 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 @@ 1.8.7 - 6 October 2018 + 8 October 2018 - 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. diff --git a/doc/release-notes-1.8.7.inc b/doc/release-notes-1.8.7.inc index 19d9c29b..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,10 +25,13 @@ * Add documentation about forcing TeleMini RF parameters to known values. - * Create a proxy server for Google Maps to re-enable map images + * Create a proxy server for Google Maps to re-enable map + images - == MicroPeak + * Fix Java version info in all distributed jar files so that + applications will run with standard Mac OS X Java. - * Poll for new devices while Device dialog is displayed + * 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 68a1d2d8..4d3533de 100644 --- a/doc/telegps-docinfo.xml +++ b/doc/telegps-docinfo.xml @@ -39,10 +39,10 @@ 1.8.7 - 07 Oct 2018 + 08 Oct 2018 Fix TeleBT v4.0 RF calibration to factory value when - reflashing. Fix map images. + reflashing. Fix map images. Fix Mac OS X support. -- cgit v1.2.3 From 03680c55ae8394056ed27839e64356d8df375537 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 7 Oct 2018 23:31:53 -0700 Subject: Set version to 1.8.7 Signed-off-by: Keith Packard --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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'` -- cgit v1.2.3