Extend upro protocol decoder

2 files changed, 80 insertions, 20 deletions

diff --git a/src/org/traccar/protocol/UproProtocolDecoder.java b/src/org/traccar/protocol/UproProtocolDecoder.java
index 91404a241..e48162322 100644
--- a/src/org/traccar/protocol/UproProtocolDecoder.java
+++ b/src/org/traccar/protocol/UproProtocolDecoder.java
@@ -18,10 +18,10 @@ package org.traccar.protocol;
 import org.jboss.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.DeviceSession;
+import org.traccar.helper.BitUtil;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
-import org.traccar.helper.PatternUtil;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -34,50 +34,101 @@ public class UproProtocolDecoder extends BaseProtocolDecoder {
     }
 
     private static final Pattern PATTERN = new PatternBuilder()
-            .text("*AI20")
+            .text("*")
+            .expression("..20")
             .expression("[01]")                  // ack
             .number("(d+),")                     // device id
-            .expression(".+&A")
+            .expression(".")                     // type
+            .expression(".")                     // subtype
+            .expression("(.*)")                  // content
+            .expression("#?")                    // delimiter
+            .compile();
+
+    private static final Pattern PATTERN_LOCATION = new PatternBuilder()
+            .text("A")
             .number("(dd)(dd)(dd)")              // time
             .number("(dd)(dd)(dddd)")            // latitude
             .number("(ddd)(dd)(dddd)")           // longitude
-            .number("d{5}")
+            .number("(d)")                       // flags
+            .number("(dd)")                      // speed
+            .number("(dd)")                      // course
             .number("(dd)(dd)(dd)")              // date
-            .expression("&B")
-            .any()
             .compile();
 
+    private void decodeLocation(Position position, String data) {
+        Parser parser = new Parser(PATTERN_LOCATION, data);
+        if (parser.matches()) {
+
+            DateBuilder dateBuilder = new DateBuilder()
+                    .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+
+            position.setValid(true);
+            position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN));
+            position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN));
+
+            int flags = parser.nextInt();
+            position.setValid(BitUtil.check(flags, 0));
+            if (!BitUtil.check(flags, 1)) {
+                position.setLatitude(-position.getLatitude());
+            }
+            if (!BitUtil.check(flags, 2)) {
+                position.setLatitude(-position.getLatitude());
+            }
+
+            position.setSpeed(parser.nextInt() * 2);
+            position.setCourse(parser.nextInt() * 10);
+
+            dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
+            position.setTime(dateBuilder.getDate());
+
+        }
+    }
+
     @Override
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        PatternUtil.MatchResult r = PatternUtil.checkPattern(PATTERN.pattern(), (String) msg);
-
         Parser parser = new Parser(PATTERN, (String) msg);
         if (!parser.matches()) {
             return null;
         }
 
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
-
         DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
         if (deviceSession == null) {
             return null;
         }
-        position.setDeviceId(deviceSession.getDeviceId());
 
-        DateBuilder dateBuilder = new DateBuilder()
-                .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
 
-        position.setValid(true);
-        position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN));
-        position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN));
+        String[] data = parser.next().split("&");
+        for (int i = 0; i < data.length; i++) {
+            if (i != 0) {
+                switch (data[i].charAt(0)) {
+                    case 'A':
+                        decodeLocation(position, data[i]);
+                        break;
+                    case 'B':
+                        position.set(Position.KEY_STATUS, data[i].substring(1));
+                        break;
+                    case 'P':
+                        position.set(Position.KEY_MCC, Integer.parseInt(data[i].substring(1, 5)));
+                        position.set(Position.KEY_MNC, Integer.parseInt(data[i].substring(5, 9)));
+                        position.set(Position.KEY_LAC, Integer.parseInt(data[i].substring(9, 13), 16));
+                        position.set(Position.KEY_CID, Integer.parseInt(data[i].substring(13, 17), 16));
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
 
-        dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
-        position.setTime(dateBuilder.getDate());
+        if (position.getLatitude() != 0 && position.getLongitude() != 0) {
+            return position;
+        }
 
-        return position;
+        return null;
     }
 
 }
diff --git a/test/org/traccar/protocol/UproProtocolDecoderTest.java b/test/org/traccar/protocol/UproProtocolDecoderTest.java
index aab31ba26..d553d5f52 100644
--- a/test/org/traccar/protocol/UproProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/UproProtocolDecoderTest.java
@@ -10,6 +10,15 @@ public class UproProtocolDecoderTest extends ProtocolTest {
 
         UproProtocolDecoder decoder = new UproProtocolDecoder(new UproProtocol());
 
+        verifyNothing(decoder, text(
+                "*MG20113800138000,AH#"));
+
+        verifyPosition(decoder, text(
+                "*MG201693502000034964,AB&A0200183324418107033792800009051116&B0000000000&N15&Z94&U_P\0\0\0\0\0\0\0\0\0\0\0\0\0\0#"));
+
+        verifyPosition(decoder, text(
+                "*MG201693502000034964,AB&A0200543324412007033805910000051116&P0730000032d66785&B0000000000&N15&Z92&U_P\0\0\0\0\0\0\0\0\0\0\0\0\0\0#"));
+
         verifyPosition(decoder, text(
                 "*AI2000905447674,BA&A2003064913201201845107561627121016&B0100000000&C05>8=961&F0333&K023101002154A7#"));