- Timestamp:
- 2018-08-31T21:59:54+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java
r14205 r14209 62 62 segs.sort(new Comparator<List<WayPoint>>() { 63 63 @Override 64 public int compare(List<WayPoint> arg0, List<WayPoint> arg1) {65 if ( arg0.isEmpty() || arg1.isEmpty() || arg0.get(0).time == arg1.get(0).time)64 public int compare(List<WayPoint> o1, List<WayPoint> o2) { 65 if (o1.isEmpty() || o2.isEmpty()) 66 66 return 0; 67 return arg0.get(0).time < arg1.get(0).time ? -1 : 1;67 return Double.compare(o1.get(0).time, o2.get(0).time); 68 68 } 69 69 }); … … 74 74 trks.sort(new Comparator<List<List<WayPoint>>>() { 75 75 @Override 76 public int compare(List<List<WayPoint>> arg0, List<List<WayPoint>> arg1) { 77 if (arg0.isEmpty() || arg0.get(0).isEmpty() 78 || arg1.isEmpty() || arg1.get(0).isEmpty() 79 || arg0.get(0).get(0).time == arg1.get(0).get(0).time) 76 public int compare(List<List<WayPoint>> o1, List<List<WayPoint>> o2) { 77 if (o1.isEmpty() || o1.get(0).isEmpty() 78 || o2.isEmpty() || o2.get(0).isEmpty()) 80 79 return 0; 81 return arg0.get(0).get(0).time < arg1.get(0).get(0).time ? -1 : 1;80 return Double.compare(o1.get(0).get(0).time, o2.get(0).get(0).time); 82 81 } 83 82 }); -
trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java
r14205 r14209 5 5 import java.io.IOException; 6 6 import java.util.Date; 7 import java.util.Objects; 7 8 8 9 import org.openstreetmap.josm.data.coor.CachedLatLon; … … 332 333 } 333 334 335 @Override 336 public int hashCode() { 337 return Objects.hash(height, width, isNewGpsData, 338 elevation, exifCoor, exifGpsTime, exifImgDir, exifOrientation, exifTime, 339 file, gpsTime, pos, speed, tmp); 340 } 341 342 @Override 343 public boolean equals(Object obj) { 344 if (this == obj) 345 return true; 346 if (obj == null || getClass() != obj.getClass()) 347 return false; 348 GpxImageEntry other = (GpxImageEntry) obj; 349 return height == other.height 350 && width == other.width 351 && isNewGpsData == other.isNewGpsData 352 && Objects.equals(elevation, other.elevation) 353 && Objects.equals(exifCoor, other.exifCoor) 354 && Objects.equals(exifGpsTime, other.exifGpsTime) 355 && Objects.equals(exifImgDir, other.exifImgDir) 356 && Objects.equals(exifOrientation, other.exifOrientation) 357 && Objects.equals(exifTime, other.exifTime) 358 && Objects.equals(file, other.file) 359 && Objects.equals(gpsTime, other.gpsTime) 360 && Objects.equals(pos, other.pos) 361 && Objects.equals(speed, other.speed) 362 && Objects.equals(tmp, other.tmp); 363 } 364 334 365 /** 335 366 * Make a fresh copy and save it in the temporary variable. Use -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
r14205 r14209 111 111 public class CorrelateGpxWithImages extends AbstractAction { 112 112 113 private static List<GpxData> loadedGpxData = new ArrayList<>();113 private static final List<GpxData> loadedGpxData = new ArrayList<>(); 114 114 115 115 private final transient GeoImageLayer yLayer; 116 116 private transient GpxTimezone timezone; 117 117 private transient GpxTimeOffset delta; 118 private static boolean forceTags = false;118 private static boolean forceTags; 119 119 120 120 /**
Note:
See TracChangeset
for help on using the changeset viewer.