aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-03-03 09:55:49 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-03-03 09:55:49 +1300
commita05541ee221b261a4554e27487d4ecf8f466a1e4 (patch)
treeb462587d8eb37b9d403a59fc33480fd6dfb2761e /src/org
parentf5d687b7adb86e259f7b1f3b04a48d625cf1ca5e (diff)
downloadtrackermap-server-a05541ee221b261a4554e27487d4ecf8f466a1e4.tar.gz
trackermap-server-a05541ee221b261a4554e27487d4ecf8f466a1e4.tar.bz2
trackermap-server-a05541ee221b261a4554e27487d4ecf8f466a1e4.zip
Add API to get current positions
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/api/resource/PositionResource.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/org/traccar/api/resource/PositionResource.java b/src/org/traccar/api/resource/PositionResource.java
index ec6925b3a..b9e8e877e 100644
--- a/src/org/traccar/api/resource/PositionResource.java
+++ b/src/org/traccar/api/resource/PositionResource.java
@@ -38,9 +38,14 @@ public class PositionResource extends BaseResource {
public Collection<Position> get(
@QueryParam("deviceId") long deviceId, @QueryParam("from") String from, @QueryParam("to") String to)
throws SQLException {
- Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
- return Context.getDataManager().getPositions(
- deviceId, JsonConverter.parseDate(from), JsonConverter.parseDate(to));
+ if (deviceId == 0) {
+ return Context.getConnectionManager().getInitialState(
+ Context.getPermissionsManager().allowedDevices(getUserId()));
+ } else {
+ Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
+ return Context.getDataManager().getPositions(
+ deviceId, JsonConverter.parseDate(from), JsonConverter.parseDate(to));
+ }
}
}