Merge tag 'tags/v6.3'

1 files changed, 8 insertions, 13 deletions

diff --git a/src/main/java/org/traccar/BaseProtocolDecoder.java b/src/main/java/org/traccar/BaseProtocolDecoder.java
index b764e5cdf..5e3f668ed 100644
--- a/src/main/java/org/traccar/BaseProtocolDecoder.java
+++ b/src/main/java/org/traccar/BaseProtocolDecoder.java
@@ -108,17 +108,12 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
     }
 
     protected double convertSpeed(double value, String defaultUnits) {
-        switch (getConfig().getString(getProtocolName() + ".speed", defaultUnits)) {
-            case "kmh":
-                return UnitsConverter.knotsFromKph(value);
-            case "mps":
-                return UnitsConverter.knotsFromMps(value);
-            case "mph":
-                return UnitsConverter.knotsFromMph(value);
-            case "kn":
-            default:
-                return value;
-        }
+        return switch (getConfig().getString(getProtocolName() + ".speed", defaultUnits)) {
+            case "kmh" -> UnitsConverter.knotsFromKph(value);
+            case "mps" -> UnitsConverter.knotsFromMps(value);
+            case "mph" -> UnitsConverter.knotsFromMph(value);
+            default -> value;
+        };
     }
 
     protected TimeZone getTimeZone(long deviceId) {
@@ -168,8 +163,8 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
         }
         Set<Long> deviceIds = new HashSet<>();
         if (decodedMessage != null) {
-            if (decodedMessage instanceof Position) {
-                deviceIds.add(((Position) decodedMessage).getDeviceId());
+            if (decodedMessage instanceof Position position) {
+                deviceIds.add(position.getDeviceId());
             } else if (decodedMessage instanceof Collection) {
                 Collection<Position> positions = (Collection) decodedMessage;
                 for (Position position : positions) {