aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-05-02 09:35:00 +1200
committerGitHub <noreply@github.com>2018-05-02 09:35:00 +1200
commit3e821e797fb7a04dacc83ae70afd2314a6a9de08 (patch)
tree06368b9bccf983c28d1a5028e405b1f40836884b
parent5de1dbcff3268949463c3f811c77ff51bbe80ede (diff)
parent1b2bcab081d4e0a856a20cf1de3264047fcfccc1 (diff)
downloadtraccar-server-3e821e797fb7a04dacc83ae70afd2314a6a9de08.tar.gz
traccar-server-3e821e797fb7a04dacc83ae70afd2314a6a9de08.tar.bz2
traccar-server-3e821e797fb7a04dacc83ae70afd2314a6a9de08.zip
Merge pull request #3843 from NateZ7/master
Fixed wrong order of input and changed name of protocol
-rw-r--r--setup/default.xml2
-rw-r--r--src/org/traccar/protocol/AustinNbProtocol.java (renamed from src/org/traccar/protocol/GlobeKeeperProtocol.java)8
-rw-r--r--src/org/traccar/protocol/AustinNbProtocolDecoder.java (renamed from src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java)19
-rw-r--r--test/org/traccar/protocol/AustinNbProtocolDecoderTest.java (renamed from test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java)16
4 files changed, 28 insertions, 17 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 6fdfb2a95..9b05fa85f 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -232,7 +232,7 @@
<entry key='t57.port'>5155</entry>
<entry key='spot.port'>5156</entry>
<entry key='m2c.port'>5157</entry>
- <entry key='globekeeper.port'>5158</entry>
+ <entry key='austinnb.port'>5158</entry>
<entry key='opengts.port'>5159</entry>
<entry key='cautela.port'>5160</entry>
<entry key='continental.port'>5161</entry>
diff --git a/src/org/traccar/protocol/GlobeKeeperProtocol.java b/src/org/traccar/protocol/AustinNbProtocol.java
index 9231c067c..7f6739495 100644
--- a/src/org/traccar/protocol/GlobeKeeperProtocol.java
+++ b/src/org/traccar/protocol/AustinNbProtocol.java
@@ -24,10 +24,10 @@ import org.traccar.TrackerServer;
import java.util.List;
-public class GlobeKeeperProtocol extends BaseProtocol {
+public class AustinNbProtocol extends BaseProtocol {
- public GlobeKeeperProtocol() {
- super("globekeeper");
+ public AustinNbProtocol() {
+ super("austinnb");
}
@Override
@@ -37,7 +37,7 @@ public class GlobeKeeperProtocol extends BaseProtocol {
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
- pipeline.addLast("objectDecoder", new GlobeKeeperProtocolDecoder(GlobeKeeperProtocol.this));
+ pipeline.addLast("objectDecoder", new AustinNbProtocolDecoder(AustinNbProtocol.this));
}
});
}
diff --git a/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java b/src/org/traccar/protocol/AustinNbProtocolDecoder.java
index c4daf4409..c8f4baf78 100644
--- a/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java
+++ b/src/org/traccar/protocol/AustinNbProtocolDecoder.java
@@ -23,11 +23,12 @@ import org.traccar.helper.PatternBuilder;
import org.traccar.model.Position;
import java.net.SocketAddress;
+import java.util.TimeZone;
import java.util.regex.Pattern;
-public class GlobeKeeperProtocolDecoder extends BaseProtocolDecoder {
+public class AustinNbProtocolDecoder extends BaseProtocolDecoder {
- public GlobeKeeperProtocolDecoder(GlobeKeeperProtocol protocol) {
+ public AustinNbProtocolDecoder(AustinNbProtocol protocol) {
super(protocol);
}
@@ -37,6 +38,11 @@ public class GlobeKeeperProtocolDecoder extends BaseProtocolDecoder {
.number("(dd):(dd):(dd);") // time
.number("(-?d+,d+);") // latitude
.number("(-?d+,d+);") // longitude
+ .number("(d+);") // azimuth
+ .number("(d+);") // angle
+ .number("(d+);") // range
+ .number("(d+);") // out of range
+ .expression("(.*)") // operator
.any()
.compile();
@@ -57,11 +63,16 @@ public class GlobeKeeperProtocolDecoder extends BaseProtocolDecoder {
Position position = new Position(getProtocolName());
position.setDeviceId(deviceSession.getDeviceId());
- position.setTime(parser.nextDateTime());
+ position.setTime(parser.nextDateTime(Parser.DateTimeFormat.YMD_HMS, TimeZone.getDefault().getID()));
position.setValid(true);
- position.setLongitude(Double.parseDouble(parser.next().replace(',', '.')));
position.setLatitude(Double.parseDouble(parser.next().replace(',', '.')));
+ position.setLongitude(Double.parseDouble(parser.next().replace(',', '.')));
+ position.setCourse(parser.nextInt());
+ position.set("angle", parser.nextInt());
+ position.set("range", parser.nextInt());
+ position.set("outOfRange", parser.nextInt());
+ position.set("carrier", parser.next());
return position;
}
diff --git a/test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java b/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java
index 918fd9083..9608e32a6 100644
--- a/test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java
@@ -3,30 +3,30 @@ package org.traccar.protocol;
import org.junit.Test;
import org.traccar.ProtocolTest;
-public class GlobeKeeperProtocolDecoderTest extends ProtocolTest {
+public class AustinNbProtocolDecoderTest extends ProtocolTest {
@Test
public void testDecode() throws Exception {
- GlobeKeeperProtocolDecoder decoder = new GlobeKeeperProtocolDecoder(new GlobeKeeperProtocol());
+ AustinNbProtocolDecoder decoder = new AustinNbProtocolDecoder(new AustinNbProtocol());
verifyPosition(decoder, text(
- "48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1"));
+ "48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1;ORANGE"));
verifyPosition(decoder, text(
- "48666666666;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;90;4000;0"));
+ "48666666666;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;90;4000;0;ORANGE"));
verifyPosition(decoder, text(
- "48666666666;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;90;1199;0"));
+ "48666666666;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;90;1199;0;ORANGE"));
verifyPosition(decoder, text(
- "48601601601;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;360;2292;1"));
+ "48601601601;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;360;2292;1;ORANGE"));
verifyPosition(decoder, text(
- "48601601601;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;360;4000;0"));
+ "48601601601;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;360;4000;0;ORANGE"));
verifyPosition(decoder, text(
- "48601601601;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;360;1199;0"));
+ "48601601601;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;360;1199;0;ORANGE"));
}