From 66dbefa18290d2f31d545fd1f511207cdcd7c3a2 Mon Sep 17 00:00:00 2001 From: Demian Date: Mon, 29 Jun 2015 11:23:08 -0300 Subject: Added service to retrieve the positions for a group of devices from a particular user --- src/org/traccar/model/MiscFormatter.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/org/traccar/model') diff --git a/src/org/traccar/model/MiscFormatter.java b/src/org/traccar/model/MiscFormatter.java index d1e1ae959..7a1e69082 100644 --- a/src/org/traccar/model/MiscFormatter.java +++ b/src/org/traccar/model/MiscFormatter.java @@ -15,6 +15,8 @@ */ package org.traccar.model; +import org.traccar.web.JsonConverter; + import java.text.DecimalFormat; import java.util.LinkedHashMap; import java.util.Map; @@ -73,6 +75,10 @@ public class MiscFormatter { json.add(entry.getKey(), (Double) entry.getValue()); } else if (entry.getValue() instanceof Boolean) { json.add(entry.getKey(), (Boolean) entry.getValue()); + } else if (entry.getValue() == null) { + json.add(entry.getKey(), JsonValue.NULL); + } else { + json.add(entry.getKey(), JsonConverter.objectToJson(entry.getValue())); } } -- cgit v1.2.3