voxcity 0.3.15__tar.gz → 0.3.17__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.15
+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.15 → voxcity-0.3.17}/pyproject.toml

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

{voxcity-0.3.15 → 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.15 → 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, 
@@ -185,11 +186,12 @@ def get_building_height_grid(rectangle_vertices, meshsize, source, output_dir, *
     
     # Check for complementary building data source
     building_complementary_source = kwargs.get("building_complementary_source") 
+    building_complement_height = kwargs.get("building_complement_height")
 
     if (building_complementary_source is None) or (building_complementary_source=='None'):
         # Use only primary source
         if source != "Open Building 2.5D Temporal":
-            building_height_grid, building_min_height_grid, building_id_grid, filtered_buildings = create_building_height_grid_from_gdf_polygon(gdf, meshsize, rectangle_vertices)
+            building_height_grid, building_min_height_grid, building_id_grid, filtered_buildings = create_building_height_grid_from_gdf_polygon(gdf, meshsize, rectangle_vertices, complement_height=building_complement_height)
     else:
         # Handle complementary source
         if building_complementary_source == "Open Building 2.5D Temporal":
@@ -198,7 +200,14 @@ def get_building_height_grid(rectangle_vertices, meshsize, source, output_dir, *
             os.makedirs(output_dir, exist_ok=True)
             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)   
+            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':
@@ -220,7 +229,7 @@ def get_building_height_grid(rectangle_vertices, meshsize, source, output_dir, *
             
             # Option to complement footprints only or both footprints and heights
             complement_building_footprints = kwargs.get("complement_building_footprints")
-            building_height_grid, building_min_height_grid, building_id_grid, filtered_buildings = create_building_height_grid_from_gdf_polygon(gdf, meshsize, rectangle_vertices, gdf_comp=gdf_comp, complement_building_footprints=complement_building_footprints)
+            building_height_grid, building_min_height_grid, building_id_grid, filtered_buildings = create_building_height_grid_from_gdf_polygon(gdf, meshsize, rectangle_vertices, gdf_comp=gdf_comp, complement_building_footprints=complement_building_footprints, complement_height=building_complement_height)
 
     # Visualize grid if requested
     grid_vis = kwargs.get("gridvis", True)    

{voxcity-0.3.15 → voxcity-0.3.17}/src/voxcity/geoprocessor/draw.py

@@ -223,15 +223,16 @@ def center_location_map_cityname(cityname, east_west_length, north_south_length,
 
     return m, rectangle_vertices
 
-def display_buildings_and_draw_polygon(building_gdf, zoom=17):
+def display_buildings_and_draw_polygon(building_gdf=None, rectangle_vertices=None, zoom=17):
     """
     Displays building footprints (in Lon-Lat order) on an ipyleaflet map,
     and allows the user to draw a polygon whose vertices are returned
     in a Python list (also in Lon-Lat).
 
     Args:
-        building_gdf (GeoDataFrame): A GeoDataFrame containing building footprints,
-                                   with geometry in [lon, lat] order.
+        building_gdf (GeoDataFrame, optional): A GeoDataFrame containing building footprints,
+                                             with geometry in [lon, lat] order.
+        rectangle_vertices (list, optional): List of [lon, lat] coordinates defining rectangle corners.
         zoom (int): Initial zoom level for the map. Default=17.
 
     Returns:
@@ -243,39 +244,48 @@ def display_buildings_and_draw_polygon(building_gdf, zoom=17):
     # ---------------------------------------------------------
     # 1. Determine a suitable map center via bounding box logic
     # ---------------------------------------------------------
-    if len(building_gdf) == 0:
-        # Fallback: If no footprints or invalid data, pick a default
-        center_lon, center_lat = -100.0, 40.0
-    else:
+    if rectangle_vertices is not None:
+        # Get bounds from rectangle vertices
+        lons = [v[0] for v in rectangle_vertices]
+        lats = [v[1] for v in rectangle_vertices]
+        min_lon, max_lon = min(lons), max(lons)
+        min_lat, max_lat = min(lats), max(lats)
+        center_lon = (min_lon + max_lon) / 2
+        center_lat = (min_lat + max_lat) / 2
+    elif building_gdf is not None and len(building_gdf) > 0:
         # Get bounds from GeoDataFrame
         bounds = building_gdf.total_bounds  # Returns [minx, miny, maxx, maxy]
         min_lon, min_lat, max_lon, max_lat = bounds
         center_lon = (min_lon + max_lon) / 2
         center_lat = (min_lat + max_lat) / 2
+    else:
+        # Fallback: If no inputs or invalid data, pick a default
+        center_lon, center_lat = -100.0, 40.0
 
     # Create the ipyleaflet map (needs lat,lon)
     m = Map(center=(center_lat, center_lon), zoom=zoom, scroll_wheel_zoom=True)
 
     # -----------------------------------------
-    # 2. Add each building footprint to the map
+    # 2. Add building footprints to the map if provided
     # -----------------------------------------
-    for idx, row in building_gdf.iterrows():
-        # Only handle simple Polygons
-        if isinstance(row.geometry, geom.Polygon):
-            # Get coordinates from geometry
-            coords = list(row.geometry.exterior.coords)
-            # Convert to (lat,lon) for ipyleaflet, skip last repeated coordinate
-            lat_lon_coords = [(c[1], c[0]) for c in coords[:-1]]
-
-            # Create the polygon layer
-            bldg_layer = LeafletPolygon(
-                locations=lat_lon_coords,
-                color="blue",
-                fill_color="blue",
-                fill_opacity=0.2,
-                weight=2
-            )
-            m.add_layer(bldg_layer)
+    if building_gdf is not None:
+        for idx, row in building_gdf.iterrows():
+            # Only handle simple Polygons
+            if isinstance(row.geometry, geom.Polygon):
+                # Get coordinates from geometry
+                coords = list(row.geometry.exterior.coords)
+                # Convert to (lat,lon) for ipyleaflet, skip last repeated coordinate
+                lat_lon_coords = [(c[1], c[0]) for c in coords[:-1]]
+
+                # Create the polygon layer
+                bldg_layer = LeafletPolygon(
+                    locations=lat_lon_coords,
+                    color="blue",
+                    fill_color="blue",
+                    fill_opacity=0.2,
+                    weight=2
+                )
+                m.add_layer(bldg_layer)
 
     # -----------------------------------------------------------------
     # 3. Enable drawing of polygons, capturing the vertices in Lon-Lat

{voxcity-0.3.15 → voxcity-0.3.17}/src/voxcity/geoprocessor/grid.py

@@ -480,7 +480,8 @@ def create_building_height_grid_from_gdf_polygon(
     rectangle_vertices,
     gdf_comp=None,
     geotiff_path_comp=None,
-    complement_building_footprints=None
+    complement_building_footprints=None,
+    complement_height=None
 ):
     """
     Create a building height grid from GeoDataFrame data within a polygon boundary.
@@ -492,6 +493,7 @@ def create_building_height_grid_from_gdf_polygon(
         gdf_comp (geopandas.GeoDataFrame, optional): Complementary GeoDataFrame
         geotiff_path_comp (str, optional): Path to complementary GeoTIFF file
         complement_building_footprints (bool, optional): Whether to complement footprints
+        complement_height (float, optional): Height value to use for buildings with height=0
 
     Returns:
         tuple: (building_height_grid, building_min_height_grid, building_id_grid, filtered_buildings)
@@ -558,6 +560,11 @@ def create_building_height_grid_from_gdf_polygon(
     for idx_b, row in filtered_gdf.iterrows():
         polygon = row.geometry
         height = row.get('height', None)
+        
+        # Replace height=0 with complement_height if specified
+        if complement_height is not None and (height == 0 or height is None):
+            height = complement_height
+            
         min_height = row.get('min_height', 0)
         is_inner = row.get('is_inner', False)
         feature_id = row.get('id', idx_b)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.15
+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>