Index: /trunk/data_nodist/2094047.gpx
===================================================================
--- /trunk/data_nodist/2094047.gpx (revision 9384)
+++ /trunk/data_nodist/2094047.gpx (revision 9384)
@@ -0,0 +1,1590 @@
+
+
+
+
+
+ Garmin International
+
+
+
+
+
+
+ 480
+
+ Schranke
+ Pfad
+ Pfad
+ Toll Booth
+
+
+ SymbolAndName
+
+
+
+
+
+ 2016-01-03 20:40:14
+
+
+ Black
+
+
+
+
+ 471.86000000000001
+
+
+
+ 471.43000000000001
+
+
+
+ 470.69
+
+
+
+ 470.94
+
+
+
+ 471.5
+
+
+
+ 471.67000000000002
+
+
+
+ 471.58999999999997
+
+
+
+ 472.44999999999999
+
+
+
+ 472.54000000000002
+
+
+
+ 472.45999999999998
+
+
+
+ 471.38
+
+
+
+ 471.26999999999998
+
+
+
+ 471.36000000000001
+
+
+
+ 473.19999999999999
+
+
+
+ 475.06
+
+
+
+ 474.75
+
+
+
+ 474.62
+
+
+
+ 474.74000000000001
+
+
+
+ 474.06
+
+
+
+ 474
+
+
+
+ 474.58999999999997
+
+
+
+ 474.81999999999999
+
+
+
+ 476.29000000000002
+
+
+
+ 478.48000000000002
+
+
+
+ 481.02999999999997
+
+
+
+ 480
+
+
+
+ 479.58999999999997
+
+
+
+ 478.99000000000001
+
+
+
+ 479.58999999999997
+
+
+
+ 481.18000000000001
+
+
+
+ 481.88
+
+
+
+ 483.11000000000001
+
+
+
+ 484.49000000000001
+
+
+
+ 486.88
+
+
+
+ 488.05000000000001
+
+
+
+ 487.76999999999998
+
+
+
+ 488.95999999999998
+
+
+
+ 488.36000000000001
+
+
+
+ 488.35000000000002
+
+
+
+ 487.19
+
+
+
+ 487.63999999999999
+
+
+
+ 487.55000000000001
+
+
+
+ 488.39999999999998
+
+
+
+ 489.18000000000001
+
+
+
+ 490.73000000000002
+
+
+
+ 491.24000000000001
+
+
+
+ 490.25
+
+
+
+ 490.00999999999999
+
+
+
+ 489.54000000000002
+
+
+
+ 489.66000000000003
+
+
+
+ 489.06
+
+
+
+ 490.08999999999997
+
+
+
+ 489.41000000000003
+
+
+
+ 489.17000000000002
+
+
+
+ 488.87
+
+
+
+ 489.37
+
+
+
+ 488.94999999999999
+
+
+
+ 488.93000000000001
+
+
+
+ 488.88999999999999
+
+
+
+ 488.86000000000001
+
+
+
+ 489.19999999999999
+
+
+
+ 489.29000000000002
+
+
+
+ 488.95999999999998
+
+
+
+ 489.10000000000002
+
+
+
+ 492.19
+
+
+
+ 492.12
+
+
+
+ 493.06999999999999
+
+
+
+ 492.58999999999997
+
+
+
+ 492.38999999999999
+
+
+
+ 492.94
+
+
+
+ 492.47000000000003
+
+
+
+ 492.50999999999999
+
+
+
+ 492.73000000000002
+
+
+
+ 492.63
+
+
+
+ 493
+
+
+
+ 493.00999999999999
+
+
+
+ 493.19999999999999
+
+
+
+ 493.18000000000001
+
+
+
+ 493
+
+
+
+ 493.20999999999998
+
+
+
+ 493.11000000000001
+
+
+
+ 493.30000000000001
+
+
+
+ 493.50999999999999
+
+
+
+ 493
+
+
+
+ 492.37
+
+
+
+ 492.30000000000001
+
+
+
+ 492.04000000000002
+
+
+
+ 491.37
+
+
+
+ 491.06999999999999
+
+
+
+ 490.39999999999998
+
+
+
+ 489.75
+
+
+
+ 489.87
+
+
+
+ 488.95999999999998
+
+
+
+ 485.85000000000002
+
+
+
+ 482.81
+
+
+
+ 481.99000000000001
+
+
+
+ 478.92000000000002
+
+
+
+ 475.89999999999998
+
+
+
+ 474.38
+
+
+
+ 474.35000000000002
+
+
+
+ 474.12
+
+
+
+ 472.52999999999997
+
+
+
+ 472.75
+
+
+
+ 472.19
+
+
+
+ 471.92000000000002
+
+
+
+ 471.98000000000002
+
+
+
+ 473.49000000000001
+
+
+
+ 473.44999999999999
+
+
+
+ 473.45999999999998
+
+
+
+ 470.27999999999997
+
+
+
+ 467.20999999999998
+
+
+
+ 466.89999999999998
+
+
+
+ 466.76999999999998
+
+
+
+ 466.25
+
+
+
+ 465.23000000000002
+
+
+
+ 464.12
+
+
+
+ 463.68000000000001
+
+
+
+ 462.5
+
+
+
+ 462.45999999999998
+
+
+
+ 461.56999999999999
+
+
+
+ 461.14999999999998
+
+
+
+ 460.19
+
+
+
+ 459.83999999999997
+
+
+
+ 460.49000000000001
+
+
+
+ 460.23000000000002
+
+
+
+ 460.56999999999999
+
+
+
+ 457.79000000000002
+
+
+
+ 454.66000000000003
+
+
+
+ 453.24000000000001
+
+
+
+ 450.20999999999998
+
+
+
+ 450.24000000000001
+
+
+
+ 448.61000000000001
+
+
+
+ 447.69
+
+
+
+ 447.02999999999997
+
+
+
+ 445.79000000000002
+
+
+
+ 444.92000000000002
+
+
+
+ 444.45999999999998
+
+
+
+ 443.93000000000001
+
+
+
+ 443.87
+
+
+
+ 441.69999999999999
+
+
+
+ 442.23000000000002
+
+
+
+ 441.95999999999998
+
+
+
+ 440.14999999999998
+
+
+
+ 438.99000000000001
+
+
+
+ 435.69
+
+
+
+ 435.45999999999998
+
+
+
+ 431.98000000000002
+
+
+
+ 431.12
+
+
+
+ 427.87
+
+
+
+ 427.97000000000003
+
+
+
+ 427.36000000000001
+
+
+
+ 426.97000000000003
+
+
+
+ 426.38
+
+
+
+ 426.74000000000001
+
+
+
+ 426.91000000000003
+
+
+
+ 427.19
+
+
+
+ 427.38999999999999
+
+
+
+ 426.94
+
+
+
+ 426.48000000000002
+
+
+
+ 423.64999999999998
+
+
+
+ 422.06999999999999
+
+
+
+ 421.18000000000001
+
+
+
+ 419.81999999999999
+
+
+
+ 418.05000000000001
+
+
+
+ 417.81
+
+
+
+ 418.02999999999997
+
+
+
+ 418.06
+
+
+
+ 418.32999999999998
+
+
+
+ 418.72000000000003
+
+
+
+ 418.20999999999998
+
+
+
+ 418.70999999999998
+
+
+
+ 418.79000000000002
+
+
+
+ 419.05000000000001
+
+
+
+ 420.47000000000003
+
+
+
+ 420.68000000000001
+
+
+
+ 421.39999999999998
+
+
+
+ 421.52999999999997
+
+
+
+ 423.57999999999998
+
+
+
+ 423
+
+
+
+ 423.07999999999998
+
+
+
+ 423.02999999999997
+
+
+
+ 422.26999999999998
+
+
+
+ 421.35000000000002
+
+
+
+ 421.75
+
+
+
+ 421.48000000000002
+
+
+
+
+
+
+ Schotterstrasse durch Wald
+
+
+ Blue
+
+
+
+
+ 624.7421875
+
+
+ 626.015625
+
+
+ 627.0625
+
+
+ 627.3671875
+
+
+ 626.90234375
+
+
+ 626.11328125
+
+
+ 625.33203125
+
+
+ 623.90625
+
+
+ 623.66796875
+
+
+ 623.71484375
+
+
+ 623.75
+
+
+ 623.9375
+
+
+ 624.1640625
+
+
+ 625.234375
+
+
+ 626
+
+
+ 626.3515625
+
+
+ 626.14453125
+
+
+ 625.6640625
+
+
+ 624.7890625
+
+
+ 623.23046875
+
+
+ 622.09375
+
+
+ 620.9765625
+
+
+ 620.23828125
+
+
+ 619.42578125
+
+
+ 617.7734375
+
+
+ 616.8671875
+
+
+ 616.09765625
+
+
+ 615.87890625
+
+
+ 615.3984375
+
+
+ 614.76953125
+
+
+ 613.47265625
+
+
+ 612.72265625
+
+
+ 612.4609375
+
+
+ 611.85546875
+
+
+ 611.90625
+
+
+ 612.27734375
+
+
+ 613.66796875
+
+
+ 614.62890625
+
+
+ 615.0703125
+
+
+ 614.72265625
+
+
+ 614.26171875
+
+
+ 612.06640625
+
+
+ 609.6875
+
+
+ 606.83984375
+
+
+ 604.671875
+
+
+ 602.52734375
+
+
+ 600.78515625
+
+
+ 598.078125
+
+
+ 597.1953125
+
+
+ 596.5234375
+
+
+ 595.74609375
+
+
+ 594.82421875
+
+
+ 594.10546875
+
+
+ 593.2109375
+
+
+ 592.6875
+
+
+ 592.5390625
+
+
+ 592.7578125
+
+
+ 592.77734375
+
+
+ 592.63671875
+
+
+ 592.06640625
+
+
+ 591.2578125
+
+
+ 590.46875
+
+
+ 589.7578125
+
+
+ 589.359375
+
+
+ 589.05859375
+
+
+ 589.21875
+
+
+ 589.59375
+
+
+ 589.98046875
+
+
+ 589.51953125
+
+
+ 588.796875
+
+
+ 587.4375
+
+
+ 585.70703125
+
+
+ 584.48046875
+
+
+ 583.328125
+
+
+ 582.69921875
+
+
+ 581.96875
+
+
+ 581.3359375
+
+
+ 580.6796875
+
+
+ 580.33984375
+
+
+ 580.0234375
+
+
+ 579.5078125
+
+
+ 578.890625
+
+
+ 578.34375
+
+
+ 577.984375
+
+
+ 577.90234375
+
+
+ 577.50390625
+
+
+ 577.20703125
+
+
+ 576.6171875
+
+
+ 575.82421875
+
+
+ 575.125
+
+
+ 575.0546875
+
+
+ 574.89453125
+
+
+ 574.75
+
+
+ 574.6484375
+
+
+ 574.26953125
+
+
+ 573.72265625
+
+
+ 572.4296875
+
+
+ 570.828125
+
+
+ 570.1015625
+
+
+ 568.7734375
+
+
+ 567.8125
+
+
+ 567.25390625
+
+
+ 567.09765625
+
+
+ 567.1640625
+
+
+ 567.546875
+
+
+ 567.86328125
+
+
+ 568.2890625
+
+
+ 568.49609375
+
+
+ 568.33203125
+
+
+ 566.84765625
+
+
+ 566.609375
+
+
+ 566.94140625
+
+
+ 566.88671875
+
+
+ 566.27734375
+
+
+ 565.48046875
+
+
+ 563.5
+
+
+ 562.51953125
+
+
+ 561.9453125
+
+
+ 561.85546875
+
+
+ 561.7578125
+
+
+ 561.765625
+
+
+ 561.453125
+
+
+ 560.6015625
+
+
+ 559.65234375
+
+
+ 558.7578125
+
+
+ 557.66015625
+
+
+ 556.35546875
+
+
+ 555.2265625
+
+
+ 553.53125
+
+
+ 551.265625
+
+
+ 549.92578125
+
+
+ 549.140625
+
+
+ 548.48828125
+
+
+ 548.0078125
+
+
+ 547.39453125
+
+
+ 547.15234375
+
+
+ 547.08203125
+
+
+ 547.55078125
+
+
+ 548.69921875
+
+
+ 548.76953125
+
+
+ 548.51953125
+
+
+ 547.88671875
+
+
+ 546.7265625
+
+
+ 545.3984375
+
+
+ 543.87890625
+
+
+ 540.6484375
+
+
+ 536.4296875
+
+
+ 536.046875
+
+
+ 535.765625
+
+
+ 535.71875
+
+
+ 535.55859375
+
+
+ 535.359375
+
+
+ 534.5234375
+
+
+ 534.2578125
+
+
+ 535.1328125
+
+
+ 535.46875
+
+
+ 535.04296875
+
+
+ 534.04296875
+
+
+ 532.234375
+
+
+ 530.2109375
+
+
+ 528.7890625
+
+
+ 527.69140625
+
+
+ 526.76171875
+
+
+ 526.1171875
+
+
+ 525.83984375
+
+
+ 525.51171875
+
+
+ 525.34375
+
+
+ 525.18359375
+
+
+ 524.3515625
+
+
+ 524.41015625
+
+
+ 524.47265625
+
+
+ 524.02734375
+
+
+ 523.09375
+
+
+ 521.92578125
+
+
+ 520.87109375
+
+
+ 520.51953125
+
+
+ 520.2578125
+
+
+ 519.6640625
+
+
+ 518.5703125
+
+
+ 517.04296875
+
+
+ 513.03125
+
+
+ 510.19921875
+
+
+ 508.5
+
+
+ 507.8828125
+
+
+ 506.71875
+
+
+ 506.03125
+
+
+ 505.5390625
+
+
+ 504.96875
+
+
+ 504.28125
+
+
+ 503.6640625
+
+
+ 502.578125
+
+
+ 500.921875
+
+
+ 499.85546875
+
+
+ 499.40234375
+
+
+ 498.96875
+
+
+ 497.8828125
+
+
+ 496.2265625
+
+
+ 494.9609375
+
+
+ 494.13671875
+
+
+ 493.6015625
+
+
+ 492.828125
+
+
+ 492.1015625
+
+
+ 491.76953125
+
+
+ 490.83984375
+
+
+ 490.23828125
+
+
+ 489.96484375
+
+
+ 489.703125
+
+
+ 484.7109375
+
+
+ 482.328125
+
+
+ 481.04296875
+
+
+ 480.3046875
+
+
+ 479.70703125
+
+
+ 478.984375
+
+
+ 478.4609375
+
+
+ 479.1015625
+
+
+ 480.359375
+
+
+ 481.19140625
+
+
+ 482.2890625
+
+
+ 483.28125
+
+
+ 483.69921875
+
+
+ 483.4609375
+
+
+ 483.0390625
+
+
+ 481.9140625
+
+
+ 480.515625
+
+
+ 479.16796875
+
+
+ 476.74609375
+
+
+ 474.3515625
+
+
+ 473.28515625
+
+
+ 472.39453125
+
+
+ 471.3671875
+
+
+ 470.0390625
+
+
+ 468.76171875
+
+
+ 467.3671875
+
+
+ 466.60546875
+
+
+ 464.65625
+
+
+ 463.62109375
+
+
+ 462.84375
+
+
+ 462.84765625
+
+
+
+
+
+ Trampelpfad durch Wald
+
+
+ Magenta
+
+
+
+
+ 647.81640625
+
+
+ 646.87109375
+
+
+ 646.1953125
+
+
+ 645.5859375
+
+
+ 644.8203125
+
+
+ 642.9765625
+
+
+ 641.796875
+
+
+ 639.4296875
+
+
+ 636.4921875
+
+
+ 634.1328125
+
+
+ 629.55859375
+
+
+ 627.55078125
+
+
+ 624.0234375
+
+
+
+
+
+ über Wiese am Waldrand
+
+
+ Red
+
+
+
+
+ 663.90234375
+
+
+ 662.74609375
+
+
+ 662.1328125
+
+
+ 661.39453125
+
+
+ 658.98828125
+
+
+ 657.47265625
+
+
+ 654.22265625
+
+
+ 650.0703125
+
+
+ 647.890625
+
+
+
+
+
Index: /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 9383)
+++ /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 9384)
@@ -435,5 +435,5 @@
public boolean equals(Object obj) {
if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
+ if (!(obj instanceof LatLon)) return false;
LatLon that = (LatLon) obj;
return Double.compare(that.x, x) == 0 &&
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 9383)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 9384)
@@ -1146,5 +1146,5 @@
* @return number of matched points
*/
- private int matchGpxTrack(List images, GpxData selectedGpx, long offset) {
+ static int matchGpxTrack(List images, GpxData selectedGpx, long offset) {
int ret = 0;
@@ -1189,5 +1189,5 @@
}
- private int matchPoints(List images, WayPoint prevWp, long prevWpTime,
+ static int matchPoints(List images, WayPoint prevWp, long prevWpTime,
WayPoint curWp, long curWpTime, long offset) {
// Time between the track point and the previous one, 5 sec if first point, i.e. photos take
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (revision 9383)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (revision 9384)
@@ -2,18 +2,59 @@
package org.openstreetmap.josm.gui.layer.geoimage;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import java.util.Arrays;
+import java.util.TimeZone;
+
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.io.GpxReaderTest;
+import org.openstreetmap.josm.tools.date.DateUtils;
+/**
+ * Unit tests of {@link CorrelateGpxWithImagesTest} class.
+ */
public class CorrelateGpxWithImagesTest {
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+ }
+
+ /**
+ * Tests matching of images to a GPX track.
+ * @throws Exception if the track cannot be parsed
+ */
@Test
public void testMatchGpxTrack() throws Exception {
- final GpxData munich = GpxReaderTest.parseGpxData("data_nodist/munich.gpx");
+ final GpxData gpx = GpxReaderTest.parseGpxData("data_nodist/2094047.gpx");
+ assertEquals(4, gpx.tracks.size());
+ assertEquals(1, gpx.tracks.iterator().next().getSegments().size());
+ assertEquals(185, gpx.tracks.iterator().next().getSegments().iterator().next().getWayPoints().size());
+
+ final ImageEntry i0 = new ImageEntry();
+ i0.setExifTime(DateUtils.fromString("2016:01:03 11:59:54")); // 4 sec before start of GPX
+ i0.createTmp();
final ImageEntry i1 = new ImageEntry();
- i1.setExifGpsTime();
- CorrelateGpxWithImages.matchGpxTrack(null, munich, 0);
+ i1.setExifTime(DateUtils.fromString("2016:01:03 12:04:01"));
+ i1.createTmp();
+ final ImageEntry i2 = new ImageEntry();
+ i2.setExifTime(DateUtils.fromString("2016:01:03 12:04:57"));
+ i2.createTmp();
+ final ImageEntry i3 = new ImageEntry();
+ i3.setExifTime(DateUtils.fromString("2016:01:03 12:05:05"));
+ i3.createTmp();
+
+ assertEquals(4, CorrelateGpxWithImages.matchGpxTrack(Arrays.asList(i0, i1, i2, i3), gpx, 0));
+ assertEquals(new LatLon(47.19286847859621, 8.79732714034617), i0.getPos()); // start of track
+ assertEquals(new LatLon(47.196979885920882, 8.79541271366179), i1.getPos()); // exact match
+ assertEquals(new LatLon(47.197319911792874, 8.792139580473304), i3.getPos()); // exact match
+ assertEquals(new LatLon((47.197131179273129 + 47.197186248376966) / 2, (8.792974585667253 + 8.792809881269932) / 2),
+ i2.getPos()); // interpolated
}
}
Index: /trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java (revision 9383)
+++ /trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java (revision 9384)
@@ -8,4 +8,5 @@
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -23,4 +24,21 @@
/**
+ * Parses a GPX file and returns the parsed data
+ * @param filename the GPX file to parse
+ * @return the parsed GPX data
+ * @throws IOException if an error occurs during reading.
+ * @throws SAXException if a SAX error occurs
+ */
+ public static GpxData parseGpxData(String filename) throws IOException, SAXException {
+ final GpxData result;
+ try (final FileInputStream in = new FileInputStream(new File(filename))) {
+ final GpxReader reader = new GpxReader(in);
+ assertTrue(reader.parse(false));
+ result = reader.getGpxData();
+ }
+ return result;
+ }
+
+ /**
* Tests the {@code munich.gpx} test file.
* @throws Exception if something goes wrong
@@ -28,10 +46,5 @@
@Test
public void testMunich() throws Exception {
- final GpxData result;
- try (final FileInputStream in = new FileInputStream(new File("data_nodist/munich.gpx"))) {
- final GpxReader reader = new GpxReader(in);
- assertTrue(reader.parse(false));
- result = reader.getGpxData();
- }
+ final GpxData result = parseGpxData("data_nodist/munich.gpx");
assertEquals(2762, result.tracks.size());
assertEquals(0, result.routes.size());