aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornativbarak <nativ@globekeeper.com>2018-04-29 13:01:42 +0300
committernativbarak <nativ@globekeeper.com>2018-04-29 13:01:42 +0300
commitd4fb7c70ffdba90e11914cb25a38955f0d50fd42 (patch)
tree9944a3ec9890f26094c79ebd130d53b8853889b3
parent8ca988c3381b10eeb0939b05ba1cc3e49c7cc8ed (diff)
downloadtrackermap-server-d4fb7c70ffdba90e11914cb25a38955f0d50fd42.tar.gz
trackermap-server-d4fb7c70ffdba90e11914cb25a38955f0d50fd42.tar.bz2
trackermap-server-d4fb7c70ffdba90e11914cb25a38955f0d50fd42.zip
Fixed camel case and added neccasery info
-rw-r--r--src/org/traccar/protocol/AustinNbProtocol.java (renamed from src/org/traccar/protocol/AustinNBProtocol.java)6
-rw-r--r--src/org/traccar/protocol/AustinNbProtocolDecoder.java (renamed from src/org/traccar/protocol/AustinNBProtocolDecoder.java)17
-rw-r--r--test/org/traccar/protocol/AustinNbProtocolDecoderTest.java (renamed from test/org/traccar/protocol/AustinProtocolDecoderTest.java)4
3 files changed, 19 insertions, 8 deletions
diff --git a/src/org/traccar/protocol/AustinNBProtocol.java b/src/org/traccar/protocol/AustinNbProtocol.java
index c250e9b3d..7f6739495 100644
--- a/src/org/traccar/protocol/AustinNBProtocol.java
+++ b/src/org/traccar/protocol/AustinNbProtocol.java
@@ -24,9 +24,9 @@ import org.traccar.TrackerServer;
import java.util.List;
-public class AustinNBProtocol extends BaseProtocol {
+public class AustinNbProtocol extends BaseProtocol {
- public AustinNBProtocol() {
+ public AustinNbProtocol() {
super("austinnb");
}
@@ -37,7 +37,7 @@ public class AustinNBProtocol extends BaseProtocol {
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
- pipeline.addLast("objectDecoder", new AustinNBProtocolDecoder(AustinNBProtocol.this));
+ pipeline.addLast("objectDecoder", new AustinNbProtocolDecoder(AustinNbProtocol.this));
}
});
}
diff --git a/src/org/traccar/protocol/AustinNBProtocolDecoder.java b/src/org/traccar/protocol/AustinNbProtocolDecoder.java
index 4c37ac9a2..df1a93102 100644
--- a/src/org/traccar/protocol/AustinNBProtocolDecoder.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 AustinNBProtocolDecoder extends BaseProtocolDecoder {
+public class AustinNbProtocolDecoder extends BaseProtocolDecoder {
- public AustinNBProtocolDecoder(AustinNBProtocol protocol) {
+ public AustinNbProtocolDecoder(AustinNbProtocol protocol) {
super(protocol);
}
@@ -37,6 +38,11 @@ public class AustinNBProtocolDecoder 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 AustinNBProtocolDecoder 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.setLatitude(Double.parseDouble(parser.next().replace(',', '.')));
position.setLongitude(Double.parseDouble(parser.next().replace(',', '.')));
+ position.set("azimuth", parser.nextInt());
+ position.set("angle", parser.nextInt());
+ position.set("range", parser.nextInt());
+ position.set("out_of_range", parser.nextInt());
+ position.set("currier", parser.next());
return position;
}
diff --git a/test/org/traccar/protocol/AustinProtocolDecoderTest.java b/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java
index 6d59357fb..30291bd2f 100644
--- a/test/org/traccar/protocol/AustinProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java
@@ -3,12 +3,12 @@ package org.traccar.protocol;
import org.junit.Test;
import org.traccar.ProtocolTest;
-public class AustinNBProtocolDecoderTest extends ProtocolTest {
+public class AustinNbProtocolDecoderTest extends ProtocolTest {
@Test
public void testDecode() throws Exception {
- AustinNBProtocolDecoder decoder = new AustinNBProtocolDecoder(new AustinNBProtocol());
+ AustinNbProtocolDecoder decoder = new AustinNbProtocolDecoder(new AustinNbProtocol());
verifyPosition(decoder, text(
"48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1"));