From 297eb795b24ec31f6599f48bc8c3769557a7ec6f Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 5 Aug 2018 12:32:42 +0800 Subject: Bump java lib versions to 13 Signed-off-by: Keith Packard --- altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java index 2a728cf7..d62bf252 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java @@ -21,7 +21,7 @@ package org.altusmetrum.AltosDroid; import java.util.*; import java.io.*; -import org.altusmetrum.altoslib_12.*; +import org.altusmetrum.altoslib_13.*; import android.app.Activity; import android.graphics.*; -- cgit v1.2.3 From fab890328d4e1151932621a317226bc291b853da Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 6 Oct 2018 21:30:03 -0700 Subject: altosdroid: Fix offline map messages to match new meanings forbidden means outside of launch area. Signed-off-by: Keith Packard --- altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java index d62bf252..39392ff3 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java @@ -160,11 +160,10 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal message = "Internal error"; break; case AltosMapTile.failed: - message = "Network error, check connection"; + message = "Network error"; break; case AltosMapTile.forbidden: - message = "Too many requests, try later"; - AltosDebug.debug("Forbidden map response %d\n", AltosMapStore.forbidden_response); + message = "Outside of launch area"; break; } if (message != null) { -- cgit v1.2.3 From 7eb475a9694327809b7ab5a9f419d00e0819a47d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 6 Oct 2018 23:25:50 -0700 Subject: altosdroid: Set offline map scale to 1 Offline maps only supports scale 1 now. Signed-off-by: Keith Packard --- altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java index 39392ff3..826a7627 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java @@ -86,7 +86,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal AltosMap map; AltosDroid altos_droid; - static int scale = 2; + static int scale = 1; AltosLatLon here; AltosLatLon there; -- cgit v1.2.3 From 1b53a54b032c21b6e8ffb085aa56b9ffdff53d7e Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 7 Oct 2018 13:12:56 -0700 Subject: altosui/altosdroid: Change message in forbidden map tiles These are outside of *known* launch areas. Signed-off-by: Keith Packard --- altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java | 2 +- altosuilib/AltosUIMap.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java index 826a7627..1aebcd36 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java @@ -163,7 +163,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal message = "Network error"; break; case AltosMapTile.forbidden: - message = "Outside of launch area"; + message = "Outside of known launch areas"; break; } if (message != null) { diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java index 7b9459a1..b375e168 100644 --- a/altosuilib/AltosUIMap.java +++ b/altosuilib/AltosUIMap.java @@ -281,7 +281,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM message = "Network error"; break; case AltosMapTile.forbidden: - message = "Outside of launch area"; + message = "Outside of known launch areas"; break; } if (message != null && tile_font != null) { -- cgit v1.2.3