Add MiniFinder protocol

4 files changed, 170 insertions, 0 deletions

diff --git a/default.cfg b/default.cfg
index a286bec1d..3e84876c3 100644
--- a/default.cfg
+++ b/default.cfg
@@ -309,4 +309,8 @@
     <entry key='cartrack.enable'>true</entry>
     <entry key='cartrack.port'>5061</entry>
 
+    <!-- MiniFinder server configuration -->
+    <entry key='minifinder.enable'>true</entry>
+    <entry key='minifinder.port'>5062</entry>
+
 </properties>
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 43fbec650..1a3cf0a00 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -165,6 +165,7 @@ public class ServerManager {
         initPiligrimServer("piligrim");
         initStl060Server("stl060");
         initCarTrackServer("cartrack");
+        initMiniFinderServer("minifinder");
         
         // Initialize web server
         if (Boolean.valueOf(properties.getProperty("http.enable"))) {
@@ -1099,4 +1100,19 @@ public class ServerManager {
         }
     }
 
+    private void initMiniFinderServer(String protocol) throws SQLException {
+        if (isProtocolEnabled(properties, protocol)) {
+            serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
+                @Override
+                protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                    byte delimiter[] = { (byte) ';' };
+                    pipeline.addLast("frameDecoder",
+                            new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
+                    pipeline.addLast("stringDecoder", new StringDecoder());
+                    pipeline.addLast("objectDecoder", new MiniFinderProtocolDecoder(ServerManager.this));
+                }
+            });
+        }
+    }
+
 }
diff --git a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
new file mode 100644
index 000000000..2d524a23a
--- /dev/null
+++ b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
@@ -0,0 +1,124 @@
+/*
+ * 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 MiniFinderProtocolDecoder extends BaseProtocolDecoder {
+
+    private Long deviceId;
+
+    public MiniFinderProtocolDecoder(ServerManager serverManager) {
+        super(serverManager);
+    }
+
+    private static final Pattern pattern = Pattern.compile(
+            "\\!D," +
+            "(\\d+)/(\\d+)/(\\d+)," +      // Date
+            "(\\d+):(\\d+):(\\d+)," +      // Time
+            "(-?\\d+\\.\\d+)," +           // Latitude
+            "(-?\\d+\\.\\d+)," +           // Longitude
+            "(\\d+\\.?\\d*)," +            // Speed
+            "(\\d+\\.?\\d*)," +            // Course
+            "(\\p{XDigit}+)," +            // Flags
+            "(-?\\d+\\.\\d+)," +           // Altitude
+            "(\\d+)," +                    // Battery
+            "(\\d+)," +                    // Satellites in use
+            "(\\d+)," +                    // Satellites in view
+            "0");
+    
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, Object msg)
+            throws Exception {
+
+        String sentence = (String) msg;
+
+        // Identification
+        if (sentence.startsWith("!1")) {
+            String imei = sentence.substring(3, sentence.length());
+            try {
+                deviceId = getDataManager().getDeviceByImei(imei).getId();
+            } catch(Exception error) {
+                Log.warning("Unknown device - " + imei);
+            }
+        }
+
+        // Location
+        else if (sentence.startsWith("!D") && deviceId != null) {
+
+            // Parse message
+            Matcher parser = pattern.matcher(sentence);
+            if (!parser.matches()) {
+                return null;
+            }
+
+            // Create new position
+            Position position = new Position();
+            ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("minifinder");
+            position.setDeviceId(deviceId);
+
+            Integer index = 1;
+
+            // Time
+            Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+            time.clear();
+            time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
+            time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
+            time.set(Calendar.YEAR, 2000 + 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());
+
+            // Location
+            position.setLatitude(Double.valueOf(parser.group(index++)));
+            position.setLongitude(Double.valueOf(parser.group(index++)));
+            position.setSpeed(Double.valueOf(parser.group(index++)));
+            position.setCourse(Double.valueOf(parser.group(index++)));
+            
+            // Flags
+            String flags = parser.group(index++);
+            extendedInfo.set("flags", flags);
+            position.setValid((Integer.parseInt(flags, 16) & 0x01) != 0);
+
+            // Altitude
+            position.setAltitude(Double.valueOf(parser.group(index++)));
+
+            // Battery
+            extendedInfo.set("battery", parser.group(index++));
+
+            // Satellites
+            extendedInfo.set("satellites", parser.group(index++));
+
+            position.setExtendedInfo(extendedInfo.toString());
+            return position;
+        }
+
+        return null;
+    }
+
+}
diff --git a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java
new file mode 100644
index 000000000..d484d6660
--- /dev/null
+++ b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java
@@ -0,0 +1,26 @@
+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 MiniFinderProtocolDecoderTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        MiniFinderProtocolDecoder decoder = new MiniFinderProtocolDecoder(null);
+        decoder.setDataManager(new TestDataManager());
+
+        assertNull(decoder.decode(null, null, "!1,860719020212696"));
+
+        verify(decoder.decode(null, null,
+                "!D,22/2/14,13:40:58,56.899601,14.811541,0,0,1,176.0,98,5,16,0"));
+
+        verify(decoder.decode(null, null,
+                "!D,22/2/14,13:47:51,56.899517,14.811665,0,0,b0001,179.3,97,5,16,0"));
+
+    }
+
+}