aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-11-08 22:35:13 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-11-08 22:35:13 +1300
commit3fa63631e2cb0c59aa2aa490a4ed742dd7153a8b (patch)
treee157211276bbfec0d2cc77cb74f9429bdb065fac
parent4a138cb8273e6a2078c0144ae592af81f563f71f (diff)
downloadtraccar-server-3fa63631e2cb0c59aa2aa490a4ed742dd7153a8b.tar.gz
traccar-server-3fa63631e2cb0c59aa2aa490a4ed742dd7153a8b.tar.bz2
traccar-server-3fa63631e2cb0c59aa2aa490a4ed742dd7153a8b.zip
Set protocol name in GoSafe decoder
-rw-r--r--src/org/traccar/protocol/GoSafeProtocolDecoder.java1
-rwxr-xr-xtools/test-integration.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/org/traccar/protocol/GoSafeProtocolDecoder.java
index a779025bf..2fb7522d3 100644
--- a/src/org/traccar/protocol/GoSafeProtocolDecoder.java
+++ b/src/org/traccar/protocol/GoSafeProtocolDecoder.java
@@ -103,6 +103,7 @@ public class GoSafeProtocolDecoder extends BaseProtocolDecoder {
private Position decodePosition(Parser parser, Date time) {
Position position = new Position();
+ position.setProtocol(getProtocolName());
position.setDeviceId(getDeviceId());
position.setTime(time);
diff --git a/tools/test-integration.py b/tools/test-integration.py
index 4a1b68a61..2a332ba7d 100755
--- a/tools/test-integration.py
+++ b/tools/test-integration.py
@@ -56,7 +56,7 @@ messages = {
'tr900' : '>123456,4,1,150626,131252,W05830.2978,S3137.2783,,00,348,18,00,003-000,0,3,11111011*3b!\r\n',
'ardi01' : '123456789012345,20141010052719,24.4736042,56.8445807,110,289,40,7,5,78,-1\r\n',
'xt013' : 'TK,123456789012345,150131090859,+53.267863,+5.767363,0,38,12,0,F,204,08,C94,336C,24,,4.09,1,,,,,,,,\r\n',
- #'gosafe' : '*GS16,123456789012345,100356130215,,SYS:G79W;V1.06;V1.0.2,GPS:A;6;N24.802700;E46.616828;0;0;684;1.35,COT:60,ADC:4.31;0.10,DTT:20000;;0;0;0;1#',
+ 'gosafe' : '*GS16,123456789012345,100356130215,,SYS:G79W;V1.06;V1.0.2,GPS:A;6;N24.802700;E46.616828;0;0;684;1.35,COT:60,ADC:4.31;0.10,DTT:20000;;0;0;0;1#',
'xirgo' : '$$123456789012345,6001,2013/01/22,15:36:18,25.80907,-80.32531,7.1,19,165.2,11,0.8,11.1,17,1,1,3.9,2##',
'mtx' : '#MTX,123456789012345,20101226,195550,41.6296399,002.3611174,000,035,000000.00,X,X,1111,000,0,0\r\n',
'aquila' : '$$SRINI_1MS,123456,1,12.963515,77.533844,150925161628,A,27,0,8,0,68,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,*43\r\n',
@@ -124,7 +124,6 @@ def get_protocols(cookie, device_id):
protocols = []
data = json.load(response)
for position in data['data']:
- print position
protocols.append(position['protocol'])
return protocols