diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-02 14:27:10 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-02 14:27:10 +1300 |
| commit | a05daf7d491e72a6272b2562f5bd21325795c3ab (patch) | |
| tree | 4f634b8cbc491369eb911fa27db597417b298ff1 /src/org/traccar/web | |
| parent | d64dca63369c702e8f276fab50d9b3201c437e00 (diff) | |
| download | trackermap-server-a05daf7d491e72a6272b2562f5bd21325795c3ab.tar.gz trackermap-server-a05daf7d491e72a6272b2562f5bd21325795c3ab.tar.bz2 trackermap-server-a05daf7d491e72a6272b2562f5bd21325795c3ab.zip | |
Add positions resource to the REST API
Diffstat (limited to 'src/org/traccar/web')
| -rw-r--r-- | src/org/traccar/web/PositionServlet.java | 3 | ||||
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/web/PositionServlet.java b/src/org/traccar/web/PositionServlet.java index 796d6a81f..150b1a27c 100644 --- a/src/org/traccar/web/PositionServlet.java +++ b/src/org/traccar/web/PositionServlet.java @@ -46,8 +46,7 @@ public class PositionServlet extends BaseServlet { long deviceId = Long.parseLong(req.getParameter("deviceId")); Context.getPermissionsManager().checkDevice(getUserId(req), deviceId); sendResponse(resp.getWriter(), JsonConverter.arrayToJson( - Context.getDataManager().getPositions( - getUserId(req), deviceId, + Context.getDataManager().getPositions(deviceId, JsonConverter.parseDate(req.getParameter("from")), JsonConverter.parseDate(req.getParameter("to"))))); } diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index 9cfe06e0e..d172a5331 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -30,6 +30,7 @@ import org.traccar.Config; import org.traccar.api.CorsResponseFilter; import org.traccar.api.SecurityRequestFilter; import org.traccar.api.resource.DeviceResource; +import org.traccar.api.resource.PositionResource; import org.traccar.api.resource.ServerResource; import org.traccar.api.resource.SessionResource; import org.traccar.api.resource.UserResource; @@ -109,8 +110,8 @@ public class WebServer { ResourceConfig resourceConfig = new ResourceConfig(); resourceConfig.register(SecurityRequestFilter.class); resourceConfig.register(CorsResponseFilter.class); - resourceConfig.registerClasses( - ServerResource.class, SessionResource.class, DeviceResource.class, UserResource.class); + resourceConfig.registerClasses(ServerResource.class, SessionResource.class, + DeviceResource.class, UserResource.class, PositionResource.class); servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/rest/*"); } servletHandler.addServlet(new ServletHolder(new AsyncServlet()), "/async/*"); |