aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/protocol/EnforaProtocolEncoder.java6
-rw-r--r--src/org/traccar/protocol/PricolProtocolDecoder.java4
2 files changed, 4 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/EnforaProtocolEncoder.java b/src/org/traccar/protocol/EnforaProtocolEncoder.java
index e7da87388..3dca1b9b3 100644
--- a/src/org/traccar/protocol/EnforaProtocolEncoder.java
+++ b/src/org/traccar/protocol/EnforaProtocolEncoder.java
@@ -30,13 +30,11 @@ public class EnforaProtocolEncoder extends StringProtocolEncoder {
ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
- byte[] contentBytes = content.getBytes();
-
- buf.writeShort(contentBytes.length + 6);
+ buf.writeShort(content.length() + 6);
buf.writeShort(0); // index
buf.writeByte(0x04); // command type
buf.writeByte(0); // optional header
- buf.writeBytes(content.getBytes(StandardCharsets.UTF_8));
+ buf.writeBytes(content.getBytes(StandardCharsets.US_ASCII));
return buf;
}
diff --git a/src/org/traccar/protocol/PricolProtocolDecoder.java b/src/org/traccar/protocol/PricolProtocolDecoder.java
index a33e19b90..dd804d8bd 100644
--- a/src/org/traccar/protocol/PricolProtocolDecoder.java
+++ b/src/org/traccar/protocol/PricolProtocolDecoder.java
@@ -63,11 +63,11 @@ public class PricolProtocolDecoder extends BaseProtocolDecoder {
position.setValid(true);
- double lat = buf.getUnsignedShort(buf.readerIndex()) / 100;
+ double lat = (double) (buf.getUnsignedShort(buf.readerIndex()) / 100);
lat += (buf.readUnsignedShort() % 100 * 10000 + buf.readUnsignedShort()) / 600000.0;
position.setLatitude(buf.readUnsignedByte() == 'S' ? -lat : lat);
- double lon = buf.getUnsignedMedium(buf.readerIndex()) / 100;
+ double lon = (double) (buf.getUnsignedMedium(buf.readerIndex()) / 100);
lon += (buf.readUnsignedMedium() % 100 * 10000 + buf.readUnsignedShort()) / 600000.0;
position.setLongitude(buf.readUnsignedByte() == 'W' ? -lon : lon);