Merge tag 'tags/v6.3'

1 files changed, 154 insertions, 408 deletions

diff --git a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
index 834f4f16c..0ef977e53 100644
--- a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
@@ -127,7 +127,7 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
                 position.set("tag" + i + "Id", ByteBufUtil.hexDump(data.readSlice(6)));
             }
             switch (mode) {
-                case 1:
+                case 1 -> {
                     if (BitUtil.check(mask, 6)) {
                         data.readUnsignedShort(); // major
                     }
@@ -140,8 +140,8 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
                     if (BitUtil.check(mask, 3)) {
                         position.set("tag" + i + "Rssi", data.readUnsignedByte());
                     }
-                    break;
-                case 2:
+                }
+                case 2 -> {
                     if (BitUtil.check(mask, 6)) {
                         data.readUnsignedShort(); // battery voltage
                     }
@@ -154,8 +154,8 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
                     if (BitUtil.check(mask, 3)) {
                         position.set("tag" + i + "Rssi", data.readUnsignedByte());
                     }
-                    break;
-                case 3:
+                }
+                case 3 -> {
                     if (BitUtil.check(mask, 6)) {
                         position.set("tag" + i + "Humidity", data.readUnsignedShort());
                     }
@@ -168,36 +168,23 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
                     if (BitUtil.check(mask, 2)) {
                         data.readUnsignedShort();
                     }
-                    break;
-                case 4:
+                }
+                case 4 -> {
                     if (BitUtil.check(mask, 6)) {
                         int hardwareId = data.readUnsignedByte();
                         if (BitUtil.check(mask, 5)) {
                             switch (hardwareId) {
-                                case 1:
-                                case 4:
-                                    data.skipBytes(11); // fuel
-                                    break;
-                                case 2:
-                                    data.skipBytes(2); // temperature
-                                    break;
-                                case 3:
-                                    data.skipBytes(6); // temperature and luminosity
-                                    break;
-                                case 5:
-                                    data.skipBytes(10); // temperature, humidity, luminosity and pressure
-                                    break;
-                                default:
-                                    break;
+                                case 1, 4 -> data.skipBytes(11); // fuel
+                                case 2 -> data.skipBytes(2); // temperature
+                                case 3 -> data.skipBytes(6); // temperature and luminosity
+                                case 5 -> data.skipBytes(10); // temperature, humidity, luminosity and pressure
                             }
                         }
                     }
                     if (BitUtil.check(mask, 4)) {
                         data.skipBytes(9); // name
                     }
-                    break;
-                default:
-                    break;
+                }
             }
             i += 1;
         }
@@ -209,101 +196,58 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
         String[] values = data.split(",|\r\n");
         for (int i = 0; i < Math.min(keys.length, values.length); i++) {
             switch (keys[i]) {
-                case "SA":
-                    position.set(Position.KEY_SATELLITES, Integer.parseInt(values[i]));
-                    break;
-                case "MV":
-                    position.set(Position.KEY_POWER, Integer.parseInt(values[i]) * 0.1);
-                    break;
-                case "BV":
-                    position.set(Position.KEY_BATTERY, Integer.parseInt(values[i]) * 0.1);
-                    break;
-                case "GQ":
-                    cellTower.setSignalStrength(Integer.parseInt(values[i]));
-                    break;
-                case "CE":
-                    cellTower.setCellId(Long.parseLong(values[i]));
-                    break;
-                case "LC":
-                    cellTower.setLocationAreaCode(Integer.parseInt(values[i]));
-                    break;
-                case "CN":
+                case "SA" -> position.set(Position.KEY_SATELLITES, Integer.parseInt(values[i]));
+                case "MV" -> position.set(Position.KEY_POWER, Integer.parseInt(values[i]) * 0.1);
+                case "BV" -> position.set(Position.KEY_BATTERY, Integer.parseInt(values[i]) * 0.1);
+                case "GQ" -> cellTower.setSignalStrength(Integer.parseInt(values[i]));
+                case "CE" -> cellTower.setCellId(Long.parseLong(values[i]));
+                case "LC" -> cellTower.setLocationAreaCode(Integer.parseInt(values[i]));
+                case "CN" -> {
                     if (values[i].length() > 3) {
                         cellTower.setMobileCountryCode(Integer.parseInt(values[i].substring(0, 3)));
                         cellTower.setMobileNetworkCode(Integer.parseInt(values[i].substring(3)));
                     }
-                    break;
-                case "PC":
-                    position.set(Position.PREFIX_COUNT + 1, Integer.parseInt(values[i]));
-                    break;
-                case "AT":
-                    position.setAltitude(Integer.parseInt(values[i]));
-                    break;
-                case "RP":
-                    position.set(Position.KEY_RPM, Integer.parseInt(values[i]));
-                    break;
-                case "GS":
-                    position.set(Position.KEY_RSSI, Integer.parseInt(values[i]));
-                    break;
-                case "DT":
-                    position.set(Position.KEY_ARCHIVE, Integer.parseInt(values[i]) == 1);
-                    break;
-                case "VN":
-                    position.set(Position.KEY_VIN, values[i]);
-                    break;
-                case "TR":
-                    position.set(Position.KEY_THROTTLE, Integer.parseInt(values[i]));
-                    break;
-                case "ET":
-                    position.set(Position.KEY_COOLANT_TEMP, Integer.parseInt(values[i]));
-                    break;
-                case "FL":
-                    position.set(Position.KEY_FUEL_LEVEL, Integer.parseInt(values[i]));
-                    break;
-                case "FC":
-                    position.set(Position.KEY_FUEL_CONSUMPTION, Integer.parseInt(values[i]));
-                    break;
-                case "AV1":
-                    position.set(Position.PREFIX_ADC + 1, Integer.parseInt(values[i]));
-                    break;
-                case "CD":
-                    position.set(Position.KEY_ICCID, values[i]);
-                    break;
-                case "EH":
-                    position.set(Position.KEY_HOURS, UnitsConverter.msFromHours(Integer.parseInt(values[i]) * 0.1));
-                    break;
-                case "IA":
-                    position.set("intakeTemp", Integer.parseInt(values[i]));
-                    break;
-                case "EL":
-                    position.set(Position.KEY_ENGINE_LOAD, Integer.parseInt(values[i]));
-                    break;
-                case "HA":
+                }
+                case "PC" -> position.set(Position.PREFIX_COUNT + 1, Integer.parseInt(values[i]));
+                case "AT" -> position.setAltitude(Integer.parseInt(values[i]));
+                case "RP" -> position.set(Position.KEY_RPM, Integer.parseInt(values[i]));
+                case "GS" -> position.set(Position.KEY_RSSI, Integer.parseInt(values[i]));
+                case "DT" -> position.set(Position.KEY_ARCHIVE, Integer.parseInt(values[i]) == 1);
+                case "VN" -> position.set(Position.KEY_VIN, values[i]);
+                case "TR" -> position.set(Position.KEY_THROTTLE, Integer.parseInt(values[i]));
+                case "ET" -> position.set(Position.KEY_COOLANT_TEMP, Integer.parseInt(values[i]));
+                case "FL" -> position.set(Position.KEY_FUEL_LEVEL, Integer.parseInt(values[i]));
+                case "FC" -> position.set(Position.KEY_FUEL_CONSUMPTION, Integer.parseInt(values[i]));
+                case "AV1" -> position.set(Position.PREFIX_ADC + 1, Integer.parseInt(values[i]));
+                case "CD" -> position.set(Position.KEY_ICCID, values[i]);
+                case "EH" ->
+                        position.set(Position.KEY_HOURS, UnitsConverter.msFromHours(Integer.parseInt(values[i]) * 0.1));
+                case "IA" -> position.set("intakeTemp", Integer.parseInt(values[i]));
+                case "EL" -> position.set(Position.KEY_ENGINE_LOAD, Integer.parseInt(values[i]));
+                case "HA" -> {
                     if (Integer.parseInt(values[i]) > 0) {
                         position.set(Position.KEY_ALARM, Position.ALARM_ACCELERATION);
                     }
-                    break;
-                case "HB":
+                }
+                case "HB" -> {
                     if (Integer.parseInt(values[i]) > 0) {
                         position.set(Position.KEY_ALARM, Position.ALARM_BRAKING);
                     }
-                    break;
-                case "HC":
+                }
+                case "HC" -> {
                     if (Integer.parseInt(values[i]) > 0) {
                         position.set(Position.KEY_ALARM, Position.ALARM_CORNERING);
                     }
-                    break;
-                case "MT":
-                    position.set(Position.KEY_MOTION, Integer.parseInt(values[i]) > 0);
-                    break;
-                case "BC":
+                }
+                case "MT" -> position.set(Position.KEY_MOTION, Integer.parseInt(values[i]) > 0);
+                case "BC" -> {
                     String[] beaconValues = values[i].split(":");
                     decodeBeaconData(
                             position, Integer.parseInt(beaconValues[0]), Integer.parseInt(beaconValues[1]),
                             Unpooled.wrappedBuffer(DataConverter.parseHex(beaconValues[2])));
-                    break;
-                default:
-                    break;
+                }
+                default -> {
+                }
             }
         }
 
@@ -322,320 +266,122 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
         String[] keys = form.substring(1).split("%");
         for (String key : keys) {
             switch (key) {
-                case "SA":
-                    position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
-                    break;
-                case "MT":
-                    position.set(Position.KEY_MOTION, buf.readUnsignedByte() > 0);
-                    break;
-                case "MV":
-                    position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.1);
-                    break;
-                case "BV":
-                    position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.1);
-                    break;
-                case "GQ":
-                    cellTower.setSignalStrength((int) buf.readUnsignedByte());
-                    break;
-                case "CE":
-                    cellTower.setCellId(buf.readUnsignedInt());
-                    break;
-                case "LC":
-                    cellTower.setLocationAreaCode(buf.readUnsignedShort());
-                    break;
-                case "CN":
+                case "SA" -> position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+                case "MT" -> position.set(Position.KEY_MOTION, buf.readUnsignedByte() > 0);
+                case "MV" -> position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.1);
+                case "BV" -> position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.1);
+                case "GQ" -> cellTower.setSignalStrength((int) buf.readUnsignedByte());
+                case "CE" -> cellTower.setCellId(buf.readUnsignedInt());
+                case "LC" -> cellTower.setLocationAreaCode(buf.readUnsignedShort());
+                case "CN" -> {
                     int combinedMobileCodes = (int) (buf.readUnsignedInt() % 100000); // cccnn
                     cellTower.setMobileCountryCode(combinedMobileCodes / 100);
                     cellTower.setMobileNetworkCode(combinedMobileCodes % 100);
-                    break;
-                case "RL":
-                    buf.readUnsignedByte(); // rxlev
-                    break;
-                case "PC":
-                    position.set(Position.PREFIX_COUNT + 1, buf.readUnsignedInt());
-                    break;
-                case "AT":
-                    position.setAltitude(buf.readUnsignedInt());
-                    break;
-                case "RP":
-                    position.set(Position.KEY_RPM, buf.readUnsignedShort());
-                    break;
-                case "GS":
-                    position.set(Position.KEY_RSSI, buf.readUnsignedByte());
-                    break;
-                case "DT":
-                    position.set(Position.KEY_ARCHIVE, buf.readUnsignedByte() == 1);
-                    break;
-                case "VN":
-                    position.set(Position.KEY_VIN, readString(buf));
-                    break;
-                case "MF":
-                    buf.readUnsignedShort(); // mass air flow rate
-                    break;
-                case "EL":
-                    buf.readUnsignedByte(); // engine load
-                    break;
-                case "TR":
-                    position.set(Position.KEY_THROTTLE, buf.readUnsignedByte());
-                    break;
-                case "ET":
-                    position.set(Position.PREFIX_TEMP + 1, buf.readUnsignedShort());
-                    break;
-                case "FL":
-                    position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte());
-                    break;
-                case "ML":
-                    buf.readUnsignedByte(); // mil status
-                    break;
-                case "FC":
-                    position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedInt());
-                    break;
-                case "CI":
-                    readString(buf); // format string
-                    break;
-                case "AV1":
-                    position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort());
-                    break;
-                case "NC":
-                    readString(buf); // gsm neighbor cell info
-                    break;
-                case "SM":
-                    buf.readUnsignedShort(); // max speed between reports
-                    break;
-                case "GL":
-                    readString(buf); // google link
-                    break;
-                case "MA":
-                    readString(buf); // mac address
-                    break;
-                case "PD":
-                    buf.readUnsignedByte(); // pending code status
-                    break;
-                case "CD":
-                    position.set(Position.KEY_ICCID, readString(buf));
-                    break;
-                case "CM":
-                    buf.readLong(); // imsi
-                    break;
-                case "GN":
-                    buf.skipBytes(60); // g sensor data
-                    break;
-                case "GV":
-                    buf.skipBytes(6); // maximum g force
-                    break;
-                case "ME":
-                    buf.readLong(); // imei
-                    break;
-                case "IA":
-                    buf.readUnsignedByte(); // intake air temperature
-                    break;
-                case "MP":
-                    buf.readUnsignedByte(); // manifold absolute pressure
-                    break;
-                case "EO":
-                    position.set(Position.KEY_ODOMETER, UnitsConverter.metersFromMiles(buf.readUnsignedInt()));
-                    break;
-                case "EH":
-                    position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 360000);
-                    break;
-                case "ZO1":
-                    buf.readUnsignedByte(); // brake stroke status
-                    break;
-                case "ZO2":
-                    buf.readUnsignedByte(); // warning indicator status
-                    break;
-                case "ZO3":
-                    buf.readUnsignedByte(); // abs control status
-                    break;
-                case "ZO4":
-                    position.set(Position.KEY_THROTTLE, buf.readUnsignedByte() * 0.4);
-                    break;
-                case "ZO5":
-                    buf.readUnsignedByte(); // parking brake status
-                    break;
-                case "ZO6":
-                    position.set(Position.KEY_OBD_SPEED, buf.readUnsignedByte() * 0.805);
-                    break;
-                case "ZO7":
-                    buf.readUnsignedByte(); // cruise control status
-                    break;
-                case "ZO8":
-                    buf.readUnsignedByte(); // accelector pedal position
-                    break;
-                case "ZO9":
-                    position.set(Position.KEY_ENGINE_LOAD, buf.readUnsignedByte() * 0.5);
-                    break;
-                case "ZO10":
-                    position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte() * 0.5);
-                    break;
-                case "ZO11":
-                    buf.readUnsignedByte(); // engine oil pressure
-                    break;
-                case "ZO12":
-                    buf.readUnsignedByte(); // boost pressure
-                    break;
-                case "ZO13":
-                    buf.readUnsignedByte(); // intake temperature
-                    break;
-                case "ZO14":
-                    position.set(Position.KEY_COOLANT_TEMP, buf.readUnsignedByte());
-                    break;
-                case "ZO15":
-                    buf.readUnsignedByte(); // brake application pressure
-                    break;
-                case "ZO16":
-                    buf.readUnsignedByte(); // brake primary pressure
-                    break;
-                case "ZO17":
-                    buf.readUnsignedByte(); // brake secondary pressure
-                    break;
-                case "ZH1":
-                    buf.readUnsignedShort(); // cargo weight
-                    break;
-                case "ZH2":
-                    position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedShort() * 16.428 / 3600);
-                    break;
-                case "ZH3":
-                    position.set(Position.KEY_RPM, buf.readUnsignedShort() * 0.25);
-                    break;
-                case "ZL1":
-                    buf.readUnsignedInt(); // fuel used (natural gas)
-                    break;
-                case "ZL2":
-                    position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 161);
-                    break;
-                case "ZL3":
-                    buf.readUnsignedInt(); // vehicle hours
-                    break;
-                case "ZL4":
-                    position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 5 * 36000);
-                    break;
-                case "ZS1":
-                    position.set(Position.KEY_VIN, readString(buf));
-                    break;
-                case "JO1":
-                    buf.readUnsignedByte(); // pedals
-                    break;
-                case "JO2":
-                    buf.readUnsignedByte(); // power takeoff device
-                    break;
-                case "JO3":
-                    buf.readUnsignedByte(); // accelector pedal position
-                    break;
-                case "JO4":
-                    position.set(Position.KEY_ENGINE_LOAD, buf.readUnsignedByte());
-                    break;
-                case "JO5":
-                    position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte() * 0.4);
-                    break;
-                case "JO6":
-                    buf.readUnsignedByte(); // fms vehicle interface
-                    break;
-                case "JO7":
-                    buf.readUnsignedByte(); // driver 2
-                    break;
-                case "JO8":
-                    buf.readUnsignedByte(); // driver 1
-                    break;
-                case "JO9":
-                    buf.readUnsignedByte(); // drivers
-                    break;
-                case "JO10":
-                    buf.readUnsignedByte(); // system information
-                    break;
-                case "JO11":
-                    position.set(Position.KEY_COOLANT_TEMP, buf.readUnsignedByte() - 40);
-                    break;
-                case "JO12":
-                    buf.readUnsignedByte(); // pto engaged
-                    break;
-                case "JH1":
-                    position.set(Position.KEY_OBD_SPEED, buf.readUnsignedShort() / 256.0);
-                    break;
-                case "JH2":
-                    position.set(Position.KEY_RPM, buf.readUnsignedShort() * 0.125);
-                    break;
-                case "JH3":
-                case "JH4":
-                case "JH5":
-                case "JH6":
-                case "JH7":
+                }
+                case "RL" -> buf.readUnsignedByte(); // rxlev
+                case "PC" -> position.set(Position.PREFIX_COUNT + 1, buf.readUnsignedInt());
+                case "AT" -> position.setAltitude(buf.readUnsignedInt());
+                case "RP" -> position.set(Position.KEY_RPM, buf.readUnsignedShort());
+                case "GS" -> position.set(Position.KEY_RSSI, buf.readUnsignedByte());
+                case "DT" -> position.set(Position.KEY_ARCHIVE, buf.readUnsignedByte() == 1);
+                case "VN" -> position.set(Position.KEY_VIN, readString(buf));
+                case "MF" -> buf.readUnsignedShort(); // mass air flow rate
+                case "EL" -> buf.readUnsignedByte(); // engine load
+                case "TR" -> position.set(Position.KEY_THROTTLE, buf.readUnsignedByte());
+                case "ET" -> position.set(Position.PREFIX_TEMP + 1, buf.readUnsignedShort());
+                case "FL" -> position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte());
+                case "ML" -> buf.readUnsignedByte(); // mil status
+                case "FC" -> position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedInt());
+                case "CI" -> readString(buf); // format string
+                case "AV1" -> position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort());
+                case "NC" -> readString(buf); // gsm neighbor cell info
+                case "SM" -> buf.readUnsignedShort(); // max speed between reports
+                case "GL" -> readString(buf); // google link
+                case "MA" -> readString(buf); // mac address
+                case "PD" -> buf.readUnsignedByte(); // pending code status
+                case "CD" -> position.set(Position.KEY_ICCID, readString(buf));
+                case "CM" -> buf.readLong(); // imsi
+                case "GN" -> buf.skipBytes(60); // g sensor data
+                case "GV" -> buf.skipBytes(6); // maximum g force
+                case "ME" -> buf.readLong(); // imei
+                case "IA" -> buf.readUnsignedByte(); // intake air temperature
+                case "MP" -> buf.readUnsignedByte(); // manifold absolute pressure
+                case "EO" -> position.set(Position.KEY_ODOMETER, UnitsConverter.metersFromMiles(buf.readUnsignedInt()));
+                case "EH" -> position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 360000);
+                case "ZO1" -> buf.readUnsignedByte(); // brake stroke status
+                case "ZO2" -> buf.readUnsignedByte(); // warning indicator status
+                case "ZO3" -> buf.readUnsignedByte(); // abs control status
+                case "ZO4" -> position.set(Position.KEY_THROTTLE, buf.readUnsignedByte() * 0.4);
+                case "ZO5" -> buf.readUnsignedByte(); // parking brake status
+                case "ZO6" -> position.set(Position.KEY_OBD_SPEED, buf.readUnsignedByte() * 0.805);
+                case "ZO7" -> buf.readUnsignedByte(); // cruise control status
+                case "ZO8" -> buf.readUnsignedByte(); // accelector pedal position
+                case "ZO9" -> position.set(Position.KEY_ENGINE_LOAD, buf.readUnsignedByte() * 0.5);
+                case "ZO10" -> position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte() * 0.5);
+                case "ZO11" -> buf.readUnsignedByte(); // engine oil pressure
+                case "ZO12" -> buf.readUnsignedByte(); // boost pressure
+                case "ZO13" -> buf.readUnsignedByte(); // intake temperature
+                case "ZO14" -> position.set(Position.KEY_COOLANT_TEMP, buf.readUnsignedByte());
+                case "ZO15" -> buf.readUnsignedByte(); // brake application pressure
+                case "ZO16" -> buf.readUnsignedByte(); // brake primary pressure
+                case "ZO17" -> buf.readUnsignedByte(); // brake secondary pressure
+                case "ZH1" -> buf.readUnsignedShort(); // cargo weight
+                case "ZH2" -> position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedShort() * 16.428 / 3600);
+                case "ZH3" -> position.set(Position.KEY_RPM, buf.readUnsignedShort() * 0.25);
+                case "ZL1" -> buf.readUnsignedInt(); // fuel used (natural gas)
+                case "ZL2" -> position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 161);
+                case "ZL3" -> buf.readUnsignedInt(); // vehicle hours
+                case "ZL4" -> position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 5 * 36000);
+                case "ZS1" -> position.set(Position.KEY_VIN, readString(buf));
+                case "JO1" -> buf.readUnsignedByte(); // pedals
+                case "JO2" -> buf.readUnsignedByte(); // power takeoff device
+                case "JO3" -> buf.readUnsignedByte(); // accelector pedal position
+                case "JO4" -> position.set(Position.KEY_ENGINE_LOAD, buf.readUnsignedByte());
+                case "JO5" -> position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte() * 0.4);
+                case "JO6" -> buf.readUnsignedByte(); // fms vehicle interface
+                case "JO7" -> buf.readUnsignedByte(); // driver 2
+                case "JO8" -> buf.readUnsignedByte(); // driver 1
+                case "JO9" -> buf.readUnsignedByte(); // drivers
+                case "JO10" -> buf.readUnsignedByte(); // system information
+                case "JO11" -> position.set(Position.KEY_COOLANT_TEMP, buf.readUnsignedByte() - 40);
+                case "JO12" -> buf.readUnsignedByte(); // pto engaged
+                case "JH1" -> position.set(Position.KEY_OBD_SPEED, buf.readUnsignedShort() / 256.0);
+                case "JH2" -> position.set(Position.KEY_RPM, buf.readUnsignedShort() * 0.125);
+                case "JH3", "JH4", "JH5", "JH6", "JH7" -> {
                     int index = Integer.parseInt(key.substring(2)) - 2;
                     position.set("axleWeight" + index, buf.readUnsignedShort() * 0.5);
-                    break;
-                case "JH8":
-                    position.set(Position.KEY_ODOMETER_SERVICE, buf.readUnsignedShort() * 5);
-                    break;
-                case "JH9":
-                    buf.readUnsignedShort(); // tachograph speed
-                    break;
-                case "JH10":
-                    buf.readUnsignedShort(); // ambient air temperature
-                    break;
-                case "JH11":
-                    position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedShort() * 0.05);
-                    break;
-                case "JH12":
-                    buf.readUnsignedShort(); // fuel economy
-                    break;
-                case "JL1":
-                    position.set(Position.KEY_FUEL_USED, buf.readUnsignedInt() * 0.5);
-                    break;
-                case "JL2":
-                    position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 5 * 36000);
-                    break;
-                case "JL3":
-                    position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 1000);
-                    break;
-                case "JL4":
-                    position.set(Position.KEY_FUEL_USED, buf.readUnsignedInt() * 0.001);
-                    break;
-                case "JS1":
-                    position.set(Position.KEY_VIN, readString(buf));
-                    break;
-                case "JS2":
-                    readString(buf); // fms version supported
-                    break;
-                case "JS3":
-                    position.set("driver1", readString(buf));
-                    break;
-                case "JS4":
-                    position.set("driver2", readString(buf));
-                    break;
-                case "JN1":
-                    buf.readUnsignedInt(); // cruise control distance
-                    break;
-                case "JN2":
-                    buf.readUnsignedInt(); // excessive idling time
-                    break;
-                case "JN3":
-                    buf.readUnsignedInt(); // excessive idling fuel
-                    break;
-                case "JN4":
-                    buf.readUnsignedInt(); // pto time
-                    break;
-                case "JN5":
-                    buf.readUnsignedInt(); // pto fuel
-                    break;
-                case "IN0":
-                    position.set(Position.KEY_IGNITION, buf.readUnsignedByte() > 0);
-                    break;
-                case "IN1":
-                case "IN2":
-                case "IN3":
+                }
+                case "JH8" -> position.set(Position.KEY_ODOMETER_SERVICE, buf.readUnsignedShort() * 5);
+                case "JH9" -> buf.readUnsignedShort(); // tachograph speed
+                case "JH10" -> buf.readUnsignedShort(); // ambient air temperature
+                case "JH11" -> position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedShort() * 0.05);
+                case "JH12" -> buf.readUnsignedShort(); // fuel economy
+                case "JL1" -> position.set(Position.KEY_FUEL_USED, buf.readUnsignedInt() * 0.5);
+                case "JL2" -> position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 5 * 36000);
+                case "JL3" -> position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 1000);
+                case "JL4" -> position.set(Position.KEY_FUEL_USED, buf.readUnsignedInt() * 0.001);
+                case "JS1" -> position.set(Position.KEY_VIN, readString(buf));
+                case "JS2" -> readString(buf); // fms version supported
+                case "JS3" -> position.set("driver1", readString(buf));
+                case "JS4" -> position.set("driver2", readString(buf));
+                case "JN1" -> buf.readUnsignedInt(); // cruise control distance
+                case "JN2" -> buf.readUnsignedInt(); // excessive idling time
+                case "JN3" -> buf.readUnsignedInt(); // excessive idling fuel
+                case "JN4" -> buf.readUnsignedInt(); // pto time
+                case "JN5" -> buf.readUnsignedInt(); // pto fuel
+                case "IN0" -> position.set(Position.KEY_IGNITION, buf.readUnsignedByte() > 0);
+                case "IN1", "IN2", "IN3" -> {
                     position.set(Position.PREFIX_IN + key.charAt(2), buf.readUnsignedByte() > 0);
-                    break;
-                case "HA":
+                }
+                case "HA" -> {
                     position.set(Position.KEY_ALARM, buf.readUnsignedByte() > 0 ? Position.ALARM_ACCELERATION : null);
-                    break;
-                case "HB":
+                }
+                case "HB" -> {
                     position.set(Position.KEY_ALARM, buf.readUnsignedByte() > 0 ? Position.ALARM_BRAKING : null);
-                    break;
-                case "HC":
+                }
+                case "HC" -> {
                     position.set(Position.KEY_ALARM, buf.readUnsignedByte() > 0 ? Position.ALARM_CORNERING : null);
-                    break;
-                default:
-                    break;
+                }
             }
         }