diff options
Diffstat (limited to 'src/org/traccar')
-rw-r--r-- | src/org/traccar/api/AsyncSocket.java | 2 | ||||
-rw-r--r-- | src/org/traccar/api/resource/CommandResource.java | 9 | ||||
-rw-r--r-- | src/org/traccar/api/resource/PermissionResource.java | 5 | ||||
-rw-r--r-- | src/org/traccar/protocol/MeiligaoProtocolEncoder.java | 25 |
4 files changed, 1 insertions, 40 deletions
diff --git a/src/org/traccar/api/AsyncSocket.java b/src/org/traccar/api/AsyncSocket.java index ea28fb283..8630b207d 100644 --- a/src/org/traccar/api/AsyncSocket.java +++ b/src/org/traccar/api/AsyncSocket.java @@ -24,7 +24,7 @@ public class AsyncSocket { @OnWebSocketMessage public void onWebSocketText(Session session, String message) { - session.getRemote().sendString(message, null); // TODO: actual implementation + session.getRemote().sendString(message, null); } } diff --git a/src/org/traccar/api/resource/CommandResource.java b/src/org/traccar/api/resource/CommandResource.java index 9029d9213..fa0755143 100644 --- a/src/org/traccar/api/resource/CommandResource.java +++ b/src/org/traccar/api/resource/CommandResource.java @@ -17,23 +17,14 @@ package org.traccar.api.resource; import org.traccar.Context; import org.traccar.api.BaseResource; -import org.traccar.database.ActiveDevice; import org.traccar.model.Command; -import org.traccar.model.Device; import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; import javax.ws.rs.POST; -import javax.ws.rs.PUT; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import java.sql.SQLException; -import java.util.Collection; @Path("commands") @Produces(MediaType.APPLICATION_JSON) diff --git a/src/org/traccar/api/resource/PermissionResource.java b/src/org/traccar/api/resource/PermissionResource.java index c80d69e8c..84be6be0e 100644 --- a/src/org/traccar/api/resource/PermissionResource.java +++ b/src/org/traccar/api/resource/PermissionResource.java @@ -17,22 +17,17 @@ package org.traccar.api.resource; import org.traccar.Context; import org.traccar.api.BaseResource; -import org.traccar.model.Device; import org.traccar.model.Permission; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; -import javax.ws.rs.GET; import javax.ws.rs.POST; -import javax.ws.rs.PUT; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.sql.SQLException; -import java.util.Collection; @Path("permissions") @Produces(MediaType.APPLICATION_JSON) diff --git a/src/org/traccar/protocol/MeiligaoProtocolEncoder.java b/src/org/traccar/protocol/MeiligaoProtocolEncoder.java index ae93e8b73..84b9b642d 100644 --- a/src/org/traccar/protocol/MeiligaoProtocolEncoder.java +++ b/src/org/traccar/protocol/MeiligaoProtocolEncoder.java @@ -57,31 +57,6 @@ public class MeiligaoProtocolEncoder extends BaseProtocolEncoder { return buf; } - // TODO: remove if not needed - private static int radiusToArea(int radius) { - if (radius == 0) { - return 0x00; - } else if (radius <= 30) { - return 0x01; - } else if (radius <= 50) { - return 0x02; - } else if (radius <= 100) { - return 0x03; - } else if (radius <= 200) { - return 0x04; - } else if (radius <= 300) { - return 0x05; - } else if (radius <= 500) { - return 0x06; - } else if (radius <= 1000) { - return 0x07; - } else if (radius <= 2000) { - return 0x08; - } else { - return 0xff; - } - } - @Override protected Object encodeCommand(Command command) { |