voxcity 0.3.16__tar.gz → 0.3.17__tar.gz

{voxcity-0.3.16 → voxcity-0.3.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.16
+Version: 0.3.17
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 Author-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>
 Maintainer-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>

{voxcity-0.3.16 → voxcity-0.3.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "voxcity"
-version = "0.3.16"
+version = "0.3.17"
 requires-python = ">=3.10,<3.13"
 classifiers = [
     "Programming Language :: Python :: 3.10",

{voxcity-0.3.16 → voxcity-0.3.17}/src/voxcity/downloader/gee.py

@@ -393,4 +393,35 @@ def save_geotiff_open_buildings_temporal(aoi, geotiff_path):
         scale=4,
         region=aoi,
         file_per_band=False
-    )
+    )
+
+def save_geotiff_england_dsm_minus_dtm(roi, geotiff_path, meshsize):
+    """Get the height difference between DSM and DTM from England 1m terrain data.
+    
+    Args:
+        roi: Earth Engine geometry defining area of interest
+        geotiff_path: Output path for GeoTIFF file
+        meshsize: Size of each grid cell in meters
+        
+    Returns:
+        ee.Image: Image representing DSM minus DTM (building/vegetation heights)
+    """
+    # Initialize Earth Engine
+    ee.Initialize()
+
+    # Add buffer around ROI to ensure smooth interpolation at edges
+    buffer_distance = 100
+    roi_buffered = roi.buffer(buffer_distance)
+
+    collection_name = 'UK/EA/ENGLAND_1M_TERRAIN/2022'
+    dtm = ee.Image(collection_name).select('dtm')
+    dsm = ee.Image(collection_name).select('dsm_first')
+    
+    # Subtract DTM from DSM to get height difference
+    height_diff = dsm.subtract(dtm)
+
+    # Clip to buffered ROI
+    image = height_diff.clip(roi_buffered)
+
+    # Export as GeoTIFF using meshsize as scale
+    save_geotiff(image, geotiff_path, scale=meshsize, region=roi_buffered, crs='EPSG:4326')

{voxcity-0.3.16 → voxcity-0.3.17}/src/voxcity/generator.py

@@ -34,7 +34,8 @@ from .downloader.gee import (
     save_geotiff_esa_land_cover,
     save_geotiff_esri_landcover,
     save_geotiff_dynamic_world_v1,
-    save_geotiff_open_buildings_temporal
+    save_geotiff_open_buildings_temporal,
+    save_geotiff_england_dsm_minus_dtm
 )
 from .geoprocessor.grid import (
     group_and_label_cells, 
@@ -200,6 +201,13 @@ def get_building_height_grid(rectangle_vertices, meshsize, source, output_dir, *
             geotiff_path_comp = os.path.join(output_dir, "building_height.tif")
             save_geotiff_open_buildings_temporal(roi, geotiff_path_comp)
             building_height_grid, building_min_height_grid, building_id_grid, filtered_buildings = create_building_height_grid_from_gdf_polygon(gdf, meshsize, rectangle_vertices, geotiff_path_comp=geotiff_path_comp, complement_height=building_complement_height)   
+        elif building_complementary_source == "England 1m DSM - DTM":
+            # Special case: use temporal height data as complement
+            roi = get_roi(rectangle_vertices)
+            os.makedirs(output_dir, exist_ok=True)
+            geotiff_path_comp = os.path.join(output_dir, "building_height.tif")
+            save_geotiff_england_dsm_minus_dtm(roi, geotiff_path_comp, meshsize)
+            building_height_grid, building_min_height_grid, building_id_grid, filtered_buildings = create_building_height_grid_from_gdf_polygon(gdf, meshsize, rectangle_vertices, geotiff_path_comp=geotiff_path_comp, complement_height=building_complement_height)
         else:
             # Get complementary data from other sources
             if building_complementary_source == 'Microsoft Building Footprints':

{voxcity-0.3.16 → voxcity-0.3.17}/src/voxcity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.16
+Version: 0.3.17
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 Author-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>
 Maintainer-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>