Allow fractional seconds in --photooffset

Now that we interpolate on a subsecond basis, it makes sense to allow
subsecond resolution in the photo offset.

Author: dfandrich

RELEASES

@@ -3,6 +3,7 @@ Release History:
 v2.x: X
     - Use subsecond times in an image for better interpolation
     - When interpolation is disabled, round up when exactly half way
+    - Allow fractional times in --photooffset
 
 v2.2: 17 October 2024
 	- Fix metainfo nits

correlate.c

@@ -89,8 +89,21 @@ struct timespec ConvertTimeToUnixTime(const char *Time, const char *TimeFormat,
 			Options->TimeZoneHours, Options->TimeZoneMins);
 
 	/* Add the PhotoOffset time. This is to make the Photo time match
-	 * the GPS time - ie, it is (GPS - Photo). */
-	PhotoTime.tv_sec += Options->PhotoOffset;
+	 * the GPS time - i.e., it is (GPS - Photo). */
+	double IntPart;
+	double FracPart = modf(Options->PhotoOffset, &IntPart);
+	PhotoTime.tv_sec += (long)IntPart;
+	long NewNs = PhotoTime.tv_nsec + (long)round(FracPart * 1e9);
+	/* Handle over/underflow out of the nanoseconds part which must be
+	 * 0 <= nsec <= 999999999 */
+	if (NewNs < 0) {
+		PhotoTime.tv_sec -= 1;
+		NewNs += 1000000000L;
+	} else if (NewNs >= 1000000000L) {
+		PhotoTime.tv_sec += 1;
+		NewNs -= 1000000000L;
+	}
+	PhotoTime.tv_nsec = NewNs;
 	return PhotoTime;
 }
 

correlate.h

@@ -46,7 +46,7 @@ struct CorrelateOptions {
 
 	int Result;
 
-	int PhotoOffset; /* Offset applied to Photo time. This is ADDED to PHOTO TIME
+	double PhotoOffset; /* Offset applied to Photo time. This is ADDED to PHOTO TIME
 			    to make it match GPS time. In seconds.
 			    This is (GPS - Photo) */
 

doc/fr/gui.html

@@ -42,7 +42,7 @@ <h3>Étape 3: Établir les options</h3>
 
 <p>La zone <b>«&nbsp;Fuseau horaire&nbsp;»</b> spécifie le fuseau horaire utilisé lors de la prise des photos, de sorte que les données de temps de celles-ci puissent être ajustées pour correspondre aux données GPS.</p>
 
-<p>La zone <b>«&nbsp;Décalage des photos&nbsp;»</b> spécifie un décalage en nombre de secondes à ajouter aux photos pour les faire correspondre aux données GPS (synchronisation). Voir la page <a href="concepts.html">Documentation de GPS Correlate&nbsp;: les concepts</a> pour comprendre l’intérêt de ce paramètre.</p>
+<p>La zone <b>«&nbsp;Décalage des photos&nbsp;»</b> spécifie un décalage en nombre de secondes à ajouter aux photos pour les faire correspondre aux données GPS (synchronisation) (des secondes fractionnées sont autorisées). Voir la page <a href="concepts.html">Documentation de GPS Correlate&nbsp;: les concepts</a> pour comprendre l’intérêt de ce paramètre.</p>
 
 <p>La zone <b>«&nbsp;Datum du GPS&nbsp;»</b> spécifie le système de référence de la source de données GPS et fait l’objet d’un tag EXIF. Par défaut il s'agit du «&nbsp;WGS-84&nbsp;», et ne devrait pas être changé, dans la mesure où le format GPX n’est pas censé contenir autre chose. N’utilisez cette option qu’en toute connaissance de cause.</p>
 

doc/gpscorrelate-manpage.xml.in

@@ -358,11 +358,12 @@
           <replaceable>seconds</replaceable>
         </term>
         <listitem>
-          <para>Time in seconds to add to the photo timestamp to make it match
-          the GPS timestamp.  To determine the number of seconds needed, just
-          create a photograph of your GPS device showing the current time and
-          compare it with the timestamp of your photo file. The EXIF time
-          tags in the image are not modified based on this value.</para>
+          <para>Time in seconds (fractional seconds are allowed) to add to the
+          photo timestamp to make it match the GPS timestamp. To determine
+          the number of seconds needed, just create a photograph of your GPS
+          device showing the current time and compare it with the timestamp of
+          your photo file. The EXIF time tags in the image are not modified
+          based on this value.</para>
         </listitem>
       </varlistentry>
 
@@ -680,10 +681,10 @@
 
     <para>
     Correlate a photo taken from a camera with a fast clock (i.e., the clock
-    was 77 seconds ahead of GPS time):
+    was 77.5 seconds ahead of GPS time):
     </para>
     <para>
-    <userinput>gpscorrelate -g Test.gpx -O -77 photo.jpg</userinput>
+    <userinput>gpscorrelate -g Test.gpx -O -77.5 photo.jpg</userinput>
     </para>
 
     <para>

doc/gui.html

@@ -54,7 +54,7 @@ <h3>Step 3: Set options</h3>
 
 <p>The <b>"Time Zone"</b> box specifies the time zone that the photos were taken in so that the times of the photos can be adjusted to match the GPS data. The format is hours from UTC or HH:MM and may be negative. This can only be specified if "Auto time zone" is unset.</p>
 
-<p>The <b>"Photo Offset"</b> box specifies the number of seconds to add to the photos time to match the GPS data. See the <a href="concepts.html">GPS Correlate Concepts</a> documentation to understand this value.</p>
+<p>The <b>"Photo Offset"</b> box specifies the number of seconds to add to the photos time to match the GPS data (fractional seconds are allowed). See the <a href="concepts.html">GPS Correlate Concepts</a> documentation to understand this value.</p>
 
 <p>The <b>"GPS Datum"</b> box specifies the Datum of the source GPS data, which is written into the GPS EXIF tags. By default this is "WGS-84", but really should not be changed, as the GPX format is only supposed to store WGS-84 data. However, you can change this if you wish.</p>
 

gui.c

@@ -683,12 +683,12 @@ GtkWidget* CreateMatchWindow (void)
   gtk_widget_set_tooltip_text (PhotoOffsetEntry,
 	_("The number of seconds to add to the photo's time to make it match "
 	  "the GPS data. Calculate this with (GPS - Photo). "
-	  "Can be negative or positive."));
+	  "Can be negative or positive and fractional seconds are allowed."));
 #else
   gtk_tooltips_set_tip (tooltips, PhotoOffsetEntry,
 	_("The number of seconds to add to the photo's time to make it match "
 	  "the GPS data. Calculate this with (GPS - Photo). "
-	  "Can be negative or positive."), NULL);
+	  "Can be negative or positive and fractional seconds are allowed."), NULL);
 #endif
   gtk_entry_set_text (GTK_ENTRY (PhotoOffsetEntry), g_key_file_get_value(GUISettings, "default", "photooffset", NULL));
   gtk_entry_set_width_chars (GTK_ENTRY (PhotoOffsetEntry), 7);
@@ -1597,7 +1597,7 @@ void CorrelateButtonPress( GtkWidget *Widget, gpointer Data )
 	}
 
 	/* Photo Offset time */
-	Options.PhotoOffset = atoi(gtk_entry_get_text(GTK_ENTRY(PhotoOffsetEntry)));
+	Options.PhotoOffset = atof(gtk_entry_get_text(GTK_ENTRY(PhotoOffsetEntry)));
 
 	/* Write heading */
 	Options.WriteHeading = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(HeadingCheck));

main-command.c

@@ -396,7 +396,7 @@ int main(int argc, char** argv)
 	int NoChangeMtime = 0;
 	int FixDatestamps = 0;
 	int DegMinSecs = 1;
-	int PhotoOffset = 0;
+	double PhotoOffset = 0;
 	int WriteHeading = 0;
 	int HeadingOffset = -1;      /* Negative means disabled */
 	int MaxHeadingDelta = -1;    /* Negative means disabled */
@@ -491,7 +491,7 @@ int main(int argc, char** argv)
 			case 'O':
 				if (optarg)
 				{
-					PhotoOffset = atoi(optarg);
+					PhotoOffset = atof(optarg);
 				}
 				break;
 			case 'i':

po/de.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpscorrelate 2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2024-10-17 21:41-0700\n"
+"POT-Creation-Date: 2024-12-19 16:48-0800\n"
 "PO-Revision-Date: 2024-10-17 21:41-0700\n"
 "Last-Translator: Dan Fandrich <[email protected]>\n"
 "Language-Team: deutsch\n"
@@ -260,11 +260,12 @@ msgstr ""
 #: gui.c:684 gui.c:689
 msgid ""
 "The number of seconds to add to the photo's time to make it match the GPS "
-"data. Calculate this with (GPS - Photo). Can be negative or positive."
+"data. Calculate this with (GPS - Photo). Can be negative or positive and "
+"fractional seconds are allowed."
 msgstr ""
 "Die Sekundenanzahl, die zur Fotozeit addiert werden muss, damit es mit den "
 "GPS-Daten übereinstimmt. Rechne es als (GPS-Zeit - Fotozeit). Es kann "
-"negativ oder positiv sein."
+"negativ oder positiv sein und fraktionale Sekunden sind erlaubt."
 
 #: gui.c:704 gui.c:708
 msgid ""
@@ -857,6 +858,6 @@ msgstr ""
 "Diensten (z.B. Google Photos) verwendet, um eine Karte des Aufnahmeortes des "
 "Fotos anzuzeigen."
 
-#: io.github.dfandrich.gpscorrelate.metainfo.xml.in:39
+#: io.github.dfandrich.gpscorrelate.metainfo.xml.in:44
 msgid "Daniel Fandrich"
 msgstr "Daniel Fandrich"

po/fr.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpscorrelate 2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2024-10-17 21:41-0700\n"
+"POT-Creation-Date: 2024-12-19 16:48-0800\n"
 "PO-Revision-Date: 2024-04-03 11:24+0100\n"
 "Last-Translator: jybz, papoteur\n"
 "Language-Team: français\n"
@@ -263,11 +263,12 @@ msgstr ""
 #: gui.c:684 gui.c:689
 msgid ""
 "The number of seconds to add to the photo's time to make it match the GPS "
-"data. Calculate this with (GPS - Photo). Can be negative or positive."
+"data. Calculate this with (GPS - Photo). Can be negative or positive and "
+"fractional seconds are allowed."
 msgstr ""
 "Le nombre de secondes à ajouter au temps des photos pour les faire "
 "correspondre aux données GPS. Égal à  (GPS - Photo). Peut être négatif ou "
-"positif."
+"positif et des secondes fractionnelles sont autorisées."
 
 #: gui.c:704 gui.c:708
 msgid ""
@@ -863,6 +864,6 @@ msgstr ""
 "alors utilisée par différentes applications et services (tels que Google "
 "Photos) pour afficher une carte de l'endroit où la photo a été prise."
 
-#: io.github.dfandrich.gpscorrelate.metainfo.xml.in:39
+#: io.github.dfandrich.gpscorrelate.metainfo.xml.in:44
 msgid "Daniel Fandrich"
 msgstr "Daniel Fandrich"

po/ru.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpscorrelate 2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2024-10-17 21:41-0700\n"
+"POT-Creation-Date: 2024-12-19 16:48-0800\n"
 "PO-Revision-Date: 2019-03-18 10:12+0300\n"
 "Last-Translator: Nikolay Korotkiy <[email protected]>\n"
 "Language-Team: russian\n"
@@ -248,11 +248,12 @@ msgstr ""
 #: gui.c:684 gui.c:689
 msgid ""
 "The number of seconds to add to the photo's time to make it match the GPS "
-"data. Calculate this with (GPS - Photo). Can be negative or positive."
+"data. Calculate this with (GPS - Photo). Can be negative or positive and "
+"fractional seconds are allowed."
 msgstr ""
 "Количество секунд, добавляемых к времени фотографии, чтобы оно "
 "соответствовало GPS данным. Рассчитывается с помощью (GPS - Фото). Может "
-"быть отрицательным или положительным."
+"быть отрицательным или положительным, и разрешены дробные секунды."
 
 #: gui.c:704 gui.c:708
 msgid ""
@@ -789,6 +790,6 @@ msgid ""
 "taken."
 msgstr ""
 
-#: io.github.dfandrich.gpscorrelate.metainfo.xml.in:39
+#: io.github.dfandrich.gpscorrelate.metainfo.xml.in:44
 msgid "Daniel Fandrich"
 msgstr "Daniel Fandrich"

tests/data/test177.param

@@ -0,0 +1,7 @@
+# End result is same as test 29
+TITLE='Correlate a file with subsecond interpolation and fractional photooffset'
+PRECOMMAND='cat "$STAGINGDIR/point1-4.jpg" >"$LOGDIR/test.jpg"'
+# Run in C locale to correctly parse these decimal numbers
+COMMAND='env LC_NUMERIC=C $PROGRAM --photooffset -14.91 -z 0 -g "$STAGINGDIR/track2.gpx" "$LOGDIR/test.jpg" > "$OUTFILE" 2>&1 && exiv2 -pv pr "$LOGDIR/test.jpg" >> "$OUTFILE" 2>&1'
+POSTCOMMAND='rm -f "$LOGDIR/test.jpg"'
+RESULTCODE=0

tests/data/test177.result

@@ -0,0 +1,36 @@
+Reading GPS Data...
+Legend: . = Ok, / = Interpolated, < = Rounded, - = No match, ^ = Too far
+        w = Write Fail, ? = No EXIF date, ! = GPS already present
+
+Correlate: /
+
+Completed correlation process.
+Matched:     1 (0 Exact, 1 Interpolated, 0 Rounded).
+Failed:      0 (0 Not matched, 0 Write failure, 0 Too Far,
+                0 No Date, 0 GPS Already Present.)
+0x011a Image        XResolution                 Rational    1  72/1
+0x011b Image        YResolution                 Rational    1  72/1
+0x0128 Image        ResolutionUnit              Short       1  2
+0x0132 Image        DateTime                    Ascii      20  2012:11:22 12:35:10
+0x0213 Image        YCbCrPositioning            Short       1  1
+0x8769 Image        ExifTag                     Long        1  134
+0x9000 Photo        ExifVersion                 Undefined   4  48 50 49 48
+0x9003 Photo        DateTimeOriginal            Ascii      20  2012:11:22 12:35:10
+0x9004 Photo        DateTimeDigitized           Ascii      20  2012:11:22 12:35:10
+0x9101 Photo        ComponentsConfiguration     Undefined   4  1 2 3 0
+0x9291 Photo        SubSecTimeOriginal          Ascii       3  91
+0xa000 Photo        FlashpixVersion             Undefined   4  48 49 48 48
+0xa001 Photo        ColorSpace                  Short       1  65535
+0xa002 Photo        PixelXDimension             Long        1  64
+0xa003 Photo        PixelYDimension             Long        1  64
+0x8825 Image        GPSTag                      Long        1  288
+0x0000 GPSInfo      GPSVersionID                Byte        4  2 2 0 0
+0x0001 GPSInfo      GPSLatitudeRef              Ascii       2  N
+0x0002 GPSInfo      GPSLatitude                 Rational    3  47/1 25/1 16449600/1000000
+0x0003 GPSInfo      GPSLongitudeRef             Ascii       2  E
+0x0004 GPSInfo      GPSLongitude                Rational    3  10/1 59/1 6888000/1000000
+0x0005 GPSInfo      GPSAltitudeRef              Byte        1  0
+0x0006 GPSInfo      GPSAltitude                 Rational    1  2959867/1000
+0x0007 GPSInfo      GPSTimeStamp                Rational    3  12/1 34/1 56/1
+0x0012 GPSInfo      GPSMapDatum                 Ascii       7  WGS-84
+0x001d GPSInfo      GPSDateStamp                Ascii      11  2012:11:22

tests/data/test178.param

@@ -0,0 +1,7 @@
+# End result is the same as test 71
+TITLE='Correlate a file with subsecond interpolation and fractional photooffset overflow'
+PRECOMMAND='cat "$STAGINGDIR/point1-4.jpg" >"$LOGDIR/test.jpg"'
+# Run in C locale to correctly parse these decimal numbers
+COMMAND='env LC_NUMERIC=C $PROGRAM --photooffset 9.09 -z -7 -g "$STAGINGDIR/track10.gpx" "$LOGDIR/test.jpg" > "$OUTFILE" 2>&1 && exiv2 -pv pr "$LOGDIR/test.jpg" >> "$OUTFILE" 2>&1'
+POSTCOMMAND='rm -f "$LOGDIR/test.jpg"'
+RESULTCODE=0

tests/data/test178.result

@@ -0,0 +1,36 @@
+Reading GPS Data...
+Legend: . = Ok, / = Interpolated, < = Rounded, - = No match, ^ = Too far
+        w = Write Fail, ? = No EXIF date, ! = GPS already present
+
+Correlate: .
+
+Completed correlation process.
+Matched:     1 (1 Exact, 0 Interpolated, 0 Rounded).
+Failed:      0 (0 Not matched, 0 Write failure, 0 Too Far,
+                0 No Date, 0 GPS Already Present.)
+0x011a Image        XResolution                 Rational    1  72/1
+0x011b Image        YResolution                 Rational    1  72/1
+0x0128 Image        ResolutionUnit              Short       1  2
+0x0132 Image        DateTime                    Ascii      20  2012:11:22 12:35:10
+0x0213 Image        YCbCrPositioning            Short       1  1
+0x8769 Image        ExifTag                     Long        1  134
+0x9000 Photo        ExifVersion                 Undefined   4  48 50 49 48
+0x9003 Photo        DateTimeOriginal            Ascii      20  2012:11:22 12:35:10
+0x9004 Photo        DateTimeDigitized           Ascii      20  2012:11:22 12:35:10
+0x9101 Photo        ComponentsConfiguration     Undefined   4  1 2 3 0
+0x9291 Photo        SubSecTimeOriginal          Ascii       3  91
+0xa000 Photo        FlashpixVersion             Undefined   4  48 49 48 48
+0xa001 Photo        ColorSpace                  Short       1  65535
+0xa002 Photo        PixelXDimension             Long        1  64
+0xa003 Photo        PixelYDimension             Long        1  64
+0x8825 Image        GPSTag                      Long        1  288
+0x0000 GPSInfo      GPSVersionID                Byte        4  2 2 0 0
+0x0001 GPSInfo      GPSLatitudeRef              Ascii       2  N
+0x0002 GPSInfo      GPSLatitude                 Rational    3  38/1 35/1 54874/1000
+0x0003 GPSInfo      GPSLongitudeRef             Ascii       2  W
+0x0004 GPSInfo      GPSLongitude                Rational    3  109/1 34/1 24506/1000
+0x0005 GPSInfo      GPSAltitudeRef              Byte        1  0
+0x0006 GPSInfo      GPSAltitude                 Rational    1  1180156/1000
+0x0007 GPSInfo      GPSTimeStamp                Rational    3  19/1 35/1 20/1
+0x0012 GPSInfo      GPSMapDatum                 Ascii       7  WGS-84
+0x001d GPSInfo      GPSDateStamp                Ascii      11  2012:11:22

tests/data/test179.param

@@ -0,0 +1,6 @@
+TITLE='Correlate a file with subsecond interpolation and fractional photooffset negative overflow'
+PRECOMMAND='cat "$STAGINGDIR/point1-4.jpg" >"$LOGDIR/test.jpg"'
+# Run in C locale to correctly parse these decimal numbers
+COMMAND='env LC_NUMERIC=C $PROGRAM --photooffset -10.95 -z 0 -g "$STAGINGDIR/track2.gpx" "$LOGDIR/test.jpg" > "$OUTFILE" 2>&1 && exiv2 -pv pr "$LOGDIR/test.jpg" >> "$OUTFILE" 2>&1'
+POSTCOMMAND='rm -f "$LOGDIR/test.jpg"'
+RESULTCODE=0

tests/data/test179.result

@@ -0,0 +1,36 @@
+Reading GPS Data...
+Legend: . = Ok, / = Interpolated, < = Rounded, - = No match, ^ = Too far
+        w = Write Fail, ? = No EXIF date, ! = GPS already present
+
+Correlate: /
+
+Completed correlation process.
+Matched:     1 (0 Exact, 1 Interpolated, 0 Rounded).
+Failed:      0 (0 Not matched, 0 Write failure, 0 Too Far,
+                0 No Date, 0 GPS Already Present.)
+0x011a Image        XResolution                 Rational    1  72/1
+0x011b Image        YResolution                 Rational    1  72/1
+0x0128 Image        ResolutionUnit              Short       1  2
+0x0132 Image        DateTime                    Ascii      20  2012:11:22 12:35:10
+0x0213 Image        YCbCrPositioning            Short       1  1
+0x8769 Image        ExifTag                     Long        1  134
+0x9000 Photo        ExifVersion                 Undefined   4  48 50 49 48
+0x9003 Photo        DateTimeOriginal            Ascii      20  2012:11:22 12:35:10
+0x9004 Photo        DateTimeDigitized           Ascii      20  2012:11:22 12:35:10
+0x9101 Photo        ComponentsConfiguration     Undefined   4  1 2 3 0
+0x9291 Photo        SubSecTimeOriginal          Ascii       3  91
+0xa000 Photo        FlashpixVersion             Undefined   4  48 49 48 48
+0xa001 Photo        ColorSpace                  Short       1  65535
+0xa002 Photo        PixelXDimension             Long        1  64
+0xa003 Photo        PixelYDimension             Long        1  64
+0x8825 Image        GPSTag                      Long        1  288
+0x0000 GPSInfo      GPSVersionID                Byte        4  2 2 0 0
+0x0001 GPSInfo      GPSLatitudeRef              Ascii       2  N
+0x0002 GPSInfo      GPSLatitude                 Rational    3  47/1 25/1 16463856/1000000
+0x0003 GPSInfo      GPSLongitudeRef             Ascii       2  E
+0x0004 GPSInfo      GPSLongitude                Rational    3  10/1 59/1 6721680/1000000
+0x0005 GPSInfo      GPSAltitudeRef              Byte        1  0
+0x0006 GPSInfo      GPSAltitude                 Rational    1  2961979/1000
+0x0007 GPSInfo      GPSTimeStamp                Rational    3  12/1 34/1 59/1
+0x0012 GPSInfo      GPSMapDatum                 Ascii       7  WGS-84
+0x001d GPSInfo      GPSDateStamp                Ascii      11  2012:11:22

tests/data/test180.param

@@ -0,0 +1,5 @@
+TITLE='Correlate a file with subsecond photooffset barely outside track range'
+PRECOMMAND='cat "$STAGINGDIR/point1-4.jpg" >"$LOGDIR/test.jpg"'
+COMMAND='$PROGRAM --photooffset -9.95 -z 0 -g "$STAGINGDIR/track2.gpx" "$LOGDIR/test.jpg" > "$OUTFILE" 2>&1 && exiv2 -pv pr "$LOGDIR/test.jpg" >> "$OUTFILE" 2>&1'
+POSTCOMMAND='rm -f "$LOGDIR/test.jpg"'
+RESULTCODE=2

tests/data/test180.result

@@ -0,0 +1,10 @@
+Reading GPS Data...
+Legend: . = Ok, / = Interpolated, < = Rounded, - = No match, ^ = Too far
+        w = Write Fail, ? = No EXIF date, ! = GPS already present
+
+Correlate: -
+
+Completed correlation process.
+Matched:     0 (0 Exact, 0 Interpolated, 0 Rounded).
+Failed:      1 (1 Not matched, 0 Write failure, 0 Too Far,
+                0 No Date, 0 GPS Already Present.)