Import/Export: horizontal accuracy.

Fixes #683.

src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java

@@ -359,7 +359,7 @@ public class GPXTrackExporter implements TrackExporter {
                 }
 
                 if (trackPoint.hasHorizontalAccuracy()) {
-                    trackPointExtensionContent += ("<opentracks:accuracy>" + DISTANCE_FORMAT.format(trackPoint.getHorizontalAccuracy().toM()) + "</opentracks:accuracy>");
+                    trackPointExtensionContent += ("<opentracks:accuracy_horizontal>" + DISTANCE_FORMAT.format(trackPoint.getHorizontalAccuracy().toM()) + "</opentracks:accuracy_horizontal>");
                 }
 
                 cumulativeDistance = Distance.ofOrNull(cumulateSensorData(trackPoint, sensorPoints, (tp) -> tp.hasSensorDistance() ? tp.getSensorDistance().toM() : null));

src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java

@@ -65,6 +65,7 @@ public class KMLTrackExporter implements TrackExporter {
     public static final String EXTENDED_DATA_TYPE_POWER = "power";
     public static final String EXTENDED_DATA_TYPE_ALTITUDE_GAIN = "elevation_gain";
     public static final String EXTENDED_DATA_TYPE_ALTITUDE_LOSS = "elevation_loss";
+    public static final String EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL = "accuracy_horizontal";
 
     private static final String MARKER_ICON = "http://maps.google.com/mapfiles/kml/pushpin/blue-pushpin.png";
     private static final String TRACK_ICON = "http://earth.google.com/images/kml-icons/track-directional/track-0.png";
@@ -88,6 +89,7 @@ public class KMLTrackExporter implements TrackExporter {
     private final List<Float> heartRateList = new ArrayList<>();
     private final List<Float> altitudeGainList = new ArrayList<>();
     private final List<Float> altitudeLossList = new ArrayList<>();
+    private final List<Float> accuracyHorizontal = new ArrayList<>();
 
     public KMLTrackExporter(Context context, boolean exportPhotos) {
         this.context = context;
@@ -333,6 +335,7 @@ public class KMLTrackExporter implements TrackExporter {
             heartRateList.clear();
             altitudeGainList.clear();
             altitudeLossList.clear();
+            accuracyHorizontal.clear();
         }
     }
 
@@ -362,6 +365,9 @@ public class KMLTrackExporter implements TrackExporter {
             if (altitudeLossList.stream().anyMatch(Objects::nonNull)) {
                 writeSimpleArrayData(altitudeLossList, EXTENDED_DATA_TYPE_ALTITUDE_LOSS);
             }
+            if (accuracyHorizontal.stream().anyMatch(Objects::nonNull)) {
+                writeSimpleArrayData(accuracyHorizontal, EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL);
+            }
             printWriter.println("</SchemaData>");
             printWriter.println("</ExtendedData>");
             printWriter.println("</gx:Track>");
@@ -387,6 +393,7 @@ public class KMLTrackExporter implements TrackExporter {
 
             altitudeGainList.add(trackPoint.hasAltitudeGain() ? trackPoint.getAltitudeGain() : null);
             altitudeLossList.add(trackPoint.hasAltitudeLoss() ? trackPoint.getAltitudeLoss() : null);
+            accuracyHorizontal.add(trackPoint.hasHorizontalAccuracy() ? (float) trackPoint.getHorizontalAccuracy().toM() : null);
         }
     }
 

src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java

@@ -82,6 +82,7 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
     private static final String TAG_EXTENSION_GAIN = "opentracks:gain";
     private static final String TAG_EXTENSION_LOSS = "opentracks:loss";
     private static final String TAG_EXTENSION_DISTANCE = "opentracks:distance";
+    private static final String TAG_EXTENSION_ACCURACY_HORIZONTAL = "opentracks:accuracy_horizontal";
 
     private Locator locator;
 
@@ -106,12 +107,13 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
     private String heartrate;
     private String cadence;
     private String power;
-    protected String markerType;
-    protected String photoUrl;
-    protected String uuid;
-    protected String gain;
-    protected String loss;
-    protected String sensorDistance;
+    private String markerType;
+    private String photoUrl;
+    private String uuid;
+    private String gain;
+    private String loss;
+    private String sensorDistance;
+    private String accuracyHorizontal;
 
     private final LinkedList<TrackPoint> currentSegment = new LinkedList<>();
 
@@ -240,6 +242,11 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
                     sensorDistance = content.trim();
                 }
                 break;
+            case TAG_EXTENSION_ACCURACY_HORIZONTAL:
+                if (content != null) {
+                    accuracyHorizontal = content.trim();
+                }
+                break;
         }
 
         content = "";
@@ -342,6 +349,13 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
                 throw new ParsingException(createErrorMessage(String.format(Locale.US, "Unable to parse distance: %s", sensorDistance)), e);
             }
         }
+        if (accuracyHorizontal != null) {
+            try {
+                trackPoint.setHorizontalAccuracy(Distance.of(accuracyHorizontal));
+            } catch (NumberFormatException e) {
+                throw new ParsingException(createErrorMessage(String.format(Locale.US, "Unable to parse accuracy_horizontal: %s", sensorDistance)), e);
+            }
+        }
 
         return trackPoint;
     }
@@ -357,6 +371,7 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
         loss = null;
 
         sensorDistance = null;
+        accuracyHorizontal = null;
         power = null;
         heartrate = null;
         cadence = null;

src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java

@@ -89,6 +89,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
     private final ArrayList<Float> sensorPowerList = new ArrayList<>();
     private final ArrayList<Float> altitudeGainList = new ArrayList<>();
     private final ArrayList<Float> altitudeLossList = new ArrayList<>();
+    private final ArrayList<Float> accuracyHorizontal = new ArrayList<>();
 
     private final ArrayList<Marker> markers = new ArrayList<>();
 
@@ -294,6 +295,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
         sensorPowerList.clear();
         altitudeGainList.clear();
         altitudeLossList.clear();
+        accuracyHorizontal.clear();
     }
 
     private void onTrackSegmentEnd() {
@@ -333,6 +335,9 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
             if (i < altitudeLossList.size()) {
                 trackPoint.setAltitudeLoss(altitudeLossList.get(i));
             }
+            if (i < accuracyHorizontal.size() && accuracyHorizontal.get(i) != null) {
+                trackPoint.setHorizontalAccuracy(Distance.of(accuracyHorizontal.get(i)));
+            }
 
             // Update TrackPoint type for START / STOP.
             TrackPoint.Type type = trackPoint.getType();
@@ -430,6 +435,9 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
             case KMLTrackExporter.EXTENDED_DATA_TYPE_ALTITUDE_LOSS:
                 altitudeLossList.add(value);
                 break;
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL:
+                accuracyHorizontal.add(value);
+                break;
             default:
                 Log.w(TAG, "Data from extended data " + extendedDataType + " is not (yet) supported.");
         }