Alternative location format

2 files changed, 21 insertions, 3 deletions

diff --git a/src/main/java/org/traccar/protocol/FlexApiProtocolDecoder.java b/src/main/java/org/traccar/protocol/FlexApiProtocolDecoder.java
index 25a8f7090..167896386 100644
--- a/src/main/java/org/traccar/protocol/FlexApiProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/FlexApiProtocolDecoder.java
@@ -55,9 +55,17 @@ public class FlexApiProtocolDecoder extends BaseProtocolDecoder {
         if (topic.contains("gnss")) {
 
             position.setValid(true);
-            position.setTime(new Date(payload.getInt("time") * 1000L));
-            position.setLatitude(payload.getJsonNumber("lat").doubleValue());
-            position.setLongitude(payload.getJsonNumber("log").doubleValue());
+
+            if (payload.containsKey("time")) {
+                position.setTime(new Date(payload.getInt("time") * 1000L));
+                position.setLatitude(payload.getJsonNumber("lat").doubleValue());
+                position.setLongitude(payload.getJsonNumber("log").doubleValue());
+            } else {
+                position.setTime(new Date(payload.getInt("gnss.ts") * 1000L));
+                position.setLatitude(payload.getJsonNumber("gnss.latitude").doubleValue());
+                position.setLongitude(payload.getJsonNumber("gnss.longitude").doubleValue());
+            }
+
             position.setAltitude(payload.getJsonNumber("gnss.altitude").doubleValue());
             position.setSpeed(payload.getJsonNumber("gnss.speed").doubleValue());
             position.setCourse(payload.getJsonNumber("gnss.heading").doubleValue());
@@ -81,6 +89,10 @@ public class FlexApiProtocolDecoder extends BaseProtocolDecoder {
                 position.set(Position.KEY_VIN, payload.getString("obd.vin"));
             }
 
+        } else if (topic.contains("cellular1")) {
+
+            getLastLocation(position, new Date(payload.getInt("modem1.ts") * 1000L));
+
         } else {
 
             return null;
diff --git a/src/test/java/org/traccar/protocol/FlexApiProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FlexApiProtocolDecoderTest.java
index 83f36f394..a276a01e9 100644
--- a/src/test/java/org/traccar/protocol/FlexApiProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/FlexApiProtocolDecoderTest.java
@@ -11,6 +11,12 @@ public class FlexApiProtocolDecoderTest extends ProtocolTest {
         var decoder = new FlexApiProtocolDecoder(null);
 
         verifyAttributes(decoder, text(
+                "${\"topic\":\"v1/VF3102021113001/gnss/info\",\"payload\":{\"gnss.ts\":1639713510,\"gnss.latitude\":30.587509,\"gnss.longitude\":104.053650,\"gnss.altitude\":391,\"gnss.speed\":0,\"gnss.heading\":0,\"gnss.hdop\":1.100000,\"gnss.fix\":4,\"gnss.num_sv\":10}}xx"));
+
+        verifyNull(decoder, text(
+                "${\"topic\":\"v1/VF3102021113001/cellular1/info\",\"payload\":{\"modem1.ts\":1639713510,\"modem1.imei\":\"863674047326655\",\"modem1.imsi\":\"\",\"modem1.iccid\":\"\",\"modem1.phone_num\":\"\",\"modem1.signal_lvl\":0,\"modem1.reg_status\":0,\"modem1.operator\":\"\",\"modem1.network\":0,\"modem1.lac\":\"\",\"modem1.cell_id\":\"\",\"modem1.rssi\":0,\"modem1.rsrp\":0,\"modem1.rsrq\":0,\"cellular1.status\":2,\"cellular1.ip\":\"0.0.0.0\",\"cellular1.netmask\":\"255.255.255.255\",\"cellular1.gateway\":\"0.0.0.0\",\"cellular1.dns1\":\"0.0.0.0\",\"cellular1.up_at\":602}}xx"));
+
+        verifyAttributes(decoder, text(
                 "${\"topic\":\"v1/VF3102029000003/obd/info\",\"payload\":{\"obd.ts\":1639037377,\"obd.speed\":211,\"obd.f_lvl\":50.196079,\"obd.mil\":0,\"obd.dtcs\":0,\"obd.rpm\":14531.250000,\"obd.e_load\":50.980392,\"obd.c_temp\":118,\"obd.o_temp\":56,\"obd.a_temp\":-40,\"obd.f_press\":48,\"obd.t_pos\":51.764706,\"obd.b_volt\":13.782000,\"obd.up_time\":2265,\"obd.m_dist\":4643,\"obd.m_time\":257,\"obd.d_dist\":200,\"obd.d_time\":771,\"obd.vin\":\"LFV3B28R8A3025310\",\"obd.f_rate\":10,\"obd.t_dist\":4843,\"obd.b_press\":101,\"obd.f_r_press\":48,\"obd.i_temp\":37,\"obd.i_press\":32,\"obd.r_torque\":4128,\"obd.a_torque\":2,\"obd.mf_mon\":1,\"obd.f_s_mon\":0,\"obd.c_c_mon\":0,\"obd.c_mon\":1,\"obd.e_s_mon\":1,\"obd.e_v_s_mon\":1,\"obd.o_s_mon\":1,\"obd.o_s_h_mon\":1}}xx"));
 
         verifyAttributes(decoder, text(