aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2021-06-02 20:11:52 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2021-06-02 20:11:52 -0700
commit62d3f574104bb5196f732182faa6099207f68e9e (patch)
treeca27021740e662e72bc8e101785159f8220aef29 /src/main
parent0d491bc058de127bbcc8c014fe9a18e89544f1bb (diff)
downloadtrackermap-server-62d3f574104bb5196f732182faa6099207f68e9e.tar.gz
trackermap-server-62d3f574104bb5196f732182faa6099207f68e9e.tar.bz2
trackermap-server-62d3f574104bb5196f732182faa6099207f68e9e.zip
Add Portman protocol support
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/traccar/protocol/Tr20Protocol.java10
-rw-r--r--src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java4
2 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/protocol/Tr20Protocol.java b/src/main/java/org/traccar/protocol/Tr20Protocol.java
index 3eee9d9c3..1b71db03f 100644
--- a/src/main/java/org/traccar/protocol/Tr20Protocol.java
+++ b/src/main/java/org/traccar/protocol/Tr20Protocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2021 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.
@@ -34,6 +34,14 @@ public class Tr20Protocol extends BaseProtocol {
pipeline.addLast(new Tr20ProtocolDecoder(Tr20Protocol.this));
}
});
+ addServer(new TrackerServer(true, getName()) {
+ @Override
+ protected void addProtocolHandlers(PipelineBuilder pipeline) {
+ pipeline.addLast(new StringEncoder());
+ pipeline.addLast(new StringDecoder());
+ pipeline.addLast(new Tr20ProtocolDecoder(Tr20Protocol.this));
+ }
+ });
}
}
diff --git a/src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java
index c2e6c381f..2f11bd152 100644
--- a/src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 2021 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.
@@ -52,7 +52,7 @@ public class Tr20ProtocolDecoder extends BaseProtocolDecoder {
.number("(ddd)(dd.d+),") // longitude
.number("(d+),") // speed
.number("(d+),") // course
- .number("(?:NA|[FC]?(-?d+)),") // temperature
+ .number("(?:NA|[FC]?(-?d+)[^,]*),") // temperature
.number("(x{8}),") // status
.number("(d+)") // event
.any()