From 104046dc079276dc3f8e5c8530c9ba0d1228788f Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Mon, 14 Nov 2011 20:33:09 +0100 Subject: [PATCH] implemented position privacy --- libs/avrs-aprs-parser-0.10.jar | Bin 31519 -> 32401 bytes res/values/arrays.xml | 15 +++++++++++++++ res/values/strings.xml | 16 ++++++++++++++++ res/xml/preferences.xml | 29 +++++++++++++++++++++++++++++ src/AprsPacket.scala | 9 --------- src/AprsService.scala | 15 ++++++++++++++- 6 files changed, 74 insertions(+), 10 deletions(-) diff --git a/libs/avrs-aprs-parser-0.10.jar b/libs/avrs-aprs-parser-0.10.jar index f32540f970d3f4144b4505d3db177490219ca98c..a9ee8cde2ea1c6a4af05b1e3a75b874054267485 100644 GIT binary patch delta 15840 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 delta 14920 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 V{0Tsu?EgDt>rV)=;qo6B{|mj$#`ypM diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 963ab65..5b29ce4 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -37,6 +37,21 @@ low + + @string/p_ambiguity_off + @string/p_ambiguity_ddmmm + @string/p_ambiguity_ddmm + @string/p_ambiguity_ddm + @string/p_ambiguity_dd + + + 0 + 4 + 3 + 2 + 1 + + 1 2 3 4 5 6 7 diff --git a/res/values/strings.xml b/res/values/strings.xml index 00d49f2..7e1e683 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -184,6 +184,22 @@ Longitude Use last GPS position + + +Position privacy +Position ambiguity and more +Position Ambiguity +Reduced precision for own position reports +Off (DD° MM.mm\') +1 (DD° MM.m\') +2 (DD° MM\') +3 (DD° Mx\') +4 (DD°) +Send Speed & Bearing +Include speed and bearing in position reports +Send Altitude +Include altitude in position reports + Server APRS-IS server (port 8080) to send beacons diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 7f36595..8876ffe 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -73,6 +73,35 @@ android:targetClass="org.aprsdroid.app.LocationPrefs" /> + + + + + + + + +