aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-07-30 22:11:32 +0200
committerAnton Tananaev <anton.tananaev@gmail.com>2014-07-30 22:11:32 +0200
commite77e0e4de5c2c424df8aa6663f986e85e1190db1 (patch)
tree5cd0b81d6e3b37dec1f334d7906069cf5b3f85f9
parent9da9e6df19799cc597a560ea360fba7966597052 (diff)
downloadtrackermap-server-e77e0e4de5c2c424df8aa6663f986e85e1190db1.tar.gz
trackermap-server-e77e0e4de5c2c424df8aa6663f986e85e1190db1.tar.bz2
trackermap-server-e77e0e4de5c2c424df8aa6663f986e85e1190db1.zip
Add battery status to OsmAnd
-rw-r--r--src/org/traccar/protocol/OsmAndProtocolDecoder.java3
-rw-r--r--test/org/traccar/protocol/OsmAndProtocolDecoderTest.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
index 560f3224f..e150275bd 100644
--- a/src/org/traccar/protocol/OsmAndProtocolDecoder.java
+++ b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
@@ -111,6 +111,9 @@ public class OsmAndProtocolDecoder extends BaseProtocolDecoder {
if (params.containsKey("hacc")) {
extendedInfo.set("hacc", params.get("hacc").get(0));
}
+ if (params.containsKey("batt")) {
+ extendedInfo.set("battery", params.get("batt").get(0));
+ }
position.setExtendedInfo(extendedInfo.toString());
diff --git a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java
index 7aed1b5ed..8ab636c05 100644
--- a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java
@@ -26,6 +26,9 @@ public class OsmAndProtocolDecoderTest {
verify(decoder.decode(null, null, new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET,
"/?lat=60.0&lon=30.0&speed=0.0&heading=0.0&vacc=0&hacc=0&altitude=0&deviceid=123456")));
+
+ verify(decoder.decode(null, null, new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET,
+ "/?id=861001000719969&lat=41.666667&lon=-0.883333&altitude=350.059479&speed=0.000000&batt=87")));
}