From 9375c006af7a16a4164073b1175aed209cf5fff4 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Mon, 7 Mar 2011 20:17:01 +0100
Subject: [PATCH] location requesting, take 2

---
 res/values/arrays.xml   | 11 ++++++
 res/values/strings.xml  |  7 ++++
 res/xml/preferences.xml | 12 ++++---
 src/AprsService.scala   | 78 ++++++++++++++++++++++-------------------
 4 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index efc5bb8..dc85b3e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -13,6 +13,17 @@
 		<item>afsk</item>
 	</string-array>
 
+	<string-array name="p_gps_e">
+		<item>@string/p_gps_always</item>
+		<item>@string/p_gps_med</item>
+		<item>@string/p_gps_low</item>
+	</string-array>
+	<string-array name="p_gps_ev">
+		<item>always</item>
+		<item>med</item>
+		<item>low</item>
+	</string-array>
+
 	<string-array name="p_ssid_ev">
 		<item></item> <item>1</item> <item>2</item> <item>3</item>
 		<item>4</item> <item>5</item> <item>6</item> <item>7</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e370acf..e6e6c6b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -129,6 +129,13 @@
 <string name="p_speedbrg_summary">Keep GPS on longer to get more precise data</string>
 <string name="p_netloc">Use network location</string>
 <string name="p_netloc_summary">Acquire position from the cellular network</string>
+<string name="p_gps">GPS Precision</string>
+<string name="p_gps_summary">Battery usage vs. position quality</string>
+<string name="p_gps_entry">Please set the GPS Precision</string>
+<!-- array of GPS precisions -->
+<string name="p_gps_always">High (Always on)</string>
+<string name="p_gps_med">Medium</string>
+<string name="p_gps_low">Low</string>
 
 <!-- AFSK settings -->
 <string name="p_aprs_path">APRS digi path</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 5dd755f..8be1cda 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -73,10 +73,14 @@
 		android:summary="@string/p_distance_summary"
 		android:dialogTitle="@string/p_distance_entry" />
 
-        <CheckBoxPreference
-                android:key="speedbrg"
-		android:title="@string/p_speedbrg"
-		android:summary="@string/p_speedbrg_summary" />
+        <ListPreference
+                android:key="gps_activation"
+		android:title="@string/p_gps"
+		android:summary="@string/p_gps_summary"
+                android:entries="@array/p_gps_e"
+                android:entryValues="@array/p_gps_ev"
+		android:defaultValue="med"
+		android:dialogTitle="@string/p_gps_entry" />
 
         <CheckBoxPreference
                 android:key="netloc"
diff --git a/src/AprsService.scala b/src/AprsService.scala
index 4b0b4cf..721740d 100644
--- a/src/AprsService.scala
+++ b/src/AprsService.scala
@@ -17,6 +17,8 @@ object AprsService {
 	val STATUS = PACKAGE + ".STATUS"
 	val PACKET = PACKAGE + ".PACKET"
 
+	val FAST_LANE_ACT = 30000
+
 	def intent(ctx : Context, action : String) : Intent = {
 		new Intent(action, null, ctx, classOf[AprsService])
 	}
@@ -46,7 +48,7 @@ class AprsService extends Service with LocationListener {
 
 	var singleShot = false
 	var lastLoc : Location = null
-	var awaitingSpdCourse : Location = null
+	var fastLaneLoc : Location = null
 
 	override def onStart(i : Intent, startId : Int) {
 		Log.d(TAG, "onStart: " + i + ", " + startId);
@@ -61,15 +63,20 @@ class AprsService extends Service with LocationListener {
 	}
 
 	def requestLocations(stay_on : Boolean) {
-		if (stay_on) {
+		// get update interval and distance
+		val upd_int = prefs.getStringInt("interval", 10)
+		val upd_dist = prefs.getStringInt("distance", 10)
+		val gps_act = prefs.getString("gps_activation", "med")
+		if (stay_on || (gps_act == "always")) {
 			locMan.requestLocationUpdates(LocationManager.GPS_PROVIDER,
 				0, 0, this)
 		} else {
-			// get update interval and distance
-			val upd_int = prefs.getStringInt("interval", 10)
-			val upd_dist = prefs.getStringInt("distance", 10)
-
+			// for GPS precision == medium, we use getGpsInterval()
 			locMan.requestLocationUpdates(LocationManager.GPS_PROVIDER,
+				upd_int * 60000 - getGpsInterval(), upd_dist * 1000, this)
+		}
+		if (prefs.getBoolean("netloc", false)) {
+			locMan.requestLocationUpdates(LocationManager.NETWORK_PROVIDER,
 				upd_int * 60000, upd_dist * 1000, this)
 		}
 	}
@@ -83,7 +90,7 @@ class AprsService extends Service with LocationListener {
 
 		// display notification (even though we are not actually started yet,
 		// but we need this to prevent error message reordering)
-		awaitingSpdCourse = null
+		fastLaneLoc = null
 		if (i.getAction() == SERVICE_ONCE) {
 			lastLoc = null // for singleshot mode, ignore last post
 			singleShot = true
@@ -94,11 +101,8 @@ class AprsService extends Service with LocationListener {
 		// the poster needs to be running before location updates come in
 		startPoster()
 
-		if (prefs.getBoolean("netloc", false)) {
-			locMan.requestLocationUpdates(LocationManager.NETWORK_PROVIDER,
-				upd_int * 60000, upd_dist * 1000, this)
-		}
-		requestLocations(prefs.getString("gps_activation", "") == "always")
+		// continuous GPS tracking for single shot mode
+		requestLocations(singleShot)
 
 		val callssid = AprsPacket.formatCallSsid(prefs.getCallsign(), prefs.getString("ssid", ""))
 		val message = "%s: %d min, %d km".format(callssid, upd_int, upd_dist)
@@ -130,55 +134,57 @@ class AprsService extends Service with LocationListener {
 		running = false
 	}
 
-	def speedBearingStart() {
+	def getGpsInterval() : Int = {
+		val gps_act = prefs.getString("gps_activation", "med")
+		if (gps_act == "med") FAST_LANE_ACT
+				else  0
+	}
+
+	def startFastLane() {
 		Log.d(TAG, "switching to fast lane");
 		// request fast update rate
 		locMan.removeUpdates(this);
 		requestLocations(true)
-		handler.postDelayed({ speedBearingEnd(true) }, 30000)
+		handler.postDelayed({ stopFastLane(true) }, FAST_LANE_ACT)
 	}
 
-	def speedBearingEnd(post : Boolean) {
+	def stopFastLane(post : Boolean) {
 		if (!running)
 			return;
 		Log.d(TAG, "switching to slow lane");
-		if (post && awaitingSpdCourse != null) {
-			Log.d(TAG, "speedBearingEnd: posting " + awaitingSpdCourse);
-			postLocation(awaitingSpdCourse)
+		if (post && fastLaneLoc != null) {
+			Log.d(TAG, "stopFastLane: posting " + fastLaneLoc);
+			postLocation(fastLaneLoc)
 		}
-		awaitingSpdCourse = null
+		fastLaneLoc = null
 		// reset update speed
 		locMan.removeUpdates(this);
-		requestLocations(prefs.getString("gps_activation", "") == "always")
+		requestLocations(false)
 	}
 
-	def checkSpeedBearing(location : Location) : Boolean = {
-		val hasSpdBrg = (location.hasBearing && location.hasSpeed)
-		if (!hasSpdBrg) {
-			if (awaitingSpdCourse == null)
-				speedBearingStart()
-			awaitingSpdCourse = location
-			return false
-		} else if (awaitingSpdCourse != null && hasSpdBrg) {
-			speedBearingEnd(false)
-		}
-		true
+	def goingFastLane(location : Location) : Boolean = {
+		if (fastLaneLoc == null)
+			startFastLane()
+		fastLaneLoc = location
+		return true
 	}
 
 	// LocationListener interface
 	override def onLocationChanged(location : Location) {
 		val upd_int = prefs.getStringInt("interval", 10) * 60000
 		val upd_dist = prefs.getStringInt("distance", 10) * 1000
+		Log.d(TAG, "onLocationChanged: n=" + location)
+		Log.d(TAG, "onLocationChanged: l=" + lastLoc)
 		if (lastLoc != null &&
-		    (location.getTime - lastLoc.getTime < upd_int ||
+		    (location.getTime - lastLoc.getTime < (upd_int  - getGpsInterval()) ||
 		     location.distanceTo(lastLoc) < upd_dist)) {
 			Log.d(TAG, "onLocationChanged: ignoring premature location")
 			return
 		}
-		// check if we have speed and course
-		val speedbrg = prefs.getBoolean("speedbrg", false)
-		if (speedbrg && location.getProvider == LocationManager.GPS_PROVIDER) {
-			if (!checkSpeedBearing(location))
+		// check if we need to go fast lane
+		val gps_act = prefs.getString("gps_activation", "med")
+		if (gps_act == "med" && location.getProvider == LocationManager.GPS_PROVIDER) {
+			if (goingFastLane(location))
 				return
 		}
 		postLocation(location)