images, WayPoint prevWp, long prevWpTime, WayPoint curWp, long curWpTime,
+ long offset, boolean interpolate, int tag, boolean isLast) {
+
int ret = 0;
// i is the index of the timewise last photo that has the same or earlier EXIF time
- int i = getLastIndexOfListBefore(images, curWpTime);
+ int i;
+ if (isLast) {
+ i = images.size() - 1;
+ } else {
+ i = getLastIndexOfListBefore(images, curWpTime);
+ }
// no photos match
if (i < 0)
@@ -1151,7 +1511,7 @@
Double speed = null;
Double prevElevation = null;
- if (prevWp != null) {
+ if (prevWp != null && interpolate) {
double distance = prevWp.getCoor().greatCircleDistance(curWp.getCoor());
// This is in km/h, 3.6 * m/s
if (curWpTime > prevWpTime) {
@@ -1162,19 +1522,20 @@
Double curElevation = getElevation(curWp);
- // First trackpoint, then interval is set to five seconds, i.e. photos up to five seconds
- // before the first point will be geotagged with the starting point
- if (prevWpTime == 0 || curWpTime <= prevWpTime) {
+ if (!interpolate || isLast) {
+ final long half = Math.abs(curWpTime - prevWpTime) / 2;
while (i >= 0) {
final ImageEntry curImg = images.get(i);
- long time = curImg.getExifTime().getTime();
- if (time > curWpTime || time < curWpTime - interval) {
+ final long time = curImg.getExifTime().getTime();
+ if ((!isLast && time > curWpTime) || time < prevWpTime) {
break;
}
- if (curImg.tmp.getPos() == null) {
- curImg.tmp.setPos(curWp.getCoor());
- curImg.tmp.setSpeed(speed);
- curImg.tmp.setElevation(curElevation);
+ if (curImg.tmp.getPos() == null && Math.abs(time - curWpTime) <= TimeUnit.MINUTES.toMillis(tag)) {
+ if (prevWp != null && time < curWpTime - half) {
+ curImg.tmp.setPos(prevWp.getCoor());
+ } else {
+ curImg.tmp.setPos(curWp.getCoor());
+ }
curImg.tmp.setGpsTime(new Date(curImg.getExifTime().getTime() - offset));
curImg.tmp.flagNewGpsData();
ret++;
@@ -1181,32 +1542,30 @@
}
i--;
}
- return ret;
- }
+ } else if (prevWp != null) {
+ // This code gives a simple linear interpolation of the coordinates between current and
+ // previous track point assuming a constant speed in between
+ while (i >= 0) {
+ ImageEntry curImg = images.get(i);
+ final long imgTime = curImg.getExifTime().getTime();
+ if (imgTime < prevWpTime) {
+ break;
+ }
+ if (curImg.tmp.getPos() == null) {
+ // The values of timeDiff are between 0 and 1, it is not seconds but a dimensionless variable
+ double timeDiff = (double) (imgTime - prevWpTime) / Math.abs(curWpTime - prevWpTime);
+ curImg.tmp.setPos(prevWp.getCoor().interpolate(curWp.getCoor(), timeDiff));
+ curImg.tmp.setSpeed(speed);
+ if (curElevation != null && prevElevation != null) {
+ curImg.tmp.setElevation(prevElevation + (curElevation - prevElevation) * timeDiff);
+ }
+ curImg.tmp.setGpsTime(new Date(curImg.getExifTime().getTime() - offset));
+ curImg.tmp.flagNewGpsData();
- // This code gives a simple linear interpolation of the coordinates between current and
- // previous track point assuming a constant speed in between
- while (i >= 0) {
- ImageEntry curImg = images.get(i);
- long imgTime = curImg.getExifTime().getTime();
- if (imgTime < prevWpTime) {
- break;
- }
-
- if (prevWp != null && curImg.tmp.getPos() == null) {
- // The values of timeDiff are between 0 and 1, it is not seconds but a dimensionless variable
- double timeDiff = (double) (imgTime - prevWpTime) / interval;
- curImg.tmp.setPos(prevWp.getCoor().interpolate(curWp.getCoor(), timeDiff));
- curImg.tmp.setSpeed(speed);
- if (curElevation != null && prevElevation != null) {
- curImg.tmp.setElevation(prevElevation + (curElevation - prevElevation) * timeDiff);
+ ret++;
}
- curImg.tmp.setGpsTime(new Date(curImg.getExifTime().getTime() - offset));
- curImg.tmp.flagNewGpsData();
-
- ret++;
+ i--;
}
- i--;
}
return ret;
}
@@ -1238,7 +1597,7 @@
return startIndex;
// This final loop is to check if photos with the exact same EXIF time follows
- while ((endIndex < (lstSize-1)) && (images.get(endIndex).getExifTime().getTime()
+ while ((endIndex < (lstSize - 1)) && (images.get(endIndex).getExifTime().getTime()
== images.get(endIndex + 1).getExifTime().getTime())) {
endIndex++;
}
Index: src/org/openstreetmap/josm/gui/layer/geoimage/Timezone.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/geoimage/Timezone.java (revision 14180)
+++ src/org/openstreetmap/josm/gui/layer/geoimage/Timezone.java (working copy)
@@ -5,6 +5,8 @@
import java.text.ParseException;
import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Timezone in hours.
@@ -49,82 +51,23 @@
}
static Timezone parseTimezone(String timezone) throws ParseException {
-
if (timezone.isEmpty())
return ZERO;
- String error = tr("Error while parsing timezone.\nExpected format: {0}", "+H:MM");
+ Matcher m = Pattern.compile("^([\\+\\-]?)(\\d{1,2})(?:\\:([0-5]\\d))?$").matcher(timezone);
- char sgnTimezone = '+';
- StringBuilder hTimezone = new StringBuilder();
- StringBuilder mTimezone = new StringBuilder();
- int state = 1; // 1=start/sign, 2=hours, 3=minutes.
- for (int i = 0; i < timezone.length(); i++) {
- char c = timezone.charAt(i);
- switch (c) {
- case ' ':
- if (state != 2 || hTimezone.length() != 0)
- throw new ParseException(error, i);
- break;
- case '+':
- case '-':
- if (state == 1) {
- sgnTimezone = c;
- state = 2;
- } else
- throw new ParseException(error, i);
- break;
- case ':':
- case '.':
- if (state == 2) {
- state = 3;
- } else
- throw new ParseException(error, i);
- break;
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- switch (state) {
- case 1:
- case 2:
- state = 2;
- hTimezone.append(c);
- break;
- case 3:
- mTimezone.append(c);
- break;
- default:
- throw new ParseException(error, i);
- }
- break;
- default:
- throw new ParseException(error, i);
- }
- }
-
- int h = 0;
- int m = 0;
+ ParseException pe = new ParseException(tr("Error while parsing timezone.\nExpected format: {0}", "±HH:MM"), 0);
try {
- h = Integer.parseInt(hTimezone.toString());
- if (mTimezone.length() > 0) {
- m = Integer.parseInt(mTimezone.toString());
+ if (m.find()) {
+ int sign = m.group(1) == "-" ? -1 : 1;
+ int hour = Integer.parseInt(m.group(2));
+ int min = m.groupCount() > 3 ? Integer.parseInt(m.group(3)) : 0;
+ return new Timezone(sign * hour + min / 60.0);
}
- } catch (NumberFormatException nfe) {
- // Invalid timezone
- throw (ParseException) new ParseException(error, 0).initCause(nfe);
+ } catch (IndexOutOfBoundsException | NumberFormatException ex) {
+ pe.initCause(ex);
}
-
- if (h > 12 || m > 59)
- throw new ParseException(error, 0);
- else
- return new Timezone((h + m / 60.0) * (sgnTimezone == '-' ? -1 : 1));
+ throw pe;
}
@Override