Parse /A=xxxxx altitude from comment even for compressed position reports

Author: sh123

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

@@ -180,8 +180,9 @@ private boolean fromCompressedBinary(byte[] infoData) {
         _position.latitude = getUncompressedCoordinate(latitude.getBytes(), true);
         if (longitude == null) return false;
         _position.longitude = getUncompressedCoordinate(longitude.getBytes(), false);
-        if (comment != null)
+        if (comment != null) {
             _position.comment = TextTools.stripNulls(comment);
+        }
 
         _position.hasSpeed = false;
         _position.hasBearing = false;
@@ -222,6 +223,9 @@ else if (cByte == '{') {
             // TODO, implement
             double rangeMiles = 2 * Math.pow(1.08, sByte);
         }
+
+        // sometimes altitude is coming from comment event for compressed packets
+        _position.comment = parseAltitude(_position.comment);
         return true;
     }
 
@@ -294,22 +298,8 @@ private boolean fromUncompressedBinary(byte[] infoData) {
         }
         if (strTail == null) return true;
 
-        // read altitude (could be anywhere inside the comment)
-        Pattern altitudePattern = Pattern.compile("^.*(/A=\\d{6}).*$", Pattern.DOTALL);
-        Matcher altitudeMatcher = altitudePattern.matcher(strTail);
-        if (altitudeMatcher.matches()) {
-            String altitude = altitudeMatcher.group(1);
-            if (altitude != null) {
-                strTail = strTail.replaceAll(altitude, "");
-                altitude = altitude.split("=")[1];
-                _position.altitudeMeters = UnitTools.feetToMeters(Long.parseLong(altitude));
-                _position.isAltitudeEnabled = true;
-                _position.hasAltitude = true;
-            }
-        } else {
-            _position.isAltitudeEnabled = false;
-            _position.hasAltitude = false;
-        }
+        // try parse altitude
+        strTail = parseAltitude(strTail);
 
         // read PHG range
         Pattern phgPattern = Pattern.compile("^.*(PHG\\d{4}).*$", Pattern.DOTALL);
@@ -340,6 +330,27 @@ private boolean fromUncompressedBinary(byte[] infoData) {
         return true;
     }
 
+    private String parseAltitude(String strData) {
+        String strTail = strData;
+        // read altitude (could be anywhere inside the comment)
+        Pattern altitudePattern = Pattern.compile("^.*(/A=\\d{6}).*$", Pattern.DOTALL);
+        Matcher altitudeMatcher = altitudePattern.matcher(strTail);
+        if (altitudeMatcher.matches()) {
+            String altitude = altitudeMatcher.group(1);
+            if (altitude != null) {
+                strTail = strTail.replaceAll(altitude, "");
+                altitude = altitude.split("=")[1];
+                _position.altitudeMeters = UnitTools.feetToMeters(Long.parseLong(altitude));
+                _position.isAltitudeEnabled = true;
+                _position.hasAltitude = true;
+            }
+        } else {
+            _position.isAltitudeEnabled = false;
+            _position.hasAltitude = false;
+        }
+        return strTail;
+    }
+
     private double getUncompressedCoordinate(byte[] data, boolean isLatitude) {
         double v = (data[0] - 33) * 91 * 91 * 91 +
                 (data[1] - 33) * 91 * 91 +