giga-spatial 0.6.8__tar.gz → 0.7.0__tar.gz

{giga_spatial-0.6.8 → giga_spatial-0.7.0}/CHANGELOG.md

@@ -2,6 +2,66 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v0.7.0] - 2025-09-17
+
+### Added
+
+- **TifProcessor Revamp**
+    - **Explicit Reprojection Method:** Introduced `reproject_to()` method, allowing on-demand reprojection of rasters to a new CRS with customizable `resampling_method` and `resolution`.
+    - **Reprojection Resolution Control:** Added `reprojection_resolution` parameter to `TifProcessor` for precise control over output pixel size during reprojection.
+    - **Advanced Raster Information:** Added `get_raster_info()` method to retrieve a comprehensive dictionary of raster metadata.
+    - **Graph Conversion Capabilities:** Implemented `to_graph()` method to convert raster data into a graph (NetworkX or sparse matrix) based on pixel adjacency (4- or 8-connectivity).
+    - **Internal Refactoring: `_reproject_to_temp_file`:** Introduced `_reproject_to_temp_file` as a helper for reprojection into temporary files.
+
+- **H3 Grid Generation**
+    - **H3 Grid Generation Module (`gigaspatial/grid/h3.py`):**
+        - Introduced `H3Hexagons` class for managing H3 cell IDs.
+        - Supports creation from lists of hexagons, geographic bounds, spatial geometries, or points.
+        - Provides methods to convert H3 hexagons to pandas DataFrames and GeoPandas GeoDataFrames.
+        - Includes functionalities for filtering, getting k-ring neighbors, compacting hexagons, and getting children/parents at different resolutions.
+        - Allows saving H3Hexagons to JSON, Parquet, or GeoJSON files.
+    - **Country-Specific H3 Hexagons (`CountryH3Hexagons`):**
+        - Extends `H3Hexagons` for generating H3 grids constrained by country boundaries.
+        - Integrates with `AdminBoundaries` to fetch country geometries for precise H3 cell generation.
+
+- **Documentation**
+    - Improved `tif.md` example to showcase multi-raster initialization, explicit reprojection, and graph conversion.
+
+### Changed
+
+- **TifProcessor**
+  - **Improved Temporary File Management:** Refactored temporary file handling for merging and reprojection using `tempfile.mkdtemp()` and `shutil.rmtree` for more robust and reliable cleanup. Integrated with context manager (`__enter__`, `__exit__`) and added a dedicated `cleanup()` method.
+  - **Reprojection during Initialization:** Implemented automatic reprojection of single rasters to a specified `target_crs` during `TifProcessor` initialization.
+  - **Enhanced `open_dataset` Context Manager:** The `open_dataset` context manager now intelligently opens the most up-to-date (merged or reprojected) version of the dataset.
+  - **More Flexible Multi-Dataset Validation:** Modified `_validate_multiple_datasets` to issue a warning instead of raising an error for CRS mismatches when `target_crs` is not set.
+  - **Optimized `_get_reprojection_profile`:** Dynamically calculates transform and dimensions based on `reprojection_resolution` and added LZW compression to reprojected TIFF files to reduce file size.
+
+- **ADLSDataStore Enhancements**
+    - **New `copy_file` method:** Implemented a new method for copying individual files within ADLS, with an option to overwrite existing files.
+    - **New `rename` method:** Added a new method to rename (move) files in ADLS, which internally uses `copy_file` and then deletes the source, with options for overwrite, waiting for copy completion, and polling.
+    - **Revamped `rmdir` method:** Modified `rmdir` to perform batch deletions of blobs, addressing the Azure Blob batch delete limit (256 sub-requests) and improving efficiency for large directories.
+
+- **LocalDataStore Enhancements**
+    - **New `copy_file` method:** Implemented a new method for copying individual files.
+
+### Removed
+
+- Removed deprecated `tabular` property and `get_zoned_geodataframe` method from `TifProcessor`. Users should now use `to_dataframe()` and `to_geodataframe()` respectively.
+
+### Dependencies
+
+- Added `networkx` and `h3` as new dependencies.
+
+### Fixed
+
+- Several small fixes and improvements to aggregation methods.
+
+## [v0.6.9] - 2025-07-26
+
+### Fixed
+
+- Resolved a bug in the handler base class where non-hashable types (dicts) were incorrectly used as dictionary keys in `unit_to_path` mapping, preventing potential runtime errors during data availability checks.
+
 ## [v0.6.8] - 2025-07-26
 
 ### Added

{giga_spatial-0.6.8 → giga_spatial-0.7.0}/PKG-INFO

@@ -1,13 +1,29 @@
 Metadata-Version: 2.4
 Name: giga-spatial
-Version: 0.6.8
+Version: 0.7.0
 Summary: A package for spatial data download & processing
-Home-page: https://github.com/unicef/giga-spatial
 Author: Utku Can Ozturk
 Author-email: utkucanozturk@gmail.com
 License: AGPL-3.0-or-later
+Project-URL: Homepage, https://github.com/unicef/giga-spatial
+Project-URL: Documentation, https://unicef.github.io/giga-spatial/
+Project-URL: Source, https://github.com/unicef/giga-spatial
+Project-URL: Issue Tracker, https://github.com/unicef/giga-spatial/issues
+Project-URL: Discussions, https://github.com/unicef/giga-spatial/discussions
+Project-URL: Changelog, https://unicef.github.io/giga-spatial/changelog
 Keywords: gigaspatial,spatial,geospatial,gis,remote sensing,data processing,download,openstreetmap,osm,ghsl,grid,point of interest,POI,raster,vector,school connectivity,unicef,giga,mapping,analysis,python
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Healthcare Industry
+Classifier: Intended Audience :: Science/Research
+Classifier: Intended Audience :: Telecommunications Industry
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Scientific/Engineering :: GIS
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
@@ -24,8 +40,9 @@ Requires-Dist: pycountry==24.6.1
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: rasterio==1.3.10
 Requires-Dist: Requests==2.32.3
-Requires-Dist: scipy==1.15.1
+Requires-Dist: scipy>=1.15.1
 Requires-Dist: Shapely>=2.0.7
+Requires-Dist: networkx>=3.2.1
 Requires-Dist: tqdm==4.65.0
 Requires-Dist: OWSLib==0.32.1
 Requires-Dist: pydantic-settings>=2.7.1
@@ -33,15 +50,16 @@ Requires-Dist: hdx-python-api>=6.3.8
 Requires-Dist: bs4==0.0.2
 Requires-Dist: sqlalchemy-trino==0.5.0
 Requires-Dist: dask>=2024.12.1
+Requires-Dist: h3>=4.2.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
-Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
 Dynamic: license-file
+Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -53,6 +71,14 @@ Dynamic: summary
 
 # GigaSpatial
 
+[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-brightgreen.svg)](https://opensource.org/license/agpl-v3)
+[![PyPI version](https://badge.fury.io/py/giga-spatial.svg)](https://badge.fury.io/py/giga-spatial)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/giga-spatial.svg?color=dark-green)](https://pypi.org/project/giga-spatial/)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![PyPI Downloads](https://static.pepy.tech/badge/giga-spatial)](https://pepy.tech/projects/giga-spatial)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/unicef/giga-spatial.svg?color=dark-green)](https://github.com/unicef/giga-spatial/graphs/contributors)
+
+
 ## About Giga
 
 [Giga](https://giga.global/) is a UNICEF-ITU initiative to connect every school to the Internet and every young person to information, opportunity and choice. 

{giga_spatial-0.6.8 → giga_spatial-0.7.0}/README.md

@@ -5,6 +5,14 @@
 
 # GigaSpatial
 
+[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-brightgreen.svg)](https://opensource.org/license/agpl-v3)
+[![PyPI version](https://badge.fury.io/py/giga-spatial.svg)](https://badge.fury.io/py/giga-spatial)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/giga-spatial.svg?color=dark-green)](https://pypi.org/project/giga-spatial/)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![PyPI Downloads](https://static.pepy.tech/badge/giga-spatial)](https://pepy.tech/projects/giga-spatial)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/unicef/giga-spatial.svg?color=dark-green)](https://github.com/unicef/giga-spatial/graphs/contributors)
+
+
 ## About Giga
 
 [Giga](https://giga.global/) is a UNICEF-ITU initiative to connect every school to the Internet and every young person to information, opportunity and choice. 

giga_spatial-0.7.0/docs/examples/processing/tif.md

@@ -0,0 +1,146 @@
+# Processing Raster Files
+
+This example demonstrates how to process raster files using the `TifProcessor` class.
+
+## Prerequisites
+
+Ensure you have installed the `gigaspatial` package and set up the necessary configuration. Follow the [Installation Guide](../getting-started/installation.md) if you haven’t already.
+
+## Example Code
+
+```python
+from gigaspatial.processing import TifProcessor
+from gigaspatial.core.io import LocalDataStore
+from rasterio.warp import Resampling # For reprojection methods
+
+# NOTE: For these examples, replace "/path/to/your/file.tif" with actual paths to your GeoTIFF files.
+# You might need to create dummy files or use existing ones for local testing.
+
+# 1. Initialize with a single TIFF file
+print("--- Single TIFF File Processing ---")
+single_processor = TifProcessor(
+    "/path/to/single_band.tif", 
+    mode="single" # Can be "rgb", "rgba", "multi"
+)
+df_single = single_processor.to_dataframe()
+print("Single-band DataFrame head:")
+print(df_single.head())
+print("Raster Info for single_processor:")
+print(single_processor.get_raster_info())
+
+
+# 2. Initialize with multiple TIFF files for merging and reprojection
+print("\n--- Multi-raster Merging and Reprojection ---")
+# Replace with actual paths to your tif files. Ensure they are compatible for merging.
+# Example: two adjacent tiles from a dataset.
+tif_paths = [
+    "/path/to/raster1.tif",
+    "/path/to/raster2.tif"
+]
+merged_reprojected_processor = TifProcessor(
+    dataset_path=tif_paths,
+    mode="single", # Or "multi", "rgb", "rgba" depending on your data
+    merge_method="mean", # Options: "first", "last", "min", "max", "mean"
+    target_crs="EPSG:4326", # Reproject all rasters to WGS84 during initialization
+)
+df_merged = merged_reprojected_processor.to_dataframe()
+print("Merged and Reprojected DataFrame head:")
+print(df_merged.head())
+print("Raster Info for merged_reprojected_processor:")
+print(merged_reprojected_processor.get_raster_info())
+
+# 3. Explicit Reprojection after initialization
+print("\n--- Explicit Reprojection ---")
+# Reproject the current raster (e.g., the merged one) to a different CRS or resolution
+# In a real scenario, you'd save this to a persistent location.
+reprojected_output_path = "./temp_reprojected_raster.tif" 
+reprojected_path = merged_reprojected_processor.reproject_to(
+    target_crs="EPSG:3857", # Web Mercator
+    output_path=reprojected_output_path,
+    resampling_method=Resampling.bilinear # Different resampling method
+)
+print(f"Raster reprojected to: {reprojected_path}")
+
+# 4. Convert raster to a graph (NetworkX example)
+print("\n--- Raster to Graph Conversion ---")
+# Assuming '/path/to/single_band.tif' is a suitable single-band raster
+graph_processor = TifProcessor(
+    "/path/to/single_band.tif", 
+    mode="single" # Graph conversion typically for single-band data
+)
+graph = graph_processor.to_graph(
+    connectivity=8, # 4-connectivity (von Neumann) or 8-connectivity (Moore)
+    include_coordinates=True, # Include 'x' and 'y' coordinates as node attributes
+    graph_type="networkx" # Or "sparse" for scipy.sparse.csr_matrix
+)
+print(f"Generated a NetworkX graph with {graph.number_of_nodes()} nodes and {graph.number_of_edges()} edges.")
+# Example: Access node attributes (first 5 nodes)
+# for node_id, data in list(graph.nodes(data=True))[:5]:
+#    print(f"Node {node_id}: Value={data['value']:.2f}, X={data.get('x'):.2f}, Y={data.get('y'):.2f}")
+```
+
+## Explanation
+
+The `TifProcessor` class provides robust functionalities for handling GeoTIFF files, from single-band to multi-band (RGB, RGBA) datasets, with advanced processing capabilities including:
+
+-   **Initialization**:
+    -   Can be initialized with a single GeoTIFF file path.
+    -   Supports a list of GeoTIFF file paths for **automatic merging** during initialization, configured via `merge_method` (`first`, `last`, `min`, `max`, `mean`).
+    -   The `mode` parameter (`single`, `rgb`, `rgba`, `multi`) dictates how bands are interpreted and validated.
+    -   `target_crs` and `reprojection_resolution` can be set during initialization to reproject rasters immediately to a consistent CRS and pixel size.
+-   **Data Extraction**:
+    -   `to_dataframe()`: Converts raster data into a pandas DataFrame, with columns for longitude, latitude, and pixel values (or band-specific values for multi-band modes).
+    -   `to_geodataframe()`: Extends `to_dataframe()` by adding a `geometry` column, converting each pixel into a GeoDataFrame representing its bounding box, with the correct CRS.
+-   **Reprojection (`reproject_to`)**:
+    -   Allows explicit reprojection of the current raster to a new Coordinate Reference System (CRS) and/or resolution, saving the output to a specified path or a temporary file.
+    -   Supports different `resampling_method` options (e.g., `Resampling.nearest`, `Resampling.bilinear`).
+-   **Raster Information (`get_raster_info`)**:
+    -   Provides a dictionary containing comprehensive metadata about the raster, such as band count, dimensions, CRS, bounds, transform, data types, nodata values, processing mode, and merge status.
+-   **Graph Conversion (`to_graph`)**:
+    -   Converts raster data into a graph (NetworkX graph or SciPy sparse matrix) based on pixel adjacency.
+    -   Supports `connectivity` of 4 (von Neumann neighborhood) or 8 (Moore neighborhood).
+    -   Can include geographic coordinates and pixel values as node attributes.
+-   **Sampling**:
+    -   `sample_by_coordinates()`: Extracts pixel values at specific geographic coordinates.
+    -   `sample_by_polygons()`: Computes aggregate statistics (e.g., mean, sum, min, max, count) of pixel values within given polygon boundaries, supporting single or multiple statistics.
+    -   `sample_by_polygons_batched()`: Provides a parallelized version of polygon sampling for performance-intensive tasks.
+
+---
+
+# Multi-raster reprojection
+
+The differences in the reprojected metadata are expected and are a direct result of the order of operations: **reproject then merge** versus **merge then reproject**. The two processes follow different steps, leading to variations in the final raster's dimensions, bounds, and resolution.
+
+---
+
+### **Reproject then Merge**
+
+When you specify `target_crs` at initialization, the code first **reprojects each individual raster** to the target CRS (`EPSG:4326`) and then **merges the reprojected outputs**.
+
+- **Step 1: Reprojection**: Each input raster is reprojected from `ESRI:54009` to `EPSG:4326`. During this step, `rasterio`'s `calculate_default_transform` function computes a new transform and pixel dimensions (`width`, `height`) for each raster. The reprojected rasters are now in the same CRS with a consistent resolution (e.g., `0.00918...` degrees).
+- **Step 2: Merging**: The reprojected rasters, which are now in the same CRS and have similar resolutions, are merged. The `rasterio.merge` function can combine these aligned rasters seamlessly. The final output's dimensions are calculated by finding the union of all reprojected rasters' bounds and applying the shared resolution, resulting in a single, larger raster.
+
+This process ensures a uniform resolution and grid alignment across all parts of the final merged raster.
+
+---
+
+### **Merge then Reproject**
+
+When `target_crs` is not specified at initialization, the code first **merges the two rasters** in their original `ESRI:54009` CRS and then **reprojects the single, merged output** to `EPSG:4326`.
+
+- **Step 1: Merging**: The two rasters are merged in `ESRI:54009`. Since they are in the same CRS and have the same resolution (`1000.0` meters), `rasterio.merge` can simply combine them side-by-side. The original raster was `1000x1000`, so merging a second one next to it likely creates a `2000x1000` raster, as seen in the metadata. The resolution remains `1000.0` meters.
+- **Step 2: Reprojection**: The single `2000x1000` raster is then reprojected to `EPSG:4326`. A new transform and pixel dimensions are calculated for this single, larger raster. Since `calculate_default_transform` is working on a different-shaped input, it will calculate a different output resolution and grid shape. The resulting resolution (`0.00973...`) and dimensions (`2076x832`) will be different because the reprojection is performed on a single, larger input rather than two smaller ones.
+
+---
+
+### **Why the Metadata is Different**
+
+- **Resolution**: The `reproject-then-merge` approach maintains a consistent resolution that is calculated for a single tile and then applied to all. The `merge-then-reproject` approach calculates a single resolution for the entire, larger combined area. The process of resampling to a new grid (a core part of reprojection) is inherently sensitive to the input's size and shape.
+- **Dimensions (`width`, `height`)**: The final pixel dimensions are a function of the total bounds and the final resolution. Since the resolution is different in the two methods, the width and height must also be different to cover the same geographic area.
+- **Bounds**: The final bounds are nearly identical in latitude and longitude, which makes sense because both methods represent the same geographic area. Any slight differences are due to rounding and the nuances of resampling.
+
+**Conclusion**: The differences are normal and reflect the non-commutative nature of these two geospatial operations. The **reproject then merge** approach is generally preferable as it ensures greater consistency and can be more accurate when dealing with rasters that have slightly different resolutions or alignments, as it creates a single, clean grid before combining the data.
+
+---
+
+[Back to Examples](../index.md)

{giga_spatial-0.6.8 → giga_spatial-0.7.0}/giga_spatial.egg-info/PKG-INFO

@@ -1,13 +1,29 @@
 Metadata-Version: 2.4
 Name: giga-spatial
-Version: 0.6.8
+Version: 0.7.0
 Summary: A package for spatial data download & processing
-Home-page: https://github.com/unicef/giga-spatial
 Author: Utku Can Ozturk
 Author-email: utkucanozturk@gmail.com
 License: AGPL-3.0-or-later
+Project-URL: Homepage, https://github.com/unicef/giga-spatial
+Project-URL: Documentation, https://unicef.github.io/giga-spatial/
+Project-URL: Source, https://github.com/unicef/giga-spatial
+Project-URL: Issue Tracker, https://github.com/unicef/giga-spatial/issues
+Project-URL: Discussions, https://github.com/unicef/giga-spatial/discussions
+Project-URL: Changelog, https://unicef.github.io/giga-spatial/changelog
 Keywords: gigaspatial,spatial,geospatial,gis,remote sensing,data processing,download,openstreetmap,osm,ghsl,grid,point of interest,POI,raster,vector,school connectivity,unicef,giga,mapping,analysis,python
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Healthcare Industry
+Classifier: Intended Audience :: Science/Research
+Classifier: Intended Audience :: Telecommunications Industry
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Scientific/Engineering :: GIS
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
@@ -24,8 +40,9 @@ Requires-Dist: pycountry==24.6.1
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: rasterio==1.3.10
 Requires-Dist: Requests==2.32.3
-Requires-Dist: scipy==1.15.1
+Requires-Dist: scipy>=1.15.1
 Requires-Dist: Shapely>=2.0.7
+Requires-Dist: networkx>=3.2.1
 Requires-Dist: tqdm==4.65.0
 Requires-Dist: OWSLib==0.32.1
 Requires-Dist: pydantic-settings>=2.7.1
@@ -33,15 +50,16 @@ Requires-Dist: hdx-python-api>=6.3.8
 Requires-Dist: bs4==0.0.2
 Requires-Dist: sqlalchemy-trino==0.5.0
 Requires-Dist: dask>=2024.12.1
+Requires-Dist: h3>=4.2.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
-Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
 Dynamic: license-file
+Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -53,6 +71,14 @@ Dynamic: summary
 
 # GigaSpatial
 
+[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-brightgreen.svg)](https://opensource.org/license/agpl-v3)
+[![PyPI version](https://badge.fury.io/py/giga-spatial.svg)](https://badge.fury.io/py/giga-spatial)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/giga-spatial.svg?color=dark-green)](https://pypi.org/project/giga-spatial/)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![PyPI Downloads](https://static.pepy.tech/badge/giga-spatial)](https://pepy.tech/projects/giga-spatial)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/unicef/giga-spatial.svg?color=dark-green)](https://github.com/unicef/giga-spatial/graphs/contributors)
+
+
 ## About Giga
 
 [Giga](https://giga.global/) is a UNICEF-ITU initiative to connect every school to the Internet and every young person to information, opportunity and choice. 

{giga_spatial-0.6.8 → giga_spatial-0.7.0}/giga_spatial.egg-info/SOURCES.txt

@@ -61,6 +61,7 @@ gigaspatial/generators/zonal/base.py
 gigaspatial/generators/zonal/geometry.py
 gigaspatial/generators/zonal/mercator.py
 gigaspatial/grid/__init__.py
+gigaspatial/grid/h3.py
 gigaspatial/grid/mercator_tiles.py
 gigaspatial/handlers/__init__.py
 gigaspatial/handlers/base.py

giga_spatial-0.6.8/requirements.txt → giga_spatial-0.7.0/giga_spatial.egg-info/requires.txt

@@ -9,12 +9,14 @@ pycountry==24.6.1
 pydantic>=2.10.6
 rasterio==1.3.10
 Requests==2.32.3
-scipy==1.15.1
+scipy>=1.15.1
 Shapely>=2.0.7
+networkx>=3.2.1
 tqdm==4.65.0
 OWSLib==0.32.1
 pydantic-settings>=2.7.1
 hdx-python-api>=6.3.8
 bs4==0.0.2
 sqlalchemy-trino==0.5.0
-dask>=2024.12.1
+dask>=2024.12.1
+h3>=4.2.0

giga_spatial-0.7.0/gigaspatial/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.0"

{giga_spatial-0.6.8 → giga_spatial-0.7.0}/gigaspatial/core/io/adls_data_store.py

@@ -1,4 +1,5 @@
 from azure.storage.blob import BlobServiceClient
+import time
 import io
 import contextlib
 import logging
@@ -151,20 +152,45 @@ class ADLSDataStore(DataStore):
                     "\\", "/"
                 )
 
-                # Create a source blob client
-                source_blob_client = self.container_client.get_blob_client(blob.name)
+                # Use copy_file method to copy each file
+                self.copy_file(blob.name, new_blob_path, overwrite=True)
 
-                # Create a destination blob client
-                destination_blob_client = self.container_client.get_blob_client(
-                    new_blob_path
+            print(f"Copied directory from {source_dir} to {destination_dir}")
+        except Exception as e:
+            print(f"Failed to copy directory {source_dir}: {e}")
+
+    def copy_file(
+        self, source_path: str, destination_path: str, overwrite: bool = False
+    ):
+        """
+        Copies a single file from source to destination within the same container.
+
+        :param source_path: The source file path in the blob storage
+        :param destination_path: The destination file path in the blob storage
+        :param overwrite: If True, overwrite the destination file if it already exists
+        """
+        try:
+            if not self.file_exists(source_path):
+                raise FileNotFoundError(f"Source file not found: {source_path}")
+
+            if self.file_exists(destination_path) and not overwrite:
+                raise FileExistsError(
+                    f"Destination file already exists and overwrite is False: {destination_path}"
                 )
 
-                # Start the copy operation
-                destination_blob_client.start_copy_from_url(source_blob_client.url)
+            # Create source and destination blob clients
+            source_blob_client = self.container_client.get_blob_client(source_path)
+            destination_blob_client = self.container_client.get_blob_client(
+                destination_path
+            )
 
-            print(f"Copied directory from {source_dir} to {destination_dir}")
+            # Start the server-side copy operation
+            destination_blob_client.start_copy_from_url(source_blob_client.url)
+
+            print(f"Copied file from {source_path} to {destination_path}")
         except Exception as e:
-            print(f"Failed to copy directory {source_dir}: {e}")
+            print(f"Failed to copy file {source_path}: {e}")
+            raise
 
     def exists(self, path: str) -> bool:
         blob_client = self.blob_service_client.get_blob_client(
@@ -285,8 +311,20 @@ class ADLSDataStore(DataStore):
         return False
 
     def rmdir(self, dir: str) -> None:
-        blobs = self.list_files(dir)
-        self.container_client.delete_blobs(*blobs)
+        # Normalize directory path to ensure it targets all children
+        dir_path = dir.rstrip("/") + "/"
+
+        # Azure Blob batch delete has a hard limit on number of sub-requests
+        # per batch (currently 256). Delete in chunks to avoid
+        # ExceedsMaxBatchRequestCount errors.
+        blobs = list(self.list_files(dir_path))
+        if not blobs:
+            return
+
+        BATCH_LIMIT = 256
+        for start_idx in range(0, len(blobs), BATCH_LIMIT):
+            batch = blobs[start_idx : start_idx + BATCH_LIMIT]
+            self.container_client.delete_blobs(*batch)
 
     def mkdir(self, path: str, exist_ok: bool = False) -> None:
         """
@@ -323,3 +361,58 @@ class ADLSDataStore(DataStore):
         )
         if blob_client.exists():
             blob_client.delete_blob()
+
+    def rename(
+        self,
+        source_path: str,
+        destination_path: str,
+        overwrite: bool = False,
+        delete_source: bool = True,
+        wait: bool = True,
+        timeout_seconds: int = 300,
+        poll_interval_seconds: int = 1,
+    ) -> None:
+        """
+        Rename (move) a single file by copying to the new path and deleting the source.
+
+        :param source_path: Existing blob path
+        :param destination_path: Target blob path
+        :param overwrite: Overwrite destination if it already exists
+        :param delete_source: Delete original after successful copy
+        :param wait: Wait for the copy operation to complete
+        :param timeout_seconds: Max time to wait for copy to succeed
+        :param poll_interval_seconds: Polling interval while waiting
+        """
+
+        if not self.file_exists(source_path):
+            raise FileNotFoundError(f"Source file not found: {source_path}")
+
+        if self.file_exists(destination_path) and not overwrite:
+            raise FileExistsError(
+                f"Destination already exists and overwrite is False: {destination_path}"
+            )
+
+        # Use copy_file method to copy the file
+        self.copy_file(source_path, destination_path, overwrite=overwrite)
+
+        if wait:
+            # Wait for copy to complete if requested
+            dest_client = self.container_client.get_blob_client(destination_path)
+            deadline = time.time() + timeout_seconds
+            while True:
+                props = dest_client.get_blob_properties()
+                status = getattr(props.copy, "status", None)
+                if status == "success":
+                    break
+                if status in {"aborted", "failed"}:
+                    raise IOError(
+                        f"Copy failed with status {status} from {source_path} to {destination_path}"
+                    )
+                if time.time() > deadline:
+                    raise TimeoutError(
+                        f"Timed out waiting for copy to complete for {destination_path}"
+                    )
+                time.sleep(poll_interval_seconds)
+
+        if delete_source:
+            self.remove(source_path)

{giga_spatial-0.6.8 → giga_spatial-0.7.0}/gigaspatial/core/io/local_data_store.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 import os
+import shutil
 from typing import Any, List, Generator, Tuple, Union, IO
 
 from .data_store import DataStore
@@ -79,6 +80,13 @@ class LocalDataStore(DataStore):
         if full_path.is_file():
             os.remove(full_path)
 
+    def copy_file(self, src: str, dst: str) -> None:
+        """Copy a file from src to dst."""
+        src_path = self._resolve_path(src)
+        dst_path = self._resolve_path(dst)
+        self.mkdir(str(dst_path.parent), exist_ok=True)
+        shutil.copy2(src_path, dst_path)
+
     def rmdir(self, directory: str) -> None:
         full_path = self._resolve_path(directory)
         if full_path.is_dir():

{giga_spatial-0.6.8 → giga_spatial-0.7.0}/gigaspatial/generators/zonal/geometry.py

@@ -145,11 +145,18 @@ class GeometryBasedZonalViewGenerator(ZonalViewGenerator[T]):
             gpd.GeoDataFrame: A GeoDataFrame with 'zone_id' and 'geometry' columns.
                 The zone_id column is renamed from the original zone_id_column if different.
         """
-        # If we already have a GeoDataFrame, just rename the ID column if needed
-        result = self._zone_gdf.copy()
-        if self.zone_id_column != "zone_id":
-            result = result.rename(columns={self.zone_id_column: "zone_id"})
-        return result
+        # Since _zone_gdf is already created with 'zone_id' column in the constructor,
+        # we just need to return a copy of it
+        return self._zone_gdf.copy()
+
+    @property
+    def zone_gdf(self) -> gpd.GeoDataFrame:
+        """Override the base class zone_gdf property to ensure correct column names.
+
+        Returns:
+            gpd.GeoDataFrame: A GeoDataFrame with 'zone_id' and 'geometry' columns.
+        """
+        return self._zone_gdf.copy()
 
     def map_built_s(
         self,