giga-spatial 0.6.3__py3-none-any.whl → 0.6.5__py3-none-any.whl

gigaspatial/handlers/ghsl.py

@@ -14,7 +14,6 @@ import requests
 from tqdm import tqdm
 import zipfile
 import tempfile
-import shutil
 from pydantic import (
     HttpUrl,
     Field,
@@ -25,8 +24,6 @@ from pydantic import (
 import logging
 
 from gigaspatial.core.io.data_store import DataStore
-from gigaspatial.core.io.local_data_store import LocalDataStore
-from gigaspatial.handlers.boundaries import AdminBoundaries
 from gigaspatial.processing.tif_processor import TifProcessor
 from gigaspatial.handlers.base import (
     BaseHandlerConfig,
@@ -241,8 +238,8 @@ class GHSLDataConfig(BaseHandlerConfig):
             ValueError: If the input `source` is not one of the supported types.
         """
         if isinstance(source, gpd.GeoDataFrame):
-            # if source.crs != "EPSG:4326":
-            #    source = source.to_crs("EPSG:4326")
+            if source.crs != crs:
+                source = source.to_crs(crs)
             search_geom = source.geometry.unary_union
         elif isinstance(
             source,
@@ -273,7 +270,9 @@ class GHSLDataConfig(BaseHandlerConfig):
             tile_geom.intersects(search_geom) for tile_geom in self.tiles_gdf.geometry
         )
 
-        return self.tiles_gdf.loc[mask, "tile_id"].to_list()
+        intersecting_tiles = self.tiles_gdf.loc[mask, "tile_id"].to_list()
+
+        return intersecting_tiles
 
     def _get_product_info(self) -> dict:
         """Generate and return common product information used in multiple methods."""
@@ -340,7 +339,7 @@ class GHSLDataDownloader(BaseHandlerDownloader):
 
         Args:
             tile_id: tile ID to process.
-            extract: If True and the downloaded file is a zip, extract its contents. Defaults to False.
+            extract: If True and the downloaded file is a zip, extract its contents. Defaults to True.
             file_pattern: Optional regex pattern to filter extracted files (if extract=True).
             **kwargs: Additional parameters passed to download methods
 
@@ -356,14 +355,34 @@ class GHSLDataDownloader(BaseHandlerDownloader):
             return self._download_file(url, output_path)
 
         extracted_files: List[Path] = []
+        temp_downloaded_path: Optional[Path] = None
 
         try:
             with tempfile.NamedTemporaryFile(delete=False, suffix=".zip") as temp_file:
-                downloaded_path = self._download_file(url, Path(temp_file.name))
-                if not downloaded_path:
-                    return None
+                temp_downloaded_path = Path(temp_file.name)
+                self.logger.debug(
+                    f"Downloading {url} to temporary file: {temp_downloaded_path}"
+                )
+
+                response = requests.get(url, stream=True)
+                response.raise_for_status()
+
+                total_size = int(response.headers.get("content-length", 0))
+
+                with tqdm(
+                    total=total_size,
+                    unit="B",
+                    unit_scale=True,
+                    desc=f"Downloading {tile_id}",
+                ) as pbar:
+                    for chunk in response.iter_content(chunk_size=8192):
+                        if chunk:
+                            temp_file.write(chunk)
+                            pbar.update(len(chunk))
+
+            self.logger.info(f"Successfully downloaded temporary file!")
 
-            with zipfile.ZipFile(str(downloaded_path), "r") as zip_ref:
+            with zipfile.ZipFile(str(temp_downloaded_path), "r") as zip_ref:
                 if file_pattern:
                     import re
 
@@ -385,9 +404,24 @@ class GHSLDataDownloader(BaseHandlerDownloader):
             Path(temp_file.name).unlink()
             return extracted_files
 
+        except requests.exceptions.RequestException as e:
+            self.logger.error(f"Failed to download {url} to temporary file: {e}")
+            return None
+        except zipfile.BadZipFile:
+            self.logger.error(f"Downloaded file for {tile_id} is not a valid zip file.")
+            return None
         except Exception as e:
             self.logger.error(f"Error downloading/extracting tile {tile_id}: {e}")
             return None
+        finally:
+            if temp_downloaded_path and temp_downloaded_path.exists():
+                try:
+                    temp_downloaded_path.unlink()
+                    self.logger.debug(f"Deleted temporary file: {temp_downloaded_path}")
+                except OSError as e:
+                    self.logger.warning(
+                        f"Could not delete temporary file {temp_downloaded_path}: {e}"
+                    )
 
     def download_data_units(
         self,
@@ -401,7 +435,7 @@ class GHSLDataDownloader(BaseHandlerDownloader):
 
         Args:
             tile_ids: A list of tile IDs to download.
-            extract: If True and the downloaded files are zips, extract their contents. Defaults to False.
+            extract: If True and the downloaded files are zips, extract their contents. Defaults to True.
             file_pattern: Optional regex pattern to filter extracted files (if extract=True).
             **kwargs: Additional parameters passed to download methods
 
@@ -456,7 +490,7 @@ class GHSLDataDownloader(BaseHandlerDownloader):
                       - A list of (latitude, longitude) tuples or Shapely Point objects.
                       - A Shapely BaseGeometry object (e.g., Polygon, MultiPolygon).
                       - A GeoDataFrame with geometry column in EPSG:4326.
-            extract: If True and the downloaded files are zips, extract their contents. Defaults to False.
+            extract: If True and the downloaded files are zips, extract their contents. Defaults to True.
             file_pattern: Optional regex pattern to filter extracted files (if extract=True).
             **kwargs: Additional keyword arguments. These will be passed down to
                       `AdminBoundaries.create()` (if `source` is a country)
@@ -496,7 +530,7 @@ class GHSLDataDownloader(BaseHandlerDownloader):
             country_geom_path: Optional path to a GeoJSON file containing the
                                country boundary. If provided, this boundary is used
                                instead of the default from `AdminBoundaries`.
-            extract: If True and the downloaded files are zips, extract their contents. Defaults to False.
+            extract: If True and the downloaded files are zips, extract their contents. Defaults to True.
             file_pattern: Optional regex pattern to filter extracted files (if extract=True).
             **kwargs: Additional keyword arguments that are passed to
                       `download_data_units`. For example, `extract` to download and extract.
@@ -770,3 +804,34 @@ class GHSLDataHandler(BaseHandler):
         return pd.concat(
             [tp.to_dataframe() for tp in tif_processors], ignore_index=True
         )
+    
+    def load_into_geodataframe(
+        self,
+        source: Union[
+            str,  # country
+            List[Union[tuple, Point]],  # points
+            BaseGeometry,  # geometry
+            gpd.GeoDataFrame,  # geodataframe
+            Path,  # path
+            List[Union[str, Path]],  # list of paths
+        ],
+        ensure_available: bool = True,
+        **kwargs,
+    ) -> pd.DataFrame:
+        """
+        Load GHSL data into a geopandas GeoDataFrame.
+
+        Args:
+            source: The data source specification
+            ensure_available: If True, ensure data is downloaded before loading
+            **kwargs: Additional parameters passed to load methods
+
+        Returns:
+            GeoDataFrame containing the GHSL data
+        """
+        tif_processors = self.load_data(
+            source=source, ensure_available=ensure_available, **kwargs
+        )
+        return pd.concat(
+            [tp.to_geodataframe() for tp in tif_processors], ignore_index=True
+        )