Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 19454) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 19455) @@ -552,7 +552,7 @@ JLabel labelPosition = new JLabel(tr("Override position for: ")); - int numAll = yLayer.getSortedImgList(true, true).size(); - int numExif = numAll - yLayer.getSortedImgList(false, true).size(); - int numTagged = numAll - yLayer.getSortedImgList(true, false).size(); + int numAll = yLayer.getSortedImgList(true, true, imgTimeSource).size(); + int numExif = numAll - yLayer.getSortedImgList(false, true, imgTimeSource).size(); + int numTagged = numAll - yLayer.getSortedImgList(true, false, imgTimeSource).size(); cbExifImg = new JCheckBox(tr("Images with geo location in exif data ({0}/{1})", numExif, numAll)); @@ -829,4 +829,7 @@ yLayer.discardTmp(); + //Get how many images are present in the layer + int totalImg = yLayer.getImages().size(); + // Construct a list of images that have a date, and sort them on the date. List dateImgLst = getSortedImgList(); @@ -847,5 +850,5 @@ return trn("Matched {0} of {1} photo to GPX track.", "Matched {0} of {1} photos to GPX track.", - dateImgLst.size(), lastNumMatched, dateImgLst.size()); + totalImg, lastNumMatched, totalImg); } } @@ -1004,5 +1007,5 @@ private List getSortedImgList() { - return yLayer.getSortedImgList(cbExifImg.isSelected(), cbTaggedImg.isSelected()); + return yLayer.getSortedImgList(cbExifImg.isSelected(), cbTaggedImg.isSelected(), imgTimeSource); } Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/EditImagesSequenceAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/EditImagesSequenceAction.java (revision 19454) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/EditImagesSequenceAction.java (revision 19455) @@ -80,5 +80,5 @@ yLayer.discardTmp(); // Construct a list of images that have a date, and sort them on the date. - List dateImgLst = yLayer.getSortedImgList(true, true); + List dateImgLst = yLayer.getSortedImgList(true, true, TimeSource.EXIFCAMTIME); // Create a temporary copy for each image dateImgLst.forEach(ie -> ie.createTmp().unflagNewGpsData()); Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 19454) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 19455) @@ -48,4 +48,5 @@ import org.openstreetmap.josm.data.gpx.GpxImageEntry; import org.openstreetmap.josm.data.gpx.GpxTrack; +import org.openstreetmap.josm.data.gpx.TimeSource; import org.openstreetmap.josm.data.imagery.street_level.IImageEntry; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; @@ -978,12 +979,16 @@ * @param exif also returns images with exif-gps info * @param tagged also returns tagged images + * @param gpsTime use GPS Time if true, instead of Camera RTC Time * @return matching images - */ - List getSortedImgList(boolean exif, boolean tagged) { + * @since 19455 gpsTime was added + */ + List getSortedImgList(boolean exif, boolean tagged, TimeSource timeSource) { return data.getImages().stream() - .filter(GpxImageEntry::hasExifTime) + .filter(timeSource == TimeSource.EXIFGPSTIME ? GpxImageEntry::hasExifGpsTime : GpxImageEntry::hasExifTime) .filter(e -> e.getExifCoor() == null || exif) .filter(e -> tagged || !e.isTagged() || e.getExifCoor() != null) - .sorted(Comparator.comparing(ImageEntry::getExifInstant)) + .sorted(timeSource == TimeSource.EXIFGPSTIME + ? Comparator.comparing(ImageEntry::getExifGpsInstant) + : Comparator.comparing(ImageEntry::getExifInstant)) .collect(toList()); }