diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-09-04 21:07:33 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-04 21:07:33 +1200 |
| commit | 6aca189651d8587b9178a38c1830a8cbd8ae0d46 (patch) | |
| tree | e9a94c5886b66310ea5cbab5ca8ee35d70d7543e | |
| parent | c5e5757e5911c08c12f35f0fe2791c710aa0a2a1 (diff) | |
| parent | d8166cc1b1db9fca92b801804831dc8c20ab7415 (diff) | |
| download | trackermap-server-6aca189651d8587b9178a38c1830a8cbd8ae0d46.tar.gz trackermap-server-6aca189651d8587b9178a38c1830a8cbd8ae0d46.tar.bz2 trackermap-server-6aca189651d8587b9178a38c1830a8cbd8ae0d46.zip | |
Merge pull request #2283 from dough29/master
Adding location parameter to OsmAnd protocol
| -rw-r--r-- | src/org/traccar/protocol/OsmAndProtocolDecoder.java | 5 | ||||
| -rw-r--r-- | test/org/traccar/protocol/OsmAndProtocolDecoderTest.java | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/org/traccar/protocol/OsmAndProtocolDecoder.java index c5884a4d0..eddfb592c 100644 --- a/src/org/traccar/protocol/OsmAndProtocolDecoder.java +++ b/src/org/traccar/protocol/OsmAndProtocolDecoder.java @@ -104,6 +104,11 @@ public class OsmAndProtocolDecoder extends BaseProtocolDecoder { case "lon": position.setLongitude(Double.parseDouble(value)); break; + case "location": + String[] location = value.split(","); + position.setLatitude(Double.parseDouble(location[0])); + position.setLongitude(Double.parseDouble(location[1])); + break; case "speed": position.setSpeed(Double.parseDouble(value)); break; diff --git a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java index 6ec885058..1dc89b251 100644 --- a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java +++ b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java @@ -34,6 +34,9 @@ public class OsmAndProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, request( "/?id=861001000719969&lat=41.666667&lon=-0.883333&altitude=350.059479&speed=0.000000&batt=87")); + verifyPosition(decoder, request( + "/?id=123456×tamp=1377177267&location=60.0,30.0")); + } } |