Bugfix: Respect declared namespace prefixes

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java

@@ -161,6 +161,143 @@ public class GPXTrackImporterTest {
         ), importedTrackPoints);
     }
 
+    @LargeTest
+    @Test
+    public void gpx_with_power_pwd() throws IOException {
+        // given
+        XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter));
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx_with_power_pwr);
+
+        // when
+        // 1. import
+        importTrackId = importer.importFile(inputStream).get(0);
+
+        // then
+        // 2. track
+        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
+        assertNotNull(importedTrack);
+        assertEquals("", importedTrack.activityTypeLocalized());
+        assertEquals("", importedTrack.description());
+        assertEquals("gpx with power", importedTrack.name());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.activityType());
+
+        // 3. trackpoints
+        List<TrackPoint> importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId);
+        assertEquals(3, importedTrackPoints.size());
+
+        TrackPointAssert a = new TrackPointAssert();
+        a.assertEquals(List.of(
+                new TrackPoint(null, TrackPoint.Type.SEGMENT_START_AUTOMATIC,
+                        new Position(
+                                Instant.parse("2021-09-07T22:10:19Z"),
+                                30.14185982, -40.3863038, null,
+                                Altitude.WGS84.of(-5), null,
+                                null,
+                                null),
+                        null,
+                        null,
+                        null,
+                        null,
+                        new Power(100f),
+                        null
+                ),
+                new TrackPoint(null, TrackPoint.Type.TRACKPOINT,
+                        new Position(
+                                Instant.parse("2021-09-07T22:11:07Z"),
+                                30.14184657, -40.38670089, null,
+                                Altitude.WGS84.of(-5), null,
+                                null,
+                                Speed.of(0.7976524233818054)),
+                        null,
+                        null,
+                        null,
+                        null,
+                        new Power(110f),
+                        null),
+                new TrackPoint(null, TrackPoint.Type.TRACKPOINT,
+                        new Position(
+                                Instant.parse("2021-09-07T22:12:00Z"),
+                                30.14185982, -40.3863038, null,
+                                Altitude.WGS84.of(-5), null,
+                                null,
+                                Speed.of(0.7224021553993225)),
+                        null,
+                        null,
+                        null,
+                        null,
+                        new Power(150f),
+                        null)
+        ), importedTrackPoints);
+    }
+    @LargeTest
+    @Test
+    public void gpx_with_power_gpxpx() throws IOException {
+        // given
+        XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter));
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx_with_power_gpxpx);
+
+        // when
+        // 1. import
+        importTrackId = importer.importFile(inputStream).get(0);
+
+        // then
+        // 2. track
+        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
+        assertNotNull(importedTrack);
+        assertEquals("", importedTrack.activityTypeLocalized());
+        assertEquals("", importedTrack.description());
+        assertEquals("gpx with power", importedTrack.name());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.activityType());
+
+        // 3. trackpoints
+        List<TrackPoint> importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId);
+        assertEquals(3, importedTrackPoints.size());
+
+        TrackPointAssert a = new TrackPointAssert();
+        a.assertEquals(List.of(
+                new TrackPoint(null, TrackPoint.Type.SEGMENT_START_AUTOMATIC,
+                        new Position(
+                                Instant.parse("2021-09-07T22:10:19Z"),
+                                30.14185982, -40.3863038, null,
+                                Altitude.WGS84.of(-5), null,
+                                null,
+                                null),
+                        null,
+                        null,
+                        null,
+                        null,
+                        new Power(100f),
+                        null
+                ),
+                new TrackPoint(null, TrackPoint.Type.TRACKPOINT,
+                        new Position(
+                                Instant.parse("2021-09-07T22:11:07Z"),
+                                30.14184657, -40.38670089, null,
+                                Altitude.WGS84.of(-5), null,
+                                null,
+                                Speed.of(0.7976524233818054)),
+                        null,
+                        null,
+                        null,
+                        null,
+                        new Power(110f),
+                        null),
+                new TrackPoint(null, TrackPoint.Type.TRACKPOINT,
+                        new Position(
+                                Instant.parse("2021-09-07T22:12:00Z"),
+                                30.14185982, -40.3863038, null,
+                                Altitude.WGS84.of(-5), null,
+                                null,
+                                Speed.of(0.7224021553993225)),
+                        null,
+                        null,
+                        null,
+                        null,
+                        new Power(150f),
+                        null)
+        ), importedTrackPoints);
+    }
+
     @LargeTest
     @Test
     public void gpx_speed_no_namespace() throws IOException {

src/androidTest/res/raw/gpx_with_power_gpxpx.gpx

@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
+<gpx version="1.1" creator="Cruiser" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gpxpx="http://www.garmin.com/xmlschemas/PowerExtension/v1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+  <trk>
+    <name>gpx with power</name>
+    <trkseg>
+      <trkpt lat="30.14185982" lon="-40.3863038">
+        <ele>-5</ele>
+        <time>2021-09-07T22:10:19Z</time>
+        <hdop>4</hdop>
+        <extensions>
+          <gpxpx:PowerInWatts>100</gpxpx:PowerInWatts>
+        </extensions>
+      </trkpt>
+      <trkpt lat="30.14184657" lon="-40.38670089">
+        <ele>-5</ele>
+        <time>2021-09-07T22:11:07Z</time>
+        <hdop>4</hdop>
+        <extensions>
+          <gpxpx:PowerInWatts>110</gpxpx:PowerInWatts>
+        </extensions>
+      </trkpt>
+      <trkpt lat="30.14185982" lon="-40.3863038">
+        <ele>-5</ele>
+        <time>2021-09-07T22:12:00Z</time>
+        <hdop>4</hdop>
+        <extensions>
+          <gpxpx:PowerInWatts>150</gpxpx:PowerInWatts>
+        </extensions>
+      </trkpt>
+    </trkseg>
+  </trk>
+</gpx>

src/androidTest/res/raw/gpx_with_power_pwr.gpx

@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
+<gpx version="1.1" creator="Cruiser" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pwr="http://www.garmin.com/xmlschemas/PowerExtension/v1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+  <trk>
+    <name>gpx with power</name>
+    <trkseg>
+      <trkpt lat="30.14185982" lon="-40.3863038">
+        <ele>-5</ele>
+        <time>2021-09-07T22:10:19Z</time>
+        <hdop>4</hdop>
+        <extensions>
+          <pwr:PowerInWatts>100</pwr:PowerInWatts>
+        </extensions>
+      </trkpt>
+      <trkpt lat="30.14184657" lon="-40.38670089">
+        <ele>-5</ele>
+        <time>2021-09-07T22:11:07Z</time>
+        <hdop>4</hdop>
+        <extensions>
+          <pwr:PowerInWatts>110</pwr:PowerInWatts>
+        </extensions>
+      </trkpt>
+      <trkpt lat="30.14185982" lon="-40.3863038">
+        <ele>-5</ele>
+        <time>2021-09-07T22:12:00Z</time>
+        <hdop>4</hdop>
+        <extensions>
+          <pwr:PowerInWatts>150</pwr:PowerInWatts>
+        </extensions>
+      </trkpt>
+    </trkseg>
+  </trk>
+</gpx>

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

@@ -74,28 +74,44 @@ public class GPXTrackImporter extends DefaultHandler implements XMLImporter.Trac
     private static final String TAG_TRACK_POINT = "trkpt";
     private static final String TAG_TRACK_SEGMENT = "trkseg";
     private static final String TAG_TYPE = "type";
-    private static final String TAG_TYPE_LOCALIZED = "opentracks:typeTranslated";
     private static final String TAG_MARKER = "wpt";
-    private static final String TAG_ID = "opentracks:trackid";
 
     private static final String ATTRIBUTE_LAT = "lat";
     private static final String ATTRIBUTE_LON = "lon";
 
-    private static final String TAG_EXTENSION_SPEED = "gpxtpx:speed";
     /**
      * Often speed is exported without the proper namespace.
      */
     private static final String TAG_EXTENSION_SPEED_COMPAT = "speed";
-    private static final String TAG_EXTENSION_HEARTRATE = "gpxtpx:hr";
-    private static final String TAG_EXTENSION_TEMPERATURE = "gpxtpx:atemp";
-    private static final String TAG_EXTENSION_CADENCE = "gpxtpx:cad";
-    private static final String TAG_EXTENSION_POWER = "pwr:PowerInWatts";
 
-    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 static final String TAG_EXTENSION_ACCURACY_VERTICAL = "opentracks:accuracy_vertical";
+    /**
+     * Garmin Trackpoint Extensions.
+     */
+    private static final String NS_GARMIN_TRACKPOINT_EXTENSION_V1 = "http://www.garmin.com/xmlschemas/TrackPointExtension/v1";
+    private static final String NS_GARMIN_TRACKPOINT_EXTENSION_V2 = "http://www.garmin.com/xmlschemas/TrackPointExtension/v2";
+    private static final String TAG_GARMIN_TPX_EXTENSION_SPEED = "speed";
+    private static final String TAG_GARMIN_TPX_EXTENSION_HEARTRATE = "hr";
+    private static final String TAG_GARMIN_TPX_EXTENSION_TEMPERATURE = "atemp";
+    private static final String TAG_GARMIN_TPX_EXTENSION_CADENCE = "cad";
+
+    /**
+     * Garmin Trackpoint Extensions.
+     */
+    private static final String NS_GARMIN_POWER_EXTENSION_V1 = "http://www.garmin.com/xmlschemas/PowerExtension/v1";
+    private static final String TAG_GARMIN_PWR_EXTENSION_POWER = "PowerInWatts";
+
+    /**
+     * OpenTracks Extensions.
+     */
+    private static final String NS_OPENTRACKS = "http://opentracksapp.com/xmlschemas/v1";
+    private static final String TAG_OPENTRACKS_EXTENSION_TRACK_ID = "trackid";
+    private static final String TAG_OPENTRACKS_EXTENSION_TYPE_LOCALIZED = "typeTranslated";
+    private static final String TAG_OPENTRACKS_EXTENSION_GAIN = "gain";
+    private static final String TAG_OPENTRACKS_EXTENSION_LOSS = "loss";
+    private static final String TAG_OPENTRACKS_EXTENSION_DISTANCE = "distance";
+    private static final String TAG_OPENTRACKS_EXTENSION_ACCURACY_HORIZONTAL = "accuracy_horizontal";
+    private static final String TAG_OPENTRACKS_EXTENSION_ACCURACY_VERTICAL = "accuracy_vertical";
+
     private Locator locator;
 
     private final Context context;
@@ -169,107 +185,127 @@ public class GPXTrackImporter extends DefaultHandler implements XMLImporter.Trac
 
     @Override
     public void endElement(String uri, String localName, String qName) {
-        switch (qName) {
-            case TAG_GPX -> onFileEnd();
-            case TAG_MARKER -> onMarkerEnd();
-            case TAG_TRACK -> {
-                if (activityTypeLocalized == null) {
-                    // Backward compatibility: up v4.9.1 as <type> contained localized content.
-                    activityTypeLocalized = activityType;
+        if (NS_GARMIN_TRACKPOINT_EXTENSION_V1.equals(uri) || NS_GARMIN_TRACKPOINT_EXTENSION_V2.equals(uri)) {
+            switch (localName) {
+                case TAG_GARMIN_TPX_EXTENSION_SPEED -> {
+                    if (content != null) {
+                        speed = content.trim();
+                    }
                 }
-                trackImporter.setTrackData(context, name, uuid, description, activityTypeLocalized, activityType, zoneOffset);
-                zoneOffset = null;
-            }
-            case TAG_TRACK_SEGMENT -> onTrackSegmentEnd();
-            case TAG_TRACK_POINT -> {
-                TrackPoint trackPoint = createTrackPoint();
-                if (trackPoint != null) currentSegment.add(trackPoint);
-            }
-            case TAG_NAME -> {
-                if (content != null) {
-                    name = content.trim();
+                case TAG_GARMIN_TPX_EXTENSION_HEARTRATE -> {
+                    if (content != null) {
+                        heartrate = content.trim();
+                    }
                 }
-            }
-            case TAG_DESCRIPTION -> {
-                if (content != null) {
-                    description = content.trim();
+                case TAG_GARMIN_TPX_EXTENSION_TEMPERATURE -> {
+                    if (content != null) {
+                        temperature = content.trim();
+                    }
                 }
-            }
-            case TAG_TYPE -> { //Track or Marker/WPT
-                if (content != null) {
-                    // In older  version this might be localized content.
-                    activityType = content.trim();
-                    markerType = content.trim();
+                case TAG_GARMIN_TPX_EXTENSION_CADENCE -> {
+                    if (content != null) {
+                        cadence = content.trim();
+                    }
                 }
+                default -> Log.w(TAG, "Unknown Garmin trackpoint extension tag " + localName);
             }
-            case TAG_TYPE_LOCALIZED -> {
-                if (content != null) {
-                    activityTypeLocalized = content.trim();
+        } else if (NS_GARMIN_POWER_EXTENSION_V1.equals(uri)) {
+            //noinspection SwitchStatementWithTooFewBranches
+            switch (localName) {
+                case TAG_GARMIN_PWR_EXTENSION_POWER -> {
+                    if (content != null) {
+                        power = content.trim();
+                    }
                 }
+                default -> Log.w(TAG, "Unknown Garmin power extension tag " + localName);
             }
-            case TAG_TIME -> {
-                if (content != null) {
-                    time = content.trim();
+        } else if (NS_OPENTRACKS.equals(uri)) {
+            switch (localName) {
+                case TAG_OPENTRACKS_EXTENSION_TRACK_ID -> {
+                    if (content != null) {
+                        uuid = content.trim();
+                    }
                 }
-            }
-            case TAG_ALTITUDE -> {
-                if (content != null) {
-                    altitude = content.trim();
+                case TAG_OPENTRACKS_EXTENSION_TYPE_LOCALIZED -> {
+                    if (content != null) {
+                        activityTypeLocalized = content.trim();
+                    }
                 }
-            }
-            case TAG_EXTENSION_SPEED, TAG_EXTENSION_SPEED_COMPAT -> {
-                if (content != null) {
-                    speed = content.trim();
+                case TAG_OPENTRACKS_EXTENSION_GAIN -> {
+                    if (content != null) {
+                        gain = content.trim();
+                    }
                 }
-            }
-            case TAG_EXTENSION_HEARTRATE -> {
-                if (content != null) {
-                    heartrate = content.trim();
+                case TAG_OPENTRACKS_EXTENSION_LOSS -> {
+                    if (content != null) {
+                        loss = content.trim();
+                    }
                 }
-            }
-            case TAG_EXTENSION_TEMPERATURE -> {
-                if (content != null) {
-                    temperature = content.trim();
+                case TAG_OPENTRACKS_EXTENSION_DISTANCE -> {
+                    if (content != null) {
+                        sensorDistance = content.trim();
+                    }
                 }
-            }
-            case TAG_EXTENSION_CADENCE -> {
-                if (content != null) {
-                    cadence = content.trim();
+                case TAG_OPENTRACKS_EXTENSION_ACCURACY_HORIZONTAL -> {
+                    if (content != null) {
+                        accuracyHorizontal = content.trim();
+                    }
                 }
-            }
-            case TAG_EXTENSION_POWER -> {
-                if (content != null) {
-                    power = content.trim();
+                case TAG_OPENTRACKS_EXTENSION_ACCURACY_VERTICAL -> {
+                    if (content != null) {
+                        accuracyVertical = content.trim();
+                    }
                 }
+                default -> Log.w(TAG, "Unknown OpenTracks extension tag " + localName);
             }
-            case TAG_ID -> {
-                if (content != null) {
-                    uuid = content.trim();
+        } else {
+            switch (qName) {
+                case TAG_GPX -> onFileEnd();
+                case TAG_MARKER -> onMarkerEnd();
+                case TAG_TRACK -> {
+                    if (activityTypeLocalized == null) {
+                        // Backward compatibility: up v4.9.1 as <type> contained localized content.
+                        activityTypeLocalized = activityType;
+                    }
+                    trackImporter.setTrackData(context, name, uuid, description, activityTypeLocalized, activityType, zoneOffset);
+                    zoneOffset = null;
                 }
-            }
-            case TAG_EXTENSION_GAIN -> {
-                if (content != null) {
-                    gain = content.trim();
+                case TAG_TRACK_SEGMENT -> onTrackSegmentEnd();
+                case TAG_TRACK_POINT -> {
+                    TrackPoint trackPoint = createTrackPoint();
+                    if (trackPoint != null) currentSegment.add(trackPoint);
                 }
-            }
-            case TAG_EXTENSION_LOSS -> {
-                if (content != null) {
-                    loss = content.trim();
+                case TAG_NAME -> {
+                    if (content != null) {
+                        name = content.trim();
+                    }
                 }
-            }
-            case TAG_EXTENSION_DISTANCE -> {
-                if (content != null) {
-                    sensorDistance = content.trim();
+                case TAG_DESCRIPTION -> {
+                    if (content != null) {
+                        description = content.trim();
+                    }
                 }
-            }
-            case TAG_EXTENSION_ACCURACY_HORIZONTAL -> {
-                if (content != null) {
-                    accuracyHorizontal = content.trim();
+                case TAG_TYPE -> { //Track or Marker/WPT
+                    if (content != null) {
+                        // In older  version this might be localized content.
+                        activityType = content.trim();
+                        markerType = content.trim();
+                    }
                 }
-            }
-            case TAG_EXTENSION_ACCURACY_VERTICAL -> {
-                if (content != null) {
-                    accuracyVertical = content.trim();
+                case TAG_TIME -> {
+                    if (content != null) {
+                        time = content.trim();
+                    }
+                }
+                case TAG_ALTITUDE -> {
+                    if (content != null) {
+                        altitude = content.trim();
+                    }
+                }
+                case TAG_EXTENSION_SPEED_COMPAT -> {
+                    if (content != null) {
+                        speed = content.trim();
+                    }
                 }
             }
         }