images, long searchedTime) {
- int lstSize = images.size();
-
- // No photos or the first photo taken is later than the search period
- if (lstSize == 0 || searchedTime < images.get(0).getExifTime().getTime())
- return -1;
-
- // The search period is later than the last photo
- if (searchedTime > images.get(lstSize - 1).getExifTime().getTime())
- return lstSize-1;
-
- // The searched index is somewhere in the middle, do a binary search from the beginning
- int curIndex;
- int startIndex = 0;
- int endIndex = lstSize-1;
- while (endIndex - startIndex > 1) {
- curIndex = (endIndex + startIndex) / 2;
- if (searchedTime > images.get(curIndex).getExifTime().getTime()) {
- startIndex = curIndex;
- } else {
- endIndex = curIndex;
- }
- }
- if (searchedTime < images.get(endIndex).getExifTime().getTime())
- 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()
- == images.get(endIndex + 1).getExifTime().getTime())) {
- endIndex++;
- }
- return endIndex;
- }
}
Index: src/org/openstreetmap/josm/gui/layer/geoimage/Timezone.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/geoimage/Timezone.java (revision 14187)
+++ 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 = "-".equals(m.group(1)) ? -1 : 1;
+ int hour = Integer.parseInt(m.group(2));
+ int min = m.group(3) == null ? 0 : Integer.parseInt(m.group(3));
+ 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
Index: test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java
===================================================================
--- test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java (nonexistent)
+++ test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java (working copy)
@@ -0,0 +1,264 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.gpx;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.coor.CachedLatLon;
+import org.openstreetmap.josm.gui.layer.geoimage.ImageEntry;
+import org.openstreetmap.josm.io.GpxReaderTest;
+import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.IPreferences;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtils;
+import org.openstreetmap.josm.tools.date.DateUtilsTest;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link GpxImageCorrelation} class.
+ */
+public class GpxImageCorrelationTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ DateUtilsTest.setTimeZone(DateUtils.UTC);
+ }
+
+ /**
+ * Tests matching of images to a GPX track.
+ * @throws Exception if the track cannot be parsed
+ */
+ @Test
+ public void testMatchGpxTrack() throws Exception {
+ IPreferences s = Config.getPref();
+ final GpxData gpx = GpxReaderTest.parseGpxData("data_nodist/ImageCorrelationTest.gpx");
+ assertEquals(5, gpx.tracks.size());
+ assertEquals(1, gpx.tracks.iterator().next().getSegments().size());
+ assertEquals(128, gpx.tracks.iterator().next().getSegments().iterator().next().getWayPoints().size());
+
+ final ImageEntry ib = new ImageEntry();
+ ib.setExifTime(DateUtils.fromString("2016:01:03 11:54:58")); // 5 minutes before start of GPX
+ ib.createTmp();
+ 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.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();
+ final ImageEntry i4 = new ImageEntry(); //Image close to two points with elevation, but without time
+ i4.setExifTime(DateUtils.fromString("2016:01:03 12:05:20"));
+ i4.createTmp();
+ final ImageEntry i5 = new ImageEntry(); //between two tracks, closer to first
+ i5.setExifTime(DateUtils.fromString("2016:01:03 12:07:00"));
+ i5.createTmp();
+ final ImageEntry i6 = new ImageEntry(); //between two tracks, closer to second (more than 1 minute from any track)
+ i6.setExifTime(DateUtils.fromString("2016:01:03 12:07:45"));
+ i6.createTmp();
+
+ List images = Arrays.asList(ib, i0, i1, i2, i3, i4, i5, i6);
+
+ // TEST #1: default settings
+ // tag images within 2 minutes to tracks/segments, interpolate between segments only
+ assertEquals(7, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+ assertEquals(null, ib.getPos());
+ assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos()); // start of track
+ assertEquals(new CachedLatLon(47.196979885920882, 8.79541271366179), i1.getPos()); // exact match
+ assertEquals(new CachedLatLon(47.197319911792874, 8.792139580473304), i3.getPos()); // exact match
+ assertEquals(new CachedLatLon((47.197131179273129 + 47.197186248376966) / 2, (8.792974585667253 + 8.792809881269932) / 2), i2.getPos()); // interpolated
+ assertEquals(new CachedLatLon(47.197568312311816, 8.790292849679897), i4.getPos()); // interpolated between points without timestamp
+ assertEquals(new CachedLatLon(47.19819249585271, 8.78536943346262), i5.getPos()); // tagged to last WP of first track, because closer and within 2 min (default setting)
+ assertEquals(new CachedLatLon(47.20138901844621, 8.774476982653141), i6.getPos()); // tagged to first WP of second track, because closer and within 2 min (default setting)
+ assertFalse(ib.hasNewGpsData());
+ assertTrue(i0.hasNewGpsData() && i1.hasNewGpsData() && i2.hasNewGpsData() && i3.hasNewGpsData()
+ && i4.hasNewGpsData() && i5.hasNewGpsData() && i6.hasNewGpsData());
+ // First waypoint has no speed in matchGpxTrack(). Speed is calculated
+ // and not taken from GPX track.
+ assertEquals(null, ib.getSpeed());
+ assertEquals(null, i0.getSpeed());
+ assertEquals(Double.valueOf(11.675317966018756), i1.getSpeed(), 0.000001);
+ assertEquals(Double.valueOf(24.992418392716967), i2.getSpeed(), 0.000001);
+ assertEquals(Double.valueOf(27.307968754679223), i3.getSpeed(), 0.000001);
+ assertEquals(null, ib.getElevation());
+ assertEquals(null, i0.getElevation());
+ assertEquals(Double.valueOf(489.29), i1.getElevation(), 0.000001);
+ assertEquals(Double.valueOf((490.40 + 489.75) / 2), i2.getElevation(), 0.000001);
+ assertEquals(Double.valueOf(486.368333333), i3.getElevation(), 0.000001);
+ assertEquals(Double.valueOf(475.393978719), i4.getElevation(), 0.000001); //interpolated elevation between trackpoints with interpolated timestamps
+ assertEquals(null, i5.getElevation());
+ assertEquals(null, i6.getElevation());
+
+ assertEquals(null, ib.getGpsTime());
+ assertEquals(DateUtils.fromString("2016:01:03 11:59:54"), i0.getGpsTime()); // original time is kept
+ assertEquals(DateUtils.fromString("2016:01:03 12:04:01"), i1.getGpsTime());
+ assertEquals(DateUtils.fromString("2016:01:03 12:04:57"), i2.getGpsTime());
+ assertEquals(DateUtils.fromString("2016:01:03 12:05:05"), i3.getGpsTime());
+
+ clearTmp(images);
+
+ // TEST #2: Disable all interpolation and tagging close to tracks. Only i1-i4 are tagged
+
+ s.putBoolean("geoimage.trk.tag", false);
+ s.putBoolean("geoimage.trk.int", false);
+ s.putBoolean("geoimage.seg.tag", false);
+ s.putBoolean("geoimage.seg.int", false);
+
+ assertEquals(4, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+ assertEquals(null, ib.getPos());
+ assertEquals(null, i0.getPos());
+ assertEquals(new CachedLatLon(47.196979885920882, 8.79541271366179), i1.getPos());
+ assertEquals(new CachedLatLon((47.197131179273129 + 47.197186248376966) / 2, (8.792974585667253 + 8.792809881269932) / 2), i2.getPos());
+ assertEquals(new CachedLatLon(47.197319911792874, 8.792139580473304), i3.getPos());
+ assertEquals(new CachedLatLon(47.197568312311816, 8.790292849679897), i4.getPos());
+ assertEquals(null, i5.getPos());
+ assertEquals(null, i6.getPos());
+
+ clearTmp(images);
+
+ // TEST #3: Disable all interpolation and allow tagging within 1 minute of a track. i0-i5 are tagged.
+ // i6 will not be tagged, because it's 68 seconds away from the next waypoint in either direction
+
+ s.putBoolean("geoimage.trk.tag", true);
+ s.putBoolean("geoimage.trk.tag.time", true);
+ s.putInt("geoimage.trk.tag.time.val", 1);
+
+ s.putBoolean("geoimage.trk.int", false);
+ s.putBoolean("geoimage.seg.tag", false);
+ s.putBoolean("geoimage.seg.int", false);
+
+ assertEquals(6, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+ assertEquals(null, ib.getPos());
+ assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos());
+ assertEquals(new CachedLatLon(47.196979885920882, 8.79541271366179), i1.getPos());
+ assertEquals(new CachedLatLon((47.197131179273129 + 47.197186248376966) / 2, (8.792974585667253 + 8.792809881269932) / 2), i2.getPos());
+ assertEquals(new CachedLatLon(47.197319911792874, 8.792139580473304), i3.getPos());
+ assertEquals(new CachedLatLon(47.197568312311816, 8.790292849679897), i4.getPos());
+ assertEquals(new CachedLatLon(47.19819249585271, 8.78536943346262), i5.getPos());
+ assertEquals(null, i6.getPos());
+
+ clearTmp(images);
+
+ // TEST #4: Force tagging (parameter forceTags=true, no change of configuration). All images will be tagged
+ // i5-i6 will now be interpolated, therefore it will have an elevation and different coordinates than in tests above
+
+ assertEquals(8, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, true));
+ assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), ib.getPos());
+ assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos());
+ assertEquals(new CachedLatLon(47.196979885920882, 8.79541271366179), i1.getPos());
+ assertEquals(new CachedLatLon((47.197131179273129 + 47.197186248376966) / 2, (8.792974585667253 + 8.792809881269932) / 2), i2.getPos());
+ assertEquals(new CachedLatLon(47.197319911792874, 8.792139580473304), i3.getPos());
+ assertEquals(new CachedLatLon(47.197568312311816, 8.790292849679897), i4.getPos());
+ assertEquals(new CachedLatLon(47.198845306804905, 8.783144918860685), i5.getPos()); // interpolated between tracks
+ assertEquals(new CachedLatLon(47.19985828931693, 8.77969308585768), i6.getPos()); // different values than in tests #1 and #3!
+
+ assertEquals(Double.valueOf(447.894014085), i5.getElevation(), 0.000001);
+ assertEquals(Double.valueOf(437.395070423), i6.getElevation(), 0.000001);
+
+ clearTmp(images);
+
+ // TEST #5: Force tagging (parameter forceTags=false, but configuration changed).
+ // Results same as #4
+
+ s.putBoolean("geoimage.trk.tag", true);
+ s.putBoolean("geoimage.trk.tag.time", false);
+ s.putBoolean("geoimage.trk.int", true);
+ s.putBoolean("geoimage.trk.int.time", false);
+ s.putBoolean("geoimage.trk.int.dist", false);
+ s.putBoolean("geoimage.seg.tag", false);
+ s.putBoolean("geoimage.seg.int", false);
+ s.putBoolean("geoimage.seg.tag.time", false);
+ s.putBoolean("geoimage.seg.int", true);
+ s.putBoolean("geoimage.seg.int.time", false);
+ s.putBoolean("geoimage.seg.int.dist", false);
+
+ assertEquals(8, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+ assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), ib.getPos());
+ assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos());
+ assertEquals(new CachedLatLon(47.196979885920882, 8.79541271366179), i1.getPos());
+ assertEquals(new CachedLatLon((47.197131179273129 + 47.197186248376966) / 2, (8.792974585667253 + 8.792809881269932) / 2), i2.getPos());
+ assertEquals(new CachedLatLon(47.197319911792874, 8.792139580473304), i3.getPos());
+ assertEquals(new CachedLatLon(47.197568312311816, 8.790292849679897), i4.getPos());
+ assertEquals(new CachedLatLon(47.198845306804905, 8.783144918860685), i5.getPos());
+ assertEquals(new CachedLatLon(47.19985828931693, 8.77969308585768), i6.getPos());
+
+ assertEquals(Double.valueOf(447.894014085), i5.getElevation(), 0.000001);
+ assertEquals(Double.valueOf(437.395070423), i6.getElevation(), 0.000001);
+
+ clearTmp(images);
+
+ // TEST #6: Disable tagging but allow interpolation when tracks are less than 500m apart. i0-i4 are tagged.
+ // i5-i6 will not be tagged, because the tracks are 897m apart.
+ // not checking all the coordinates again, did that 5 times already, just the number of matched images
+
+ s.putBoolean("geoimage.trk.tag", false);
+ s.putBoolean("geoimage.trk.int", true);
+ s.putBoolean("geoimage.trk.int.time", false);
+ s.putBoolean("geoimage.trk.int.dist", true);
+ s.putInt("geoimage.trk.int.dist.val", 500);
+ s.putBoolean("geoimage.seg.tag", false);
+ s.putBoolean("geoimage.seg.int", false);
+
+ assertEquals(4, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+ clearTmp(images);
+
+ // TEST #7: Disable tagging but allow interpolation when tracks are less than 1000m apart. i0-i6 are tagged.
+ // i5-i6 will be tagged, because the tracks are 897m apart.
+
+ s.putInt("geoimage.trk.int.dist.val", 1000);
+
+ assertEquals(6, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+ clearTmp(images);
+
+ // TEST #8: Disable tagging but allow interpolation when tracks are less than 2 min apart. i0-i4 are tagged.
+ // i5-i6 will not be tagged, because the tracks are 2.5min apart.
+
+ s.putBoolean("geoimage.trk.tag", false);
+ s.putBoolean("geoimage.trk.int", true);
+ s.putBoolean("geoimage.trk.int.time", true);
+ s.putInt("geoimage.trk.int.time.val", 2);
+ s.putBoolean("geoimage.trk.int.dist", false);
+ s.putBoolean("geoimage.seg.tag", false);
+ s.putBoolean("geoimage.seg.int", false);
+
+ assertEquals(4, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+ clearTmp(images);
+
+ // TEST #9: Disable tagging but allow interpolation when tracks are less than 3 min apart. i0-i6 are tagged.
+ // i5-i6 will be tagged, because the tracks are 2.5min apart.
+
+ s.putInt("geoimage.trk.int.time.val", 3);
+
+ assertEquals(6, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+
+ }
+
+ private void clearTmp(List imgs) {
+ for (ImageEntry i : imgs) {
+ i.discardTmp();
+ i.createTmp();
+ }
+ }
+}
Index: test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
===================================================================
--- test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (revision 14187)
+++ test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (working copy)
@@ -2,16 +2,12 @@
package org.openstreetmap.josm.gui.layer.geoimage;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import java.util.Arrays;
import java.util.Collections;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
-import org.openstreetmap.josm.data.coor.CachedLatLon;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.io.GpxReaderTest;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -42,63 +38,6 @@
}
/**
- * Tests matching of images to a GPX track.
- * @throws Exception if the track cannot be parsed
- */
- @Test
- public void testMatchGpxTrack() throws Exception {
- 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 ib = new ImageEntry();
- ib.setExifTime(DateUtils.fromString("2016:01:03 11:54:58")); // 5 minutes before start of GPX
- ib.createTmp();
- 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.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(ib, i0, i1, i2, i3), gpx, 0));
- assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos()); // start of track
- assertEquals(new CachedLatLon(47.196979885920882, 8.79541271366179), i1.getPos()); // exact match
- assertEquals(new CachedLatLon(47.197319911792874, 8.792139580473304), i3.getPos()); // exact match
- assertEquals(new CachedLatLon((47.197131179273129 + 47.197186248376966) / 2, (8.792974585667253 + 8.792809881269932) / 2),
- i2.getPos()); // interpolated
- assertFalse(ib.hasNewGpsData());
- assertTrue(i0.hasNewGpsData());
- assertTrue(i1.hasNewGpsData());
- assertTrue(i2.hasNewGpsData());
- assertTrue(i3.hasNewGpsData());
- // First waypoint has no speed in matchGpxTrack(). Speed is calculated
- // and not taken from GPX track.
- assertEquals(null, ib.getSpeed());
- assertEquals(null, i0.getSpeed());
- assertEquals(Double.valueOf(11.675317966018756), i1.getSpeed(), 0.000001);
- assertEquals(Double.valueOf(24.992418392716967), i2.getSpeed(), 0.000001);
- assertEquals(Double.valueOf(27.307968754679223), i3.getSpeed(), 0.000001);
- assertEquals(null, ib.getElevation());
- assertEquals(Double.valueOf(471.86), i0.getElevation(), 0.000001);
- assertEquals(Double.valueOf(489.29), i1.getElevation(), 0.000001);
- assertEquals(Double.valueOf((490.40 + 489.75) / 2), i2.getElevation(), 0.000001);
- assertEquals(Double.valueOf(486.368333333), i3.getElevation(), 0.000001);
- assertEquals(null, ib.getGpsTime());
- assertEquals(DateUtils.fromString("2016:01:03 11:59:54"), i0.getGpsTime()); // original time is kept
- assertEquals(DateUtils.fromString("2016:01:03 12:04:01"), i1.getGpsTime());
- assertEquals(DateUtils.fromString("2016:01:03 12:04:57"), i2.getGpsTime());
- assertEquals(DateUtils.fromString("2016:01:03 12:05:05"), i3.getGpsTime());
- }
-
- /**
* Tests automatic guessing of timezone/offset
* @throws Exception if an error occurs
*/
Index: test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java
===================================================================
--- test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java (revision 14187)
+++ test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java (working copy)
@@ -56,5 +56,6 @@
assertEquals(1, Timezone.parseTimezone("+1:00").getHours(), 1e-3);
assertEquals(1.5, Timezone.parseTimezone("+01:30").getHours(), 1e-3);
assertEquals(11.5, Timezone.parseTimezone("+11:30").getHours(), 1e-3);
+ assertEquals(-11.5, Timezone.parseTimezone("-11:30").getHours(), 1e-3);
}
}