pingmapper 5.2.0__tar.gz → 5.2.1__tar.gz

{pingmapper-5.2.0 → pingmapper-5.2.1}/PKG-INFO

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

{pingmapper-5.2.0 → pingmapper-5.2.1}/pingmapper/funcs_common.py

@@ -316,6 +316,19 @@ def downloadSegmentationModelsv1_0(modelDir):
     return
 
 
+# =========================================================
+def get_segmentation_model_dir():
+    """
+    Return the default local directory for segmentation models.
+    Models are stored in the user's home folder to avoid deep environment paths
+    that can break zip extraction on Windows.
+    """
+    home_dir = os.path.expanduser('~')
+    return os.path.normpath(
+        os.path.join(home_dir, '.pingmapper', 'models', 'PINGMapperv2.0_SegmentationModelsv1.0')
+    )
+
+
 # # =========================================================
 # def saveDefaultParams(values):
 

{pingmapper-5.2.0 → pingmapper-5.2.1}/pingmapper/main_mapSubstrate.py

@@ -124,8 +124,7 @@ def map_master_func(logfilename='',
     ############
     # Parameters
     # modelDir = os.path.join(SCRIPT_DIR, 'models', 'PINGMapperv2.0_SegmentationModelsv1.0')
-    d = os.environ['CONDA_PREFIX']
-    modelDir = os.path.join(d, 'pingmapper_config', 'models', 'PINGMapperv2.0_SegmentationModelsv1.0')
+    modelDir = get_segmentation_model_dir()
     flip = False #Flip port/star
     filter = int(nchunk*0.1) #Filters trackline coordinates for smoothing
     filterRange = filter #int(nchunk*0.05) #Filters range extent coordinates for smoothing

{pingmapper-5.2.0 → pingmapper-5.2.1}/pingmapper/main_readFiles.py

@@ -300,9 +300,7 @@ def read_master_func(logfilename='',
 
     #####################################
     # Download models if they don't exist
-    d = os.environ['CONDA_PREFIX']
-    modelDir = os.path.join(d, 'pingmapper_config', 'models', 'PINGMapperv2.0_SegmentationModelsv1.0')
-    modelDir = os.path.normpath(modelDir)
+    modelDir = get_segmentation_model_dir()
     if not os.path.exists(modelDir):
         downloadSegmentationModelsv1_0(modelDir)
         getSegformer = True

pingmapper-5.2.1/pingmapper/version.py

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

{pingmapper-5.2.0 → pingmapper-5.2.1}/pingmapper.egg-info/PKG-INFO

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

pingmapper-5.2.0/pingmapper/version.py

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