Support Traxsit GPS1 format

1 files changed, 13 insertions, 5 deletions

diff --git a/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java b/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java
index 304f61836..bda0600cc 100644
--- a/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2020 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.
@@ -83,7 +83,14 @@ public class SigfoxProtocolDecoder extends BaseHttpProtocolDecoder {
         }
         JsonObject json = Json.createReader(new StringReader(content)).readObject();
 
-        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, json.getString("device"));
+        String deviceId;
+        if (json.containsKey("device")) {
+            deviceId = json.getString("device");
+        } else {
+            deviceId = json.getString("deviceId");
+        }
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, deviceId);
         if (deviceSession == null) {
             sendResponse(channel, HttpResponseStatus.BAD_REQUEST);
             return null;
@@ -99,7 +106,8 @@ public class SigfoxProtocolDecoder extends BaseHttpProtocolDecoder {
         }
 
         if (json.containsKey("location")
-                || json.containsKey("lat") && json.containsKey("lng") && !json.containsKey("data")) {
+                || json.containsKey("lat") && json.containsKey("lng") && !json.containsKey("data")
+                || json.containsKey("latitude") && json.containsKey("longitude") && !json.containsKey("data")) {
 
             JsonObject location;
             if (json.containsKey("location")) {
@@ -109,8 +117,8 @@ public class SigfoxProtocolDecoder extends BaseHttpProtocolDecoder {
             }
 
             position.setValid(true);
-            position.setLatitude(getJsonDouble(location, "lat"));
-            position.setLongitude(getJsonDouble(location, "lng"));
+            position.setLatitude(getJsonDouble(location, location.containsKey("lat") ? "lat" : "latitude"));
+            position.setLongitude(getJsonDouble(location, location.containsKey("lng") ? "lng" : "longitude"));
 
         } else {