aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-05-11 17:16:21 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2019-05-11 17:16:21 -0700
commit7ea54b294e59f7a47fea34496de4c053a586a14a (patch)
tree37ceb176fbecf8d37d59b1a60499717976b52732 /src/main/java/org
parent9256a86c91349f63759c7e7d14eaaf56abd567f3 (diff)
downloadtraccar-server-7ea54b294e59f7a47fea34496de4c053a586a14a.tar.gz
traccar-server-7ea54b294e59f7a47fea34496de4c053a586a14a.tar.bz2
traccar-server-7ea54b294e59f7a47fea34496de4c053a586a14a.zip
Add ITS protocol commands
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/traccar/protocol/ItsProtocol.java6
-rw-r--r--src/main/java/org/traccar/protocol/ItsProtocolDecoder.java6
-rw-r--r--src/main/java/org/traccar/protocol/ItsProtocolEncoder.java36
3 files changed, 44 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/protocol/ItsProtocol.java b/src/main/java/org/traccar/protocol/ItsProtocol.java
index e074f9277..45df3da11 100644
--- a/src/main/java/org/traccar/protocol/ItsProtocol.java
+++ b/src/main/java/org/traccar/protocol/ItsProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 - 2019 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,10 +20,14 @@ import io.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.PipelineBuilder;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
public class ItsProtocol extends BaseProtocol {
public ItsProtocol() {
+ setSupportedDataCommands(
+ Command.TYPE_ENGINE_STOP,
+ Command.TYPE_ENGINE_RESUME);
addServer(new TrackerServer(false, getName()) {
@Override
protected void addProtocolHandlers(PipelineBuilder pipeline) {
diff --git a/src/main/java/org/traccar/protocol/ItsProtocolDecoder.java b/src/main/java/org/traccar/protocol/ItsProtocolDecoder.java
index 313575f27..8c1b9b480 100644
--- a/src/main/java/org/traccar/protocol/ItsProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/ItsProtocolDecoder.java
@@ -54,11 +54,11 @@ public class ItsProtocolDecoder extends BaseProtocolDecoder {
.expression("(..),") // status
.or()
.expression("[^,]*,") // vehicle registration
- .number("([01]),") // valid
+ .number("([01]),").optional() // valid
.groupEnd()
.number("(dd),?(dd),?(dddd),") // date (ddmmyyyy)
.number("(dd),?(dd),?(dd),") // time (hhmmss)
- .expression("([AV]),").optional() // valid
+ .expression("([01AV]),").optional() // valid
.number("(d+.d+),([NS]),") // latitude
.number("(d+.d+),([EW]),") // longitude
.groupBegin()
@@ -176,7 +176,7 @@ public class ItsProtocolDecoder extends BaseProtocolDecoder {
}
position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
if (parser.hasNext()) {
- position.setValid(parser.next().equals("A"));
+ position.setValid(parser.next().matches("[1A]"));
}
position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
diff --git a/src/main/java/org/traccar/protocol/ItsProtocolEncoder.java b/src/main/java/org/traccar/protocol/ItsProtocolEncoder.java
new file mode 100644
index 000000000..ebbbd87cd
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/ItsProtocolEncoder.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.traccar.StringProtocolEncoder;
+import org.traccar.model.Command;
+
+public class ItsProtocolEncoder extends StringProtocolEncoder {
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ switch (command.getType()) {
+ case Command.TYPE_ENGINE_STOP:
+ return "@SET#RLP,OP1,";
+ case Command.TYPE_ENGINE_RESUME:
+ return "@CLR#RLP,OP1,";
+ default:
+ return null;
+ }
+ }
+
+}