diff options
author | Demian <dalonso@ecotaxi.com> | 2015-06-29 11:23:08 -0300 |
---|---|---|
committer | Demian <dalonso@ecotaxi.com> | 2015-07-29 13:05:44 -0300 |
commit | 66dbefa18290d2f31d545fd1f511207cdcd7c3a2 (patch) | |
tree | 9b9ba9473a8f1e7f2a8928bce6329d47cc9b6e04 /src/org/traccar/model | |
parent | 173699d5683605e72267b24a248085c2abccc38f (diff) | |
download | traccar-server-66dbefa18290d2f31d545fd1f511207cdcd7c3a2.tar.gz traccar-server-66dbefa18290d2f31d545fd1f511207cdcd7c3a2.tar.bz2 traccar-server-66dbefa18290d2f31d545fd1f511207cdcd7c3a2.zip |
Added service to retrieve the positions for a group of devices from a particular user
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r-- | src/org/traccar/model/MiscFormatter.java | 6 |
1 files changed, 6 insertions, 0 deletions
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())); } } |