geoai-py 0.4.0__py2.py3-none-any.whl → 0.4.1__py2.py3-none-any.whl

geoai/__init__.py

@@ -2,34 +2,96 @@
 
 __author__ = """Qiusheng Wu"""
 __email__ = "giswqs@gmail.com"
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 
 import os
 import sys
 
 
-def set_proj_lib_path():
-    """Set the PROJ_LIB environment variable based on the current conda environment."""
+def set_proj_lib_path(verbose=False):
+    """
+    Set the PROJ_LIB and GDAL_DATA environment variables based on the current conda environment.
+
+    This function attempts to locate and set the correct paths for PROJ_LIB and GDAL_DATA
+    by checking multiple possible locations within the conda environment structure.
+
+    Args:
+        verbose (bool): If True, print additional information during the process.
+
+    Returns:
+        bool: True if both paths were set successfully, False otherwise.
+    """
     try:
         # Get conda environment path
         conda_env_path = os.environ.get("CONDA_PREFIX") or sys.prefix
 
+        # Define possible paths for PROJ_LIB
+        possible_proj_paths = [
+            os.path.join(conda_env_path, "share", "proj"),
+            os.path.join(conda_env_path, "Library", "share", "proj"),
+            os.path.join(conda_env_path, "Library", "share"),
+        ]
+
+        # Define possible paths for GDAL_DATA
+        possible_gdal_paths = [
+            os.path.join(conda_env_path, "share", "gdal"),
+            os.path.join(conda_env_path, "Library", "share", "gdal"),
+            os.path.join(conda_env_path, "Library", "data", "gdal"),
+            os.path.join(conda_env_path, "Library", "share"),
+        ]
+
         # Set PROJ_LIB environment variable
-        proj_path = os.path.join(conda_env_path, "share", "proj")
-        gdal_path = os.path.join(conda_env_path, "share", "gdal")
-
-        # Check if the directory exists before setting
-        if os.path.exists(proj_path):
-            os.environ["PROJ_LIB"] = proj_path
-        if os.path.exists(gdal_path):
-            os.environ["GDAL_DATA"] = gdal_path
+        proj_set = False
+        for proj_path in possible_proj_paths:
+            if os.path.exists(proj_path) and os.path.isdir(proj_path):
+                # Verify it contains projection data
+                if os.path.exists(os.path.join(proj_path, "proj.db")):
+                    os.environ["PROJ_LIB"] = proj_path
+                    if verbose:
+                        print(f"PROJ_LIB set to: {proj_path}")
+                    proj_set = True
+                    break
+
+        # Set GDAL_DATA environment variable
+        gdal_set = False
+        for gdal_path in possible_gdal_paths:
+            if os.path.exists(gdal_path) and os.path.isdir(gdal_path):
+                # Verify it contains the header.dxf file or other critical GDAL files
+                if os.path.exists(
+                    os.path.join(gdal_path, "header.dxf")
+                ) or os.path.exists(os.path.join(gdal_path, "gcs.csv")):
+                    os.environ["GDAL_DATA"] = gdal_path
+                    if verbose:
+                        print(f"GDAL_DATA set to: {gdal_path}")
+                    gdal_set = True
+                    break
+
+        # If paths still not found, try a last-resort approach
+        if not proj_set or not gdal_set:
+            # Try a deep search in the conda environment
+            for root, dirs, files in os.walk(conda_env_path):
+                if not gdal_set and "header.dxf" in files:
+                    os.environ["GDAL_DATA"] = root
+                    if verbose:
+                        print(f"GDAL_DATA set to: {root} (deep search)")
+                    gdal_set = True
+
+                if not proj_set and "proj.db" in files:
+                    os.environ["PROJ_LIB"] = root
+                    if verbose:
+                        print(f"PROJ_LIB set to: {root} (deep search)")
+                    proj_set = True
+
+                if proj_set and gdal_set:
+                    break
+
     except Exception as e:
-        print(e)
+        print(f"Error setting projection library paths: {e}")
         return
 
 
-if "google.colab" not in sys.modules:
-    set_proj_lib_path()
+# if ("google.colab" not in sys.modules) and (sys.platform != "windows"):
+#     set_proj_lib_path()
 
 from .geoai import *

geoai/utils.py

@@ -32,13 +32,6 @@ from shapely.geometry import MultiPolygon, Polygon, box, mapping, shape
 from torchvision.transforms import RandomRotation
 from tqdm import tqdm
 
-try:
-    from torchgeo.datasets import RasterDataset, unbind_samples
-except ImportError as e:
-    raise ImportError(
-        "Your torchgeo version is too old. Please upgrade to the latest version using 'pip install -U torchgeo'."
-    )
-
 
 def view_raster(
     source: str,
@@ -53,7 +46,7 @@ def view_raster(
     zoom_to_layer: Optional[bool] = True,
     visible: Optional[bool] = True,
     opacity: Optional[float] = 1.0,
-    array_args: Optional[Dict] = {},
+    array_args: Optional[Dict] = None,
     client_args: Optional[Dict] = {"cors_all": False},
     basemap: Optional[str] = "OpenStreetMap",
     basemap_args: Optional[Dict] = None,
@@ -94,6 +87,9 @@ def view_raster(
     if basemap_args is None:
         basemap_args = {}
 
+    if array_args is None:
+        array_args = {}
+
     m = leafmap.Map()
 
     if isinstance(basemap, str):
@@ -277,6 +273,14 @@ def plot_batch(
     Returns:
         None
     """
+
+    try:
+        from torchgeo.datasets import unbind_samples
+    except ImportError as e:
+        raise ImportError(
+            "Your torchgeo version is too old. Please upgrade to the latest version using 'pip install -U torchgeo'."
+        )
+
     # Get the samples and the number of items in the batch
     samples = unbind_samples(batch.copy())
 
@@ -316,9 +320,7 @@ def plot_batch(
             )
 
 
-def calc_stats(
-    dataset: RasterDataset, divide_by: float = 1.0
-) -> Tuple[np.ndarray, np.ndarray]:
+def calc_stats(dataset, divide_by: float = 1.0) -> Tuple[np.ndarray, np.ndarray]:
     """
     Calculate the statistics (mean and std) for the entire dataset.
 
@@ -5667,11 +5669,14 @@ def orthogonalize(
         crs = src.crs
 
         # Extract shapes from the raster mask
-        shapes = features.shapes(mask, transform=transform)
+        shapes = list(features.shapes(mask, transform=transform))
+
+        # Initialize progress bar
+        print(f"Processing {len(shapes)} features...")
 
         # Convert shapes to GeoJSON features
         features_list = []
-        for shape, value in shapes:
+        for shape, value in tqdm(shapes, desc="Converting features", unit="shape"):
             if value > 0:  # Only process non-zero values (actual objects)
                 # Convert GeoJSON geometry to Shapely polygon
                 polygon = Polygon(shape["coordinates"][0])
@@ -5811,6 +5816,8 @@ def orthogonalize(
 
         # Save to file if output_path is provided
         if output_path:
+            print(f"Saving to {output_path}...")
             gdf.to_file(output_path)
+            print("Done!")
 
         return gdf

{geoai_py-0.4.0.dist-info → geoai_py-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: geoai-py
-Version: 0.4.0
+Version: 0.4.1
 Summary: A Python package for using Artificial Intelligence (AI) with geospatial data
 Author-email: Qiusheng Wu <giswqs@gmail.com>
 License: MIT License
@@ -36,13 +36,8 @@ Requires-Dist: torch
 Requires-Dist: torchgeo
 Requires-Dist: tqdm
 Requires-Dist: transformers
-Provides-Extra: download
-Requires-Dist: pystac_client; extra == "download"
-Requires-Dist: planetary_computer; extra == "download"
-Requires-Dist: tqdm; extra == "download"
-Requires-Dist: overturemaps; extra == "download"
-Provides-Extra: all
-Requires-Dist: geoai[download]; extra == "all"
+Provides-Extra: extra
+Requires-Dist: overturemaps; extra == "extra"
 
 # GeoAI: Artificial Intelligence for Geospatial Data
 

{geoai_py-0.4.0.dist-info → geoai_py-0.4.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-geoai/__init__.py,sha256=rtBuAkA1JMtY_o_PE3kdaFftrp5K9YBQxdi5y99ktPU,923
+geoai/__init__.py,sha256=lZ5LYzlwjX-TuvVtvuk0TC0le80P83lfUUOXBY0MPoU,3592
 geoai/download.py,sha256=eqMecJqvqyrIVFViNA7pW8a5EIhqYJzRILmxQoFHG2k,13095
 geoai/extract.py,sha256=CCXjUcGC4ZOKOKKjvElp8VFmTz46b0ATvGitbOPgTwE,95506
 geoai/geoai.py,sha256=L1jkozDcjqJXvqT6i8oW04Ix9x4cc2-LNYi9_564ABQ,163
@@ -6,10 +6,10 @@ geoai/hf.py,sha256=mLKGxEAS5eHkxZLwuLpYc1o7e3-7QIXdBv-QUY-RkFk,17072
 geoai/segment.py,sha256=g3YW17ftr--CKq6VB32TJEPY8owGQ7uQ0sg_tUT2ooE,13681
 geoai/segmentation.py,sha256=AtPzCvguHAEeuyXafa4bzMFATvltEYcah1B8ZMfkM_s,11373
 geoai/train.py,sha256=VaeFzIkVUNTdre8ImgUNhmbpA42qijSXaajLpmBF_Ic,36248
-geoai/utils.py,sha256=Q5f-mFVjer7BKipt4GOI9QFvTRsdB8V48LpkqlfBg2o,223437
-geoai_py-0.4.0.dist-info/LICENSE,sha256=vN2L5U7cZ6ZkOHFmc8WiGlsogWsZc5dllMeNxnKVOZg,1070
-geoai_py-0.4.0.dist-info/METADATA,sha256=xRCruLClbNxRuXn3A-729IWqiyO-B08VFbpMvrN-ErI,6297
-geoai_py-0.4.0.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
-geoai_py-0.4.0.dist-info/entry_points.txt,sha256=uGp3Az3HURIsRHP9v-ys0hIbUuBBNUfXv6VbYHIXeg4,41
-geoai_py-0.4.0.dist-info/top_level.txt,sha256=1YkCUWu-ii-0qIex7kbwAvfei-gos9ycyDyUCJPNWHY,6
-geoai_py-0.4.0.dist-info/RECORD,,
+geoai/utils.py,sha256=oBNhk73_Owv-pmaRyBKkq0HinnqnMgP3U5CUAQx6ln0,223700
+geoai_py-0.4.1.dist-info/LICENSE,sha256=vN2L5U7cZ6ZkOHFmc8WiGlsogWsZc5dllMeNxnKVOZg,1070
+geoai_py-0.4.1.dist-info/METADATA,sha256=0JZwrVh1EtR3mJIu8cumnafbCnElW70iBa77hSDwXHk,6078
+geoai_py-0.4.1.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
+geoai_py-0.4.1.dist-info/entry_points.txt,sha256=uGp3Az3HURIsRHP9v-ys0hIbUuBBNUfXv6VbYHIXeg4,41
+geoai_py-0.4.1.dist-info/top_level.txt,sha256=1YkCUWu-ii-0qIex7kbwAvfei-gos9ycyDyUCJPNWHY,6
+geoai_py-0.4.1.dist-info/RECORD,,