pingmapper 5.4.2__tar.gz → 5.4.4__tar.gz

{pingmapper-5.4.2 → pingmapper-5.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 5.4.2
+Version: 5.4.4
 Summary: Open-source interface for processing recreation-grade side scan sonar datasets and reproducibly mapping benthic habitat
 Author: Daniel Buscombe
 Author-email: Cameron Bodine <bodine.cs@gmail.email>

{pingmapper-5.4.2 → pingmapper-5.4.4}/pingmapper/class_rectObj.py

@@ -327,7 +327,7 @@ class rectObj(sonObj):
                     if self.egn_stretch > 0:
                         self._egnDoStretch()
 
-            img = self._reserve_zero_for_nodata(self.sonDat)
+            img = self._reserve_zero_for_nodata(self.sonDat, preserve_zeros=True)
             img = self._prepare_export_uint16(img)
             vals = img[img > 0]
             if vals.size == 0:
@@ -1427,7 +1427,9 @@ class rectObj(sonObj):
         if len(dfOut) == 0:
             return
 
-        dfAll = pd.concat(dfOut, ignore_index=True)
+        # Preserve (record_num, son_idx) index created per ping; downstream
+        # processing resets this index back to columns before sorting.
+        dfAll = pd.concat(dfOut)
         if dfAll.empty:
             return
 
@@ -1859,7 +1861,7 @@ class rectObj(sonObj):
             col = df[xPix].to_numpy().astype(int)
             data = df[sonCol].to_numpy()
             if son:
-                data = self._reserve_zero_for_nodata(data)
+                data = self._reserve_zero_for_nodata(data, preserve_zeros=True)
             apply_post_rect_colormap = use_16bit and self._rect_colormap_selected(son=son)
             source_scale_bounds = None
             if apply_post_rect_colormap:
@@ -2719,7 +2721,7 @@ class rectObj(sonObj):
 
             img = self.sonDat.copy()
             if son:
-                img = self._reserve_zero_for_nodata(img)
+                img = self._reserve_zero_for_nodata(img, preserve_zeros=True)
             apply_post_rect_colormap = use_16bit and self._rect_colormap_selected(son=son)
             source_scale_bounds = None
             if apply_post_rect_colormap:
@@ -2810,7 +2812,7 @@ class rectObj(sonObj):
 
             img = self.sonDat
             if son:
-                img = self._reserve_zero_for_nodata(img)
+                img = self._reserve_zero_for_nodata(img, preserve_zeros=True)
             apply_post_rect_colormap = son and use_16bit and self._rect_colormap_selected(son=son)
             source_scale_bounds = None
             if apply_post_rect_colormap:

{pingmapper-5.4.2 → pingmapper-5.4.4}/pingmapper/class_sonObj.py

@@ -1931,12 +1931,15 @@ class sonObj(object):
         return bool(getattr(self, 'export_colormap_uint8', True))
 
     # ======================================================================
-    def _reserve_zero_for_nodata(self, data):
+    def _reserve_zero_for_nodata(self, data, preserve_zeros=False):
         arr = np.asarray(data)
 
         if arr.size == 0:
             return arr
 
+        if preserve_zeros:
+            return arr.copy()
+
         out = arr.copy()
 
         if np.issubdtype(out.dtype, np.floating):

pingmapper-5.4.4/pingmapper/version.py

@@ -0,0 +1 @@
+__version__ = '5.4.4'

{pingmapper-5.4.2 → pingmapper-5.4.4}/pingmapper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 5.4.2
+Version: 5.4.4
 Summary: Open-source interface for processing recreation-grade side scan sonar datasets and reproducibly mapping benthic habitat
 Author: Daniel Buscombe
 Author-email: Cameron Bodine <bodine.cs@gmail.email>

pingmapper-5.4.2/pingmapper/version.py

@@ -1 +0,0 @@
-__version__ = '5.4.2'