aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup/default.xml2
-rw-r--r--src/org/traccar/model/Position.java7
-rw-r--r--src/org/traccar/protocol/LaipacSFKamelProtocol.java47
-rw-r--r--src/org/traccar/protocol/LaipacSFKamelProtocolDecoder.java168
-rw-r--r--src/org/traccar/protocol/OsmAndProtocolDecoder.java3
-rw-r--r--test/org/traccar/protocol/LaipacSFKamelProtocolDecoderTest.java35
-rw-r--r--tools/translate.py35
7 files changed, 293 insertions, 4 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 68465011e..59ff2d460 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -231,5 +231,5 @@
<entry key='opengts.port'>5159</entry>
<entry key='cautela.port'>5160</entry>
<entry key='continental'>5161</entry>
-
+ <entry key='laipacsfkamel.port'>5162</entry>
</properties>
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 49e3231c3..0e8bd9a6e 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -52,6 +52,8 @@ public class Position extends Message {
public static final String KEY_BATTERY_LEVEL = "batteryLevel"; // percentage
public static final String KEY_FUEL_LEVEL = "fuel"; // liters
public static final String KEY_FUEL_CONSUMPTION = "fuelConsumption"; // liters/hour
+ public static final String KEY_ANALOG_1 = "analog 1"; // volts
+ public static final String KEY_ANALOG_2 = "analog 2"; // volts
public static final String KEY_VERSION_FW = "versionFw";
public static final String KEY_VERSION_HW = "versionHw";
@@ -88,6 +90,10 @@ public class Position extends Message {
public static final String KEY_DRIVER_UNIQUE_ID = "driverUniqueId";
+ public static final String KEY_CELL_NET_CODE = "cellNetCode";
+ public static final String KEY_CELL_ID_CODE = "cellIdCode";
+ public static final String KEY_COUNTRY_CODE = "countryCode";
+
// Start with 1 not 0
public static final String PREFIX_TEMP = "temp";
public static final String PREFIX_ADC = "adc";
@@ -291,5 +297,4 @@ public class Position extends Message {
public String getType() {
return super.getType();
}
-
}
diff --git a/src/org/traccar/protocol/LaipacSFKamelProtocol.java b/src/org/traccar/protocol/LaipacSFKamelProtocol.java
new file mode 100644
index 000000000..5e1beabbd
--- /dev/null
+++ b/src/org/traccar/protocol/LaipacSFKamelProtocol.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 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.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class LaipacSFKamelProtocol extends BaseProtocol {
+
+ public LaipacSFKamelProtocol() {
+ super("laipacsfkamel");
+ }
+
+ @Override
+ public void initTrackerServers(List<TrackerServer> serverList) {
+ serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
+ @Override
+ protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
+ pipeline.addLast("stringEncoder", new StringEncoder());
+ pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectDecoder", new LaipacSFKamelProtocolDecoder(LaipacSFKamelProtocol.this));
+ }
+ });
+ }
+
+}
diff --git a/src/org/traccar/protocol/LaipacSFKamelProtocolDecoder.java b/src/org/traccar/protocol/LaipacSFKamelProtocolDecoder.java
new file mode 100644
index 000000000..dc169c668
--- /dev/null
+++ b/src/org/traccar/protocol/LaipacSFKamelProtocolDecoder.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2013 - 2017 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.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.helper.Checksum;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.Parser;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.util.regex.Pattern;
+
+public class LaipacSFKamelProtocolDecoder extends BaseProtocolDecoder {
+
+ public LaipacSFKamelProtocolDecoder(LaipacSFKamelProtocol protocol) {
+ super(protocol);
+ }
+
+ private static final Pattern PATTERN = new PatternBuilder()
+ .text("$AVRMC,")
+ .expression("([^,]+),") // identifier
+ .number("(dd)(dd)(dd),") // time (hhmmss)
+ .expression("([AVRPavrp]),") // validity
+ .number("(dd)(dd.d+),") // latitude
+ .expression("([NS]),")
+ .number("(ddd)(dd.d+),") // longitude
+ .number("([EW]),")
+ .number("(d+.d+),") // speed
+ .number("(d+.d+),") // course
+ .number("(dd)(dd)(dd),") // date (ddmmyy)
+ .expression("([abZXMHE86430]),") // event code
+ .number("(d+),") // battery voltage
+ .number("(d+),") // current mileage
+ .number("(d),") // GPS on/off (1 = on, 0 = off)
+ .number("(d+),") // Analog port 1
+ .number("(d+)") // Analog port 2
+ .expression(",([0-9a-fA-F]{4})") // Cell 1 - Cell Net Code
+ .expression("([0-9a-fA-F]{4}),") // Cell 1 - Cell ID Code
+ .number("(d{3})") // Cell 2 - Country Code
+ .number("(d{3})") // Cell 2 - Operator Code
+ .optional(4)
+ .text("*")
+ .number("(xx)") // checksum
+ .compile();
+
+ @Override
+ protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+ String sentence = (String) msg;
+
+ if (sentence.startsWith("$ECHK") && channel != null) {
+ channel.write(sentence + "\r\n"); // heartbeat
+ return null;
+ }
+
+ Parser parser = new Parser(PATTERN, sentence);
+ if (!parser.matches()) {
+ return null;
+ }
+
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
+ if (deviceSession == null) {
+ return null;
+ }
+
+ Position position = new Position(getProtocolName());
+ position.setDeviceId(deviceSession.getDeviceId());
+
+ DateBuilder dateBuilder = new DateBuilder()
+ .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
+
+ String status = parser.next();
+ position.setValid(status.toUpperCase().equals("A"));
+ position.set(Position.KEY_STATUS, status);
+
+ position.setLatitude(parser.nextCoordinate());
+ position.setLongitude(parser.nextCoordinate());
+ position.setSpeed(parser.nextDouble(0));
+ position.setCourse(parser.nextDouble(0));
+
+ dateBuilder.setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
+ position.setTime(dateBuilder.getDate());
+
+ String eventCode = parser.next();
+ String decodedAlarm = decodeAlarm(eventCode);
+ if (decodedAlarm != null) {
+ position.set(Position.KEY_ALARM, decodeAlarm(eventCode));
+ }
+ position.set(Position.KEY_EVENT, eventCode);
+ position.set(Position.KEY_BATTERY, parser.nextDouble() * 0.001);
+ position.set(Position.KEY_TOTAL_DISTANCE, parser.nextDouble());
+ position.set(Position.KEY_GPS, parser.nextInt());
+ position.set(Position.KEY_ANALOG_1, parser.nextDouble() * 0.001);
+ position.set(Position.KEY_ANALOG_2, parser.nextDouble() * 0.001);
+
+ String checksum = parser.next();
+ if (parser.hasNext()) {
+ position.set(Position.KEY_CELL_NET_CODE, checksum);
+ position.set(Position.KEY_CELL_ID_CODE, parser.next());
+ position.set(Position.KEY_COUNTRY_CODE, parser.next());
+ position.set(Position.KEY_OPERATOR, parser.next());
+ checksum = parser.next();
+ }
+
+
+ String result = sentence.replaceAll("^\\$(.*)\\*[0-9a-fA-F]{2}$", "$1");
+ if (checksum == null || Integer.parseInt(checksum, 16) != Checksum.xor(result))
+ {
+ return null;
+ }
+
+ if (channel != null) {
+ if (eventCode.equals("3")) {
+ channel.write("$AVCFG,00000000,d*31\r\n");
+ } else if (eventCode.equals("X") || eventCode.equals("4")) {
+ channel.write("$AVCFG,00000000,x*2D\r\n");
+ } else if (eventCode.equals("Z")) {
+ channel.write("$AVCFG,00000000,z*2F\r\n");
+ } else if (Character.isLowerCase(status.charAt(0))) {
+ String response = "$EAVACK," + eventCode + "," + checksum;
+ response += Checksum.nmea(response);
+ response += "\r\n";
+ channel.write(response);
+ }
+ }
+
+ return position;
+ }
+
+ private String decodeAlarm(String event) {
+ if (event.equals('Z')) {
+ return Position.ALARM_LOW_BATTERY;
+ } else if (event.equals('X')) {
+ return Position.ALARM_GEOFENCE_ENTER;
+ } else if (event.equals('T')) {
+ return Position.ALARM_TAMPERING;
+ } else if(event.equals("H")) {
+ return Position.ALARM_POWER_OFF;
+ } else if (event.equals('X')) {
+ return Position.ALARM_GEOFENCE_ENTER;
+ } else if (event.equals('8')) {
+ return Position.ALARM_SHOCK;
+ } else if (event.equals('7') && event.equals('4')) {
+ return Position.ALARM_GEOFENCE_EXIT;
+ } else if (event.equals('6')) {
+ return Position.ALARM_OVERSPEED;
+ } else if (event.equals('3')) {
+ return Position.ALARM_SOS;
+ }
+ return null;
+ }
+}
diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
index 03abdd588..014ebb233 100644
--- a/src/org/traccar/protocol/OsmAndProtocolDecoder.java
+++ b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
@@ -42,8 +42,7 @@ public class OsmAndProtocolDecoder extends BaseHttpProtocolDecoder {
}
@Override
- protected Object decode(
- Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+ protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
HttpRequest request = (HttpRequest) msg;
QueryStringDecoder decoder = new QueryStringDecoder(request.getUri());
diff --git a/test/org/traccar/protocol/LaipacSFKamelProtocolDecoderTest.java b/test/org/traccar/protocol/LaipacSFKamelProtocolDecoderTest.java
new file mode 100644
index 000000000..69c4243ab
--- /dev/null
+++ b/test/org/traccar/protocol/LaipacSFKamelProtocolDecoderTest.java
@@ -0,0 +1,35 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.helper.Checksum;
+
+public class LaipacSFKamelProtocolDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ LaipacSFKamelProtocolDecoder decoder = new LaipacSFKamelProtocolDecoder(new LaipacSFKamelProtocol());
+
+ verifyPosition(decoder, text(
+ "$AVRMC,999999999999999,084514,r,5050.1314,N,00419.9719,E,0.68,306.39,120318,0,3882,84,1,0,0,3EE4A617,020610*4D"));
+
+ verifyNull(decoder, text(
+ "$AVSYS,99999999,V1.50,SN0000103,32768*15"));
+
+ verifyNull(decoder, text(
+ "$ECHK,99999999,0*35"));
+
+ verifyNull(decoder, text(
+ "$AVSYS,MSG00002,14406,7046811160,64*1A"));
+
+ verifyNull(decoder, text(
+ "$EAVSYS,MSG00002,8931086013104404999,,Owner,0x52014406*76"));
+
+ verifyNull(decoder, text(
+ "$ECHK,MSG00002,0*5E"));
+
+ verifyPosition(decoder, text(
+ "$AVRMC,999999999999999,111602,r,5050.1262,N,00419.9660,E,0.00,0.00,120318,0,3843,95,1,0,0,3EE4A617,020610*47"));
+ }
+}
diff --git a/tools/translate.py b/tools/translate.py
new file mode 100644
index 000000000..e8324a61a
--- /dev/null
+++ b/tools/translate.py
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+import os
+import optparse
+import urllib2
+import json
+import base64
+
+parser = optparse.OptionParser()
+parser.add_option("-u", "--user", dest="username", help="transifex user login")
+parser.add_option("-p", "--password", dest="password", help="transifex user password")
+
+(options, args) = parser.parse_args()
+
+if not options.username or not options.password:
+ parser.error('User name and password are required')
+
+os.chdir(os.path.dirname(os.path.abspath(__file__)))
+
+path = "../web/l10n/"
+
+def request(url):
+ req = urllib2.Request(url)
+ auth = base64.encodestring("%s:%s" % (options.username, options.password)).replace("\n", "")
+ req.add_header("Authorization", "Basic %s" % auth)
+ return urllib2.urlopen(req)
+
+resource = json.load(request("https://www.transifex.com/api/2/project/traccar/resource/web/?details"))
+
+for language in resource["available_languages"]:
+ code = language["code"]
+ data = request("https://www.transifex.com/api/2/project/traccar/resource/web/translation/" + code + "?file")
+ file = open(path + code + ".json", "wb")
+ file.write(data.read())
+ file.close()