From 3c3596868b8a18a6c207e902a6568c8e850e7696 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 19 Sep 2014 21:16:26 +1200
Subject: Workaround missing hemisphere (fix #874)

---
 src/org/traccar/protocol/XexunProtocolDecoder.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/org/traccar/protocol/XexunProtocolDecoder.java b/src/org/traccar/protocol/XexunProtocolDecoder.java
index a6c298f44..7a0d71e64 100644
--- a/src/org/traccar/protocol/XexunProtocolDecoder.java
+++ b/src/org/traccar/protocol/XexunProtocolDecoder.java
@@ -41,9 +41,9 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
             "(\\d+)(\\d{2}\\.\\d+)," +          // Latitude (DDMM.MMMM)
             "([NS])," +
             "(\\d+)(\\d{2}\\.\\d+)," +          // Longitude (DDDMM.MMMM)
-            "([EW])," +
-            "(\\d+\\.\\d+)," +                  // Speed
-            "(\\d+\\.\\d+)?," +                 // Course
+            "([EW])?," +
+            "(\\d+\\.?\\d*)," +                 // Speed
+            "(\\d+\\.?\\d*)?," +                // Course
             "(\\d{2})(\\d{2})(\\d{2})," +       // Date (DDMMYY)
             ".*\r?\n?.*imei:" +
             "(\\d+),");                         // IMEI
@@ -86,7 +86,10 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
         // Longitude
         Double longitude = Double.valueOf(parser.group(index++));
         longitude += Double.valueOf(parser.group(index++)) / 60;
-        if (parser.group(index++).compareTo("W") == 0) longitude = -longitude;
+        String hemisphere = parser.group(index++);
+        if (hemisphere != null) {
+            if (hemisphere.compareTo("W") == 0) longitude = -longitude;
+        }
         position.setLongitude(longitude);
 
         // Altitude
-- 
cgit v1.2.3