Merge pull request #1476 from dwcaress/caress-tmp

Mbnavadjust and mbnavadjustmerge fixes

ChangeLog.md

@@ -22,6 +22,7 @@ or beta, are equally accessible as tarballs through the Github interface.
 ---
 ### MB-System Version 5.8 Releases and Release Notes:
 ---
+- Version 5.8.2beta10    August 16, 2024
 - Version 5.8.2beta09    August 4, 2024
 - Version 5.8.2beta08    July 27, 2024
 - Version 5.8.2beta07    June 27, 2024
@@ -42,6 +43,24 @@ or beta, are equally accessible as tarballs through the Github interface.
 
 ---
 
+#### 5.8.2beta10 (August 16, 2024)
+
+Mbnavadjustmerge: Added --reimport-file and --reimport-all-files options that reimport 
+swath files into an mbnavadjust project from the current processed versions of that files. 
+Each file is broken into the same sections as previously, regardless of any changes to the 
+settings for the maximum section length or the maximum number of soundings in a section.
+The original navigation and attitude data are also preserved, but the bathymetry is changed 
+to reflect the current processed values. This means that updates to the bathymetry editing 
+can now be brought into mbnavadjust projects.
+
+Format 71 (MBF_MBLDEOIH): Fixed a compression bug that occasionally resulted in corrupting
+the acrosstrack values of the outermost beams of pings when changed data are inserted into
+records using the mb_put_all() or mb_insert() functions. The only know manifestation of this
+bug was in importing swath data into mbnavadjust projects.
+
+Mbtrnpp: Fixed #ifdefs and Makefile.am files so that mbtrnpp can still be built with the
+old autoconf build system, albeit using GCTP for projections rather libproj.
+
 #### 5.8.2beta09 (August 4, 2024)
 
 mb7k2jstar: This program extracts Edgetech sidescan and subbottom data from Reson s7k 

src/man/man1/mbnavadjustmerge.1

@@ -92,6 +92,10 @@ Version 5.0
 .br
 --insert-discontinuity=file:section
 .br
+--remove-discontinuity=file:section
+.br
+--merge-surveys=survey1:survey2
+.br
 --reimport-file=file
 .br
 --reimport-all-files
@@ -407,6 +411,29 @@ merged projects.
 This option inserts a navigation discontinuity immediately after the specified
 file and section.
 .TP
+.B \--remove-discontinuity=file:section
+This option removes a navigation discontinuity immediately after the specified
+file and section (if the discontinuity exists).
+.TP
+.B \--merge-surveys=survey1:survey2
+This option merges two surveys.
+.TP
+.B \--reimport-file=file
+This option reimports the specified swath file into the project from the current processed 
+version of that file. The file is broken into the same sections as previously, regardless 
+of any changes to the settings for the maximum section length or the maximum number of soundings 
+in a section. The original navigation and attitude data are also preserved, but the 
+bathymetry is changed to reflect the current processed values. This means that updates
+to the bathymetry editing can be brought into the mbnavadjust project.
+.TP
+.B \--reimport-all-files
+This option reimports all of the swath files into the project from the current processed 
+versions of those files. Each file is broken into the same sections as previously, regardless 
+of any changes to the settings for the maximum section length or the maximum number of soundings 
+in a section. The original navigation and attitude data are also preserved, but the 
+bathymetry is changed to reflect the current processed values. This means that updates
+to the bathymetry editing can be brought into the mbnavadjust project.
+.TP
 .B \--import-tie-list=filename
 Import a listing of navigation ties that has been exported from a different
 \fBmbnavadjust\fP project using the \fB--export-tie-list\fP

src/man/man1/mbrolltimelag.1

@@ -1,4 +1,4 @@
-.TH mbrolltimelag 1 "3 June 2013" "MB-System 5.0" "MB-System 5.0"
+.TH mbrolltimelag 1 "12 August 2024" "MB-System 5.0" "MB-System 5.0"
 .SH NAME
 \fBmbrolltimelag\fP \- Calculates cross correlation between the apparent
 bottom slope in swath bathymetry data and the roll time series used by
@@ -110,31 +110,31 @@ will be extracted from primary or ancillary navigation records. If
 this \fB\-K\fP option is set, then the roll data will be extracted from
 data records of type \fIKrollsource\fP, where the possible values are listed
 here:
-     MB_DATA_DATA			1	/* general survey data */
-     MB_DATA_CALIBRATE		4	/* Hydrosweep DS */
-     MB_DATA_MEAN_VELOCITY	5	/* Hydrosweep DS */
-     MB_DATA_VELOCITY_PROFILE	6	/* general */
-     MB_DATA_NAV			12	/* Simrad, Reson 7k */
-     MB_DATA_HEADING		17	/* Simrad, Hypack */
-     MB_DATA_ATTITUDE		18	/* Simrad, Hypack, Reson 7k */
-     MB_DATA_SSV			19	/* Simrad */
-     MB_DATA_NAV1			28	/* ancillary nav system 1 */
-     MB_DATA_NAV2			29	/* ancillary nav system 2 */
-     MB_DATA_NAV3			30	/* ancillary nav system 3 */
-     MB_DATA_MOTION			32	/* Reson 7k */
-     MB_DATA_SIDESCAN2		37	/* Reson 7k, XTF */
-     MB_DATA_SIDESCAN3		38	/* Reson 7k, XTF */
-     MB_DATA_ROLL			40	/* Reson 7k */
-     MB_DATA_PITCH			41	/* Reson 7k */
-     MB_DATA_NMEA_RMC		48	/* NMEA */
-     MB_DATA_NMEA_DBT		49	/* NMEA */
-     MB_DATA_NMEA_DPT		50	/* NMEA */
-     MB_DATA_NMEA_ZDA		51	/* NMEA */
-     MB_DATA_NMEA_GLL		52	/* NMEA */
-     MB_DATA_NMEA_GGA		53	/* NMEA */
-     MB_DATA_ATTITUDE1		55	/* ancillary attitude system 1 */
-     MB_DATA_ATTITUDE2		56      /* ancillary attitude system 2 */
-     MB_DATA_ATTITUDE3		57	/* ancillary attitude system 3 */
+     MB_DATA_DATA 1                   /* general survey data */
+     MB_DATA_CALIBRATE 4              /* Hydrosweep DS */
+     MB_DATA_MEAN_VELOCITY 5          /* Hydrosweep DS */
+     MB_DATA_VELOCITY_PROFILE 6       /* general */
+     MB_DATA_NAV 12                   /* Simrad, Reson 7k */
+     MB_DATA_HEADING 17               /* Simrad, Hypack */
+     MB_DATA_ATTITUDE 18              /* Simrad, Hypack, Reson 7k */
+     MB_DATA_SSV 19                   /* Simrad */
+     MB_DATA_NAV1 29                  /* ancillary nav system 1 */
+     MB_DATA_NAV2 30                  /* ancillary nav system 2 */
+     MB_DATA_NAV3 31                  /* ancillary nav system 3 */
+     MB_DATA_MOTION 33                /* Reson 7k */
+     MB_DATA_SIDESCAN2 38             /* Reson 7k, XTF */
+     MB_DATA_SIDESCAN3 39             /* Reson 7k, XTF */
+     MB_DATA_ROLL 41                  /* Reson 7k */
+     MB_DATA_PITCH 42                 /* Reson 7k */
+     MB_DATA_NMEA_RMC 49              /* NMEA */
+     MB_DATA_NMEA_DBT 50              /* NMEA */
+     MB_DATA_NMEA_DPT 51              /* NMEA */
+     MB_DATA_NMEA_ZDA 52              /* NMEA */
+     MB_DATA_NMEA_GLL 53              /* NMEA */
+     MB_DATA_NMEA_GGA 54              /* NMEA */
+     MB_DATA_ATTITUDE1 56             /* ancillary attitude system 1 */
+     MB_DATA_ATTITUDE2 57             /* ancillary attitude system 2 */
+     MB_DATA_ATTITUDE3 58             /* ancillary attitude system 3 *
 .br
 A typical value is \fIKrollsource\fP=18, which specifies extraction of roll from asynchronous attitude
 data records. This option supercedes the \fB\-S\fP option.

src/mbio/mb_define.h

@@ -37,8 +37,8 @@
 #include <stdint.h>
 
 /* Define version and date for this release */
-#define MB_VERSION "5.8.2beta09"
-#define MB_VERSION_DATE "4 August 2024"
+#define MB_VERSION "5.8.2beta10"
+#define MB_VERSION_DATE "16 August 2024"
 
 /* CMake supports current OS's and so there is only one form of RPC and XDR and no mb_config.h file */
 #ifdef CMAKE_BUILD_SYSTEM

src/mbio/mbsys_ldeoih.c

@@ -651,7 +651,7 @@ int mbsys_ldeoih_insert(int verbose, void *mbio_ptr, void *store_ptr, int kind,
           notdistfirst = true;
           depthmax = fabs(bath[i] - store->sensordepth);
           distmax = fabs(bathacrosstrack[i]);
-          distmax = fabs(bathalongtrack[i]);
+          distmax = MAX(distmax, fabs(bathalongtrack[i]));
         }
       }
     }