Changeset 18048 in josm

Timestamp:

2021-07-17T15:51:20+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20677 - fix wrong parsing of RTKLIB .pos files

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/rtklib/RtkLibPosReader.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/rtklib/RtkLibPosReader.java

@@ -83 +83 @@
                             currentwp.put(GpxConstants.RTKLIB_SDN, fields[IDX_SDN]);
                             currentwp.put(GpxConstants.RTKLIB_SDE, fields[IDX_SDE]);
-                            currentwp.put(GpxConstants.RTKLIB_SDE, fields[IDX_SDU]);
+                            currentwp.put(GpxConstants.RTKLIB_SDU, fields[IDX_SDU]);
                             currentwp.put(GpxConstants.RTKLIB_SDNE, fields[IDX_SDNE]);
                             currentwp.put(GpxConstants.RTKLIB_SDEU, fields[IDX_SDEU]);
@@ -90 +90 @@
                             currentwp.put(GpxConstants.RTKLIB_RATIO, fields[IDX_RATIO]);
                             double sdn = Double.parseDouble(fields[IDX_SDN]);
-                            double sde = Double.parseDouble(fields[IDX_SDN]);
+                            double sde = Double.parseDouble(fields[IDX_SDE]);
                             currentwp.put(GpxConstants.PT_HDOP, (float) Math.sqrt(sdn*sdn + sde*sde));
                             waypoints.add(currentwp);

trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java

@@ -51 +51 @@
 
         List<WayPoint> wayPoints = new ArrayList<>(in.getGpxData().tracks.iterator().next().getSegments().iterator().next().getWayPoints());
-        assertEquals(DateUtils.parseInstant("2019-06-08T08:23:12.000Z"), wayPoints.get(0).get(GpxConstants.PT_TIME));
+        WayPoint wp0 = wayPoints.get(0);
+        assertEquals(DateUtils.parseInstant("2019-06-08T08:23:12.000Z"), wp0.get(GpxConstants.PT_TIME));
         assertEquals(DateUtils.parseInstant("2019-06-08T08:23:12.300Z"), wayPoints.get(1).get(GpxConstants.PT_TIME));
         assertEquals(DateUtils.parseInstant("2019-06-08T08:23:12.600Z"), wayPoints.get(2).get(GpxConstants.PT_TIME));
-        assertEquals(wayPoints.get(0).getInstant(), wayPoints.get(0).get(GpxConstants.PT_TIME));
+        assertEquals(wp0.getInstant(), wp0.get(GpxConstants.PT_TIME));
 
-        assertEquals(Instant.parse("2019-06-08T08:23:12.000Z"), wayPoints.get(0).getInstant());
+        assertEquals(Instant.parse("2019-06-08T08:23:12.000Z"), wp0.getInstant());
         assertEquals(Instant.parse("2019-06-08T08:23:12.300Z"), wayPoints.get(1).getInstant());
         assertEquals(Instant.parse("2019-06-08T08:23:12.600Z"), wayPoints.get(2).getInstant());
 
-        assertEquals(new LatLon(46.948881673, -1.484757046), wayPoints.get(0).getCoor());
-        assertEquals(5, wayPoints.get(0).get(GpxConstants.RTKLIB_Q));
-        assertEquals("92.3955", wayPoints.get(0).get(GpxConstants.PT_ELE));
-        assertEquals("2", wayPoints.get(0).get(GpxConstants.PT_SAT));
-        assertEquals("2.2090015", wayPoints.get(0).get(GpxConstants.PT_HDOP).toString().trim());
+        assertEquals(new LatLon(46.948881673, -1.484757046), wp0.getCoor());
+        assertEquals(5, wp0.get(GpxConstants.RTKLIB_Q));
+        assertEquals("92.3955", wp0.get(GpxConstants.PT_ELE));
+        assertEquals("2", wp0.get(GpxConstants.PT_SAT));
+        assertEquals("1.8191757", wp0.get(GpxConstants.PT_HDOP).toString().trim());
+
+        assertEquals("1.5620", wp0.get(GpxConstants.RTKLIB_SDN));
+        assertEquals("0.9325", wp0.get(GpxConstants.RTKLIB_SDE));
+        assertEquals("0.8167", wp0.get(GpxConstants.RTKLIB_SDU));
+        assertEquals("-0.7246", wp0.get(GpxConstants.RTKLIB_SDNE));
+        assertEquals("0.7583", wp0.get(GpxConstants.RTKLIB_SDEU));
+        assertEquals("0.6573", wp0.get(GpxConstants.RTKLIB_SDUN));
     }