Merge branch 'master' into develop

1 files changed, 5 insertions, 9 deletions

diff --git a/src/main/java/org/traccar/protocol/GlobalstarProtocolDecoder.java b/src/main/java/org/traccar/protocol/GlobalstarProtocolDecoder.java
index b742d0cac..0ddb95c14 100644
--- a/src/main/java/org/traccar/protocol/GlobalstarProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/GlobalstarProtocolDecoder.java
@@ -27,7 +27,7 @@ import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import org.traccar.BaseHttpProtocolDecoder;
-import org.traccar.DeviceSession;
+import org.traccar.session.DeviceSession;
 import org.traccar.NetworkMessage;
 import org.traccar.Protocol;
 import org.traccar.helper.BitUtil;
@@ -151,15 +151,11 @@ public class GlobalstarProtocolDecoder extends BaseHttpProtocolDecoder {
 
                 position.setCourse(BitUtil.from(flags, 5) * 45);
 
-                position.setLatitude(buf.readUnsignedMedium() * 90.0 / (1 << 23));
-                if (position.getLatitude() > 90) {
-                    position.setLatitude(position.getLatitude() - 180);
-                }
+                double latitude = buf.readUnsignedMedium() * 90.0 / (1 << 23);
+                position.setLatitude(latitude > 90 ? latitude - 180 : latitude);
 
-                position.setLongitude(buf.readUnsignedMedium() * 180.0 / (1 << 23));
-                if (position.getLongitude() > 180) {
-                    position.setLongitude(position.getLongitude() - 360);
-                }
+                double longitude = buf.readUnsignedMedium() * 180.0 / (1 << 23);
+                position.setLongitude(longitude > 180 ? longitude - 360 : longitude);
 
                 int speed = buf.readUnsignedByte();
                 position.setSpeed(UnitsConverter.knotsFromKph(speed));