From d9dcdd8b66f197ecb29c2291be6eb2a640886cc6 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 13 May 2020 22:26:04 -0700 Subject: Decode additional Outsafe data --- .../traccar/protocol/OutsafeProtocolDecoder.java | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/org/traccar/protocol/OutsafeProtocolDecoder.java b/src/main/java/org/traccar/protocol/OutsafeProtocolDecoder.java index 5e95270e8..9de77d241 100644 --- a/src/main/java/org/traccar/protocol/OutsafeProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/OutsafeProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Anton Tananaev (anton@traccar.org) + * Copyright 2019 - 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. @@ -24,11 +24,15 @@ import org.traccar.Protocol; import org.traccar.model.Position; import javax.json.Json; +import javax.json.JsonNumber; import javax.json.JsonObject; +import javax.json.JsonString; +import javax.json.JsonValue; import java.io.StringReader; import java.net.SocketAddress; import java.nio.charset.StandardCharsets; import java.util.Date; +import java.util.Map; public class OutsafeProtocolDecoder extends BaseHttpProtocolDecoder { @@ -61,9 +65,25 @@ public class OutsafeProtocolDecoder extends BaseHttpProtocolDecoder { position.setCourse(json.getJsonNumber("heading").intValue()); position.set(Position.KEY_RSSI, json.getJsonNumber("rssi").intValue()); + position.set("origin", json.getString("origin")); + + JsonObject data = json.getJsonObject("data"); + for (Map.Entry entry : data.entrySet()) { + decodeUnknownParam(entry.getKey(), entry.getValue(), position); + } sendResponse(channel, HttpResponseStatus.OK); return position; } + private void decodeUnknownParam(String name, JsonValue value, Position position) { + if (value instanceof JsonNumber) { + position.set(name, ((JsonNumber) value).doubleValue()); + } else if (value instanceof JsonString) { + position.set(name, ((JsonString) value).getString()); + } else if (value == JsonValue.TRUE || value == JsonValue.FALSE) { + position.set(name, value == JsonValue.TRUE); + } + } + } -- cgit v1.2.3