pingmapper 5.4.8__tar.gz → 5.4.9__tar.gz

{pingmapper-5.4.8 → pingmapper-5.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 5.4.8
+Version: 5.4.9
 Summary: Open-source interface for processing recreation-grade side scan sonar datasets and reproducibly mapping benthic habitat
 Author: Cameron Bodine, Daniel Buscombe, Iury T Simoes-Sousa
 Author-email: bodine.cs@gmail.email

{pingmapper-5.4.8 → pingmapper-5.4.9}/pingmapper/class_mapSubstrateObj.py

@@ -29,7 +29,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import os, sys
+import os, sys, re
 
 # Add 'pingmapper' to the path, may not need after pypi package...
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -1066,9 +1066,12 @@ class mapSubObj(rectObj):
 
         # Extract chunkID from filename and store in dict
         for n in npzs:
-            c = os.path.basename(n)
-            c = c.split('.')[0]
-            c = int(c.split('_')[-1])
+            c = os.path.splitext(os.path.basename(n))[0]
+            match = re.search(r'_(\d+)$', c)
+            if match is None:
+                continue
+
+            c = int(match.group(1))
             toMap[c] = n
 
         del npzDir, npzs

{pingmapper-5.4.8 → pingmapper-5.4.9}/pingmapper/class_portstarObj.py

@@ -714,8 +714,18 @@ class portstarObj(object):
                 except:
                     pass
 
-            # First built a vrt
-            vrt_options = gdal.BuildVRTOptions(resampleAlg=resampleAlg, bandList = bands_to_use)
+            # For substrate/prediction mosaics, enforce configured map resolution.
+            force_map_res = (not son) and (self.port.pix_res_map != 0)
+            if force_map_res:
+                vrt_options = gdal.BuildVRTOptions(
+                    resampleAlg=resampleAlg,
+                    bandList=bands_to_use,
+                    xRes=self.port.pix_res_map,
+                    yRes=self.port.pix_res_map,
+                    targetAlignedPixels=True,
+                )
+            else:
+                vrt_options = gdal.BuildVRTOptions(resampleAlg=resampleAlg, bandList = bands_to_use)
             gdal.BuildVRT(outVRT, imgs, options=vrt_options)
 
             # Create GeoTiff from vrt
@@ -733,7 +743,10 @@ class portstarObj(object):
             # gdal.Translate(outTIF, ds, xRes=xRes, yRes=yRes, **kwargs)
 
             # Create geotiff
-            gdal.Translate(outTIF, ds, **kwargs)
+            if force_map_res:
+                gdal.Translate(outTIF, ds, xRes=self.port.pix_res_map, yRes=self.port.pix_res_map, **kwargs)
+            else:
+                gdal.Translate(outTIF, ds, **kwargs)
 
             # Generate overviews
             if overview:
@@ -841,7 +854,17 @@ class portstarObj(object):
 
             # Build VRT
             # vrt_options = gdal.BuildVRTOptions(resampleAlg=resampleAlg, bandList = bands, xRes=xRes, yRes=yRes)
-            vrt_options = gdal.BuildVRTOptions(resampleAlg=resampleAlg, bandList = bands_to_use)
+            force_map_res = (not son) and (self.port.pix_res_map != 0)
+            if force_map_res:
+                vrt_options = gdal.BuildVRTOptions(
+                    resampleAlg=resampleAlg,
+                    bandList=bands_to_use,
+                    xRes=self.port.pix_res_map,
+                    yRes=self.port.pix_res_map,
+                    targetAlignedPixels=True,
+                )
+            else:
+                vrt_options = gdal.BuildVRTOptions(resampleAlg=resampleAlg, bandList = bands_to_use)
             gdal.BuildVRT(outVRT, imgs, options=vrt_options)
 
             # Generate overviews

{pingmapper-5.4.8 → pingmapper-5.4.9}/pingmapper/class_rectObj.py

@@ -2409,7 +2409,7 @@ class rectObj(sonObj):
         NA
         '''
         filterIntensity = False
-        pix_res = self.pix_res_son
+        pix_res = self.pix_res_son if son else self.pix_res_map
         do_resize = True
 
         # # Set pixel resolution
@@ -2786,7 +2786,7 @@ class rectObj(sonObj):
             del out, img
 
             if do_resize:
-                self._pixresResize(gtiff)
+                self._pixresResize(gtiff, son=son)
 
         if self.rect_wcr:
             if son:
@@ -2932,7 +2932,7 @@ class rectObj(sonObj):
             del out
 
             if do_resize:
-                self._pixresResize(gtiff)
+                self._pixresResize(gtiff, son=son)
 
         gc.collect()
 

pingmapper-5.4.9/pingmapper/version.py

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

{pingmapper-5.4.8 → pingmapper-5.4.9}/pingmapper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 5.4.8
+Version: 5.4.9
 Summary: Open-source interface for processing recreation-grade side scan sonar datasets and reproducibly mapping benthic habitat
 Author: Cameron Bodine, Daniel Buscombe, Iury T Simoes-Sousa
 Author-email: bodine.cs@gmail.email

pingmapper-5.4.8/pingmapper/version.py

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