aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-06-02 22:39:48 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2014-06-02 22:39:48 +1200
commit6ac5e8cef0be902b7067c6d9c4b30c4740d3dffd (patch)
tree135c3ab138f2d0762aafeec1be6c2bb32a47aad4
parent8f62b5da5664ef4294387763d328df92784b50e4 (diff)
downloadtraccar-server-6ac5e8cef0be902b7067c6d9c4b30c4740d3dffd.tar.gz
traccar-server-6ac5e8cef0be902b7067c6d9c4b30c4740d3dffd.tar.bz2
traccar-server-6ac5e8cef0be902b7067c6d9c4b30c4740d3dffd.zip
Implement Freedom protocol
-rw-r--r--default.cfg4
-rw-r--r--src/org/traccar/ServerManager.java14
-rw-r--r--src/org/traccar/protocol/FreedomProtocolDecoder.java112
-rw-r--r--src/org/traccar/protocol/GotopProtocolDecoder.java1
-rw-r--r--test/org/traccar/protocol/FreedomProtocolDecoderTest.java21
5 files changed, 151 insertions, 1 deletions
diff --git a/default.cfg b/default.cfg
index 46e1f84f1..405222bcf 100644
--- a/default.cfg
+++ b/default.cfg
@@ -326,4 +326,8 @@
<entry key='box.enable'>true</entry>
<entry key='box.port'>5065</entry>
+ <!-- Freedom server configuration -->
+ <entry key='freedom.enable'>true</entry>
+ <entry key='freedom.port'>5066</entry>
+
</properties>
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 337d177f0..56647aecd 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -169,6 +169,7 @@ public class ServerManager {
initHaicomServer("haicom");
initEelinkServer("eelink");
initBoxServer("box");
+ initFreedomServer("freedom");
// Initialize web server
if (Boolean.valueOf(properties.getProperty("http.enable"))) {
@@ -1159,4 +1160,17 @@ public class ServerManager {
}
}
+ private void initFreedomServer(String protocol) throws SQLException {
+ if (isProtocolEnabled(properties, protocol)) {
+ serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
+ @Override
+ protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
+ pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectDecoder", new FreedomProtocolDecoder(ServerManager.this));
+ }
+ });
+ }
+ }
+
}
diff --git a/src/org/traccar/protocol/FreedomProtocolDecoder.java b/src/org/traccar/protocol/FreedomProtocolDecoder.java
new file mode 100644
index 000000000..7e86d285f
--- /dev/null
+++ b/src/org/traccar/protocol/FreedomProtocolDecoder.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2014 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * 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 java.util.Calendar;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.ServerManager;
+import org.traccar.helper.Log;
+import org.traccar.model.ExtendedInfoFormatter;
+import org.traccar.model.Position;
+
+public class FreedomProtocolDecoder extends BaseProtocolDecoder {
+
+ public FreedomProtocolDecoder(ServerManager serverManager) {
+ super(serverManager);
+ }
+
+ private static final Pattern pattern = Pattern.compile(
+ "IMEI," +
+ "(\\d+)," + // IMEI
+ "(\\d{4}).(\\d{2}).(\\d{2}), " + // Date
+ "(\\d{2}):(\\d{2}):(\\d{2}), " + // Time
+ "([NS]), Lat:(\\d{2})(\\d+.\\d+), " + // Latitude
+ "([EW]), Lon:(\\d{3})(\\d+.\\d+), " + // Longitude
+ "Spd:(\\d+.\\d+)" + // Speed
+ ".*");
+
+ @Override
+ protected Object decode(
+ ChannelHandlerContext ctx, Channel channel, Object msg)
+ throws Exception {
+
+ // Parse message
+ Matcher parser = pattern.matcher((String) msg);
+ if (!parser.matches()) {
+ return null;
+ }
+
+ // Create new position
+ Position position = new Position();
+ ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("freedom");
+ Integer index = 1;
+
+ // Identification
+ String imei = parser.group(index++);
+ try {
+ position.setDeviceId(getDataManager().getDeviceByImei(imei).getId());
+ } catch(Exception error) {
+ Log.warning("Unknown device - " + imei);
+ return null;
+ }
+
+ // Validity
+ position.setValid(true);
+
+ // Time
+ Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ time.clear();
+ time.set(Calendar.YEAR, Integer.valueOf(parser.group(index++)));
+ time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
+ time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
+ time.set(Calendar.HOUR_OF_DAY, Integer.valueOf(parser.group(index++)));
+ time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
+ time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
+ position.setTime(time.getTime());
+
+ // Latitude
+ String hemisphere = parser.group(index++);
+ Double latitude = Double.valueOf(parser.group(index++));
+ latitude += Double.valueOf(parser.group(index++)) / 60;
+ if (hemisphere.compareTo("S") == 0) latitude = -latitude;
+ position.setLatitude(latitude);
+
+ // Longitude
+ hemisphere = parser.group(index++);
+ Double longitude = Double.valueOf(parser.group(index++));
+ longitude += Double.valueOf(parser.group(index++)) / 60;
+ if (hemisphere.compareTo("W") == 0) longitude = -longitude;
+ position.setLongitude(longitude);
+
+ // Altitude
+ position.setAltitude(0.0);
+
+ // Speed
+ position.setSpeed(Double.valueOf(parser.group(index++)));
+
+ // Course
+ position.setCourse(0.0);
+
+ position.setExtendedInfo(extendedInfo.toString());
+ return position;
+ }
+
+}
diff --git a/src/org/traccar/protocol/GotopProtocolDecoder.java b/src/org/traccar/protocol/GotopProtocolDecoder.java
index af92999e3..826faf531 100644
--- a/src/org/traccar/protocol/GotopProtocolDecoder.java
+++ b/src/org/traccar/protocol/GotopProtocolDecoder.java
@@ -33,7 +33,6 @@ public class GotopProtocolDecoder extends BaseProtocolDecoder {
super(serverManager);
}
- //353327020412763,CMD-F,V,DATE:140125,TIME:183636,LAT:51.6384466N,LOT:000.2863866E,Speed:000.0,61-19,
private static final Pattern pattern = Pattern.compile(
"(\\d+)," + // IMEI
"[^,]+," + // Type
diff --git a/test/org/traccar/protocol/FreedomProtocolDecoderTest.java b/test/org/traccar/protocol/FreedomProtocolDecoderTest.java
new file mode 100644
index 000000000..ead8c980b
--- /dev/null
+++ b/test/org/traccar/protocol/FreedomProtocolDecoderTest.java
@@ -0,0 +1,21 @@
+package org.traccar.protocol;
+
+import org.traccar.helper.TestDataManager;
+import static org.traccar.helper.DecoderVerifier.verify;
+import static org.junit.Assert.assertNull;
+import org.junit.Test;
+
+public class FreedomProtocolDecoderTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ FreedomProtocolDecoder decoder = new FreedomProtocolDecoder(null);
+ decoder.setDataManager(new TestDataManager());
+
+ verify(decoder.decode(null, null,
+ "IMEI,353358011714362,2014/05/22, 20:49:32, N, Lat:4725.9624, E, Lon:01912.5483, Spd:5.05"));
+
+ }
+
+}