Mice device id decoding and formatting

Author: sh123

codec2talkie/src/main/java/com/radio/codec2talkie/maps/MapStations.java

@@ -212,7 +212,7 @@ private String getStatus(StationItem station) {
         String status = station.getStatus();
         String comment = station.getComment();
         if (!status.isBlank() || !comment.isBlank())
-            data += "<br><i>" + status + " " + comment + "</i></hr>";
+            data += "<br><i><font color='#006400'>" + status + " " + comment + "</font></i></hr>";
 
         // device id description
         String deviceIdDescription = station.getDeviceIdDescription();

codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataPositionReport.java

@@ -250,14 +250,24 @@ private boolean fromUncompressedBinary(byte[] infoData) {
         _position.privacyLevel = TextTools.countChars(lat, ' ');
         // NOTE, ambiguity, replace with 0
         lat = lat.replace(' ', '0');
-        _position.latitude = UnitTools.nmeaToDecimal(lat, latSuffix);
+        try {
+            _position.latitude = UnitTools.nmeaToDecimal(lat, latSuffix);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            return false;
+        }
         String table = latLonMatcher.group(3);
         String lon = latLonMatcher.group(4);
         String lonSuffix = latLonMatcher.group(5);
         if (lon == null || lonSuffix == null) return false;
         // NOTE, ambiguity, replace with 0
         lon = lon.replace(' ', '0');
-        _position.longitude = UnitTools.nmeaToDecimal(lon, lonSuffix);
+        try {
+            _position.longitude = UnitTools.nmeaToDecimal(lon, lonSuffix);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            return false;
+        }
         String symbol = latLonMatcher.group(6);
         _position.symbolCode = String.format("%s%s", table, symbol);
         strTail = latLonMatcher.group(7);

codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataPositionReportMicE.java

@@ -1,8 +1,12 @@
 package com.radio.codec2talkie.protocol.aprs;
 
+import android.icu.number.FormattedNumber;
+import android.util.Log;
+
 import com.radio.codec2talkie.protocol.aprs.tools.AprsTools;
 import com.radio.codec2talkie.protocol.message.TextMessage;
 import com.radio.codec2talkie.protocol.position.Position;
+import com.radio.codec2talkie.tools.DeviceIdTools;
 import com.radio.codec2talkie.tools.TextTools;
 import com.radio.codec2talkie.tools.UnitTools;
 
@@ -191,7 +195,12 @@ public void fromBinary(String srcCallsign, String dstCallsign, String digipath,
             latitude.append(c);
         }
 
-        _position.latitude = UnitTools.nmeaToDecimal(latitude.toString(), Character.toString(ns));
+        try {
+            _position.latitude = UnitTools.nmeaToDecimal(latitude.toString(), Character.toString(ns));
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            return;
+        }
         _position.status = isCustom
                 ? _miceMessageReverseTypeMapCustom.get(messageId)
                 : _miceMessageReverseTypeMapStd.get(messageId);
@@ -207,7 +216,12 @@ public void fromBinary(String srcCallsign, String dstCallsign, String digipath,
         int h = ((int)infoData[2] - 28);
 
         String longitude = String.format(Locale.US, "%03d%02d.%02d", d, m, h);
-        _position.longitude = UnitTools.nmeaToDecimal(longitude, Character.toString(we));
+        try {
+            _position.longitude = UnitTools.nmeaToDecimal(longitude, Character.toString(we));
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            return;
+        }
 
         // read course/speed
         int sp = 10 * ((int)infoData[3] - 28);
@@ -244,7 +258,16 @@ public void fromBinary(String srcCallsign, String dstCallsign, String digipath,
             } else {
                 i--;
             }
-            _position.comment = TextTools.stripNulls(new String(Arrays.copyOfRange(infoData, i + 1, infoData.length), StandardCharsets.UTF_8));
+            String comment = new String(Arrays.copyOfRange(infoData, i + 1, infoData.length), StandardCharsets.UTF_8).strip();
+            if (comment.length() >= 2) {
+                String deviceId = comment.substring(comment.length() - 2);
+                String deviceIdDescription = DeviceIdTools.getMiceDeviceDescription(deviceId);
+                if (deviceIdDescription != null) {
+                    _position.deviceIdDescription = deviceIdDescription;
+                    comment = comment.substring(0, comment.length() - 2);
+                }
+            }
+            _position.comment = TextTools.stripNulls(comment);
         }
 
         _position.maidenHead = UnitTools.decimalToMaidenhead(_position.latitude, _position.longitude);

codec2talkie/src/main/java/com/radio/codec2talkie/tools/DeviceIdTools.java

@@ -59,8 +59,8 @@ public static void loadDeviceIdMap(Context context) {
             JSONObject miceJsonObject = jsonObject.getJSONObject("mice");
             Iterator<String> miceDeviceIds = miceJsonObject.keys();
             while (miceDeviceIds.hasNext()) {
-                String miceDeviceId = deviceIds.next();
-                JSONObject jsonDeviceEntry = tocallsJsonObject.getJSONObject(miceDeviceId);
+                String miceDeviceId = miceDeviceIds.next();
+                JSONObject jsonDeviceEntry = miceJsonObject.getJSONObject(miceDeviceId);
                 String description = toDescription(jsonDeviceEntry);
                 if (description == null) continue;
                 _deviceIdMiceMap.put(miceDeviceId, description);