Changeset 9384 in josm for trunk/src/org

Timestamp:

2016-01-10T13:04:11+01:00 (8 years ago)

Author:

simon04

Message:

Add unit test for CorrelateGpxWithImages

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/coor/LatLon.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -435 +435 @@
     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 &&

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -1146 +1146 @@
      * @return number of matched points
      */
-    private int matchGpxTrack(List<ImageEntry> images, GpxData selectedGpx, long offset) {
+    static int matchGpxTrack(List<ImageEntry> images, GpxData selectedGpx, long offset) {
         int ret = 0;
 
@@ -1189 +1189 @@
     }
 
-    private int matchPoints(List<ImageEntry> images, WayPoint prevWp, long prevWpTime,
+    static int matchPoints(List<ImageEntry> 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