voxcity 0.3.21__py3-none-any.whl → 0.3.22__py3-none-any.whl

voxcity/downloader/gee.py

@@ -135,6 +135,10 @@ def get_dem_image(roi_buffered, source):
         collection_name = 'AU/GA/AUSTRALIA_5M_DEM'
         collection = ee.ImageCollection(collection_name)
         dem = collection.select('elevation').mosaic()
+    elif source == 'Netherlands 0.5m DTM':
+        collection_name = 'AHN/AHN4'
+        collection = ee.ImageCollection(collection_name)
+        dem = collection.select('dtm').mosaic()
     elif source == 'USGS 3DEP 1m':
         collection_name = 'USGS/3DEP/1m'
         dem = ee.ImageCollection(collection_name).mosaic()
@@ -395,13 +399,14 @@ def save_geotiff_open_buildings_temporal(aoi, geotiff_path):
         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.
+def save_geotiff_dsm_minus_dtm(roi, geotiff_path, meshsize, source):
+    """Get the height difference between DSM and DTM from 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
+        source: Source of terrain data ('England' or 'Netherlands')
         
     Returns:
         ee.Image: Image representing DSM minus DTM (building/vegetation heights)
@@ -413,9 +418,16 @@ def save_geotiff_england_dsm_minus_dtm(roi, geotiff_path, meshsize):
     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')
+    if source == 'England 1m DSM - DTM':
+        collection_name = 'UK/EA/ENGLAND_1M_TERRAIN/2022'
+        dtm = ee.Image(collection_name).select('dtm')
+        dsm = ee.Image(collection_name).select('dsm_first')
+    elif source == 'Netherlands 0.5m DSM - DTM':
+        collection = ee.ImageCollection('AHN/AHN4').filterBounds(roi_buffered)
+        dtm = collection.select('dtm').mosaic()
+        dsm = collection.select('dsm').mosaic()
+    else:
+        raise ValueError("Source must be either 'England' or 'Netherlands'")
     
     # Subtract DTM from DSM to get height difference
     height_diff = dsm.subtract(dtm)

voxcity/downloader/mbfp.py

@@ -100,4 +100,7 @@ def get_mbfp_gdf(output_dir, rectangle_vertices):
     # Load GeoJSON data from downloaded files and fix coordinate ordering
     gdf = load_gdf_from_multiple_gz(filenames)    
 
+    # Replace id column with index numbers
+    gdf['id'] = gdf.index
+    
     return gdf

voxcity/generator.py

@@ -35,7 +35,7 @@ from .downloader.gee import (
     save_geotiff_esri_landcover,
     save_geotiff_dynamic_world_v1,
     save_geotiff_open_buildings_temporal,
-    save_geotiff_england_dsm_minus_dtm
+    save_geotiff_dsm_minus_dtm
 )
 from .geoprocessor.grid import (
     group_and_label_cells, 
@@ -201,12 +201,12 @@ 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":
+        elif building_complementary_source in ["England 1m DSM - DTM", "Netherlands 0.5m 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)
+            save_geotiff_dsm_minus_dtm(roi, geotiff_path_comp, meshsize, building_complementary_source)
             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

voxcity/geoprocessor/grid.py

@@ -541,11 +541,16 @@ def create_building_height_grid_from_gdf_polygon(
     plotting_box = box(extent[2], extent[0], extent[3], extent[1])
     filtered_gdf = gdf[gdf.geometry.intersects(plotting_box)].copy()
 
+    # Count buildings with height=0 or NaN
+    zero_height_count = len(filtered_gdf[filtered_gdf['height'] == 0])
+    nan_height_count = len(filtered_gdf[filtered_gdf['height'].isna()])
+    print(f"{zero_height_count+nan_height_count} of the total {len(filtered_gdf)} building footprint from the base data source did not have height data.")
+
     # Optionally merge heights from complementary sources
     if gdf_comp is not None:
         filtered_gdf_comp = gdf_comp[gdf_comp.geometry.intersects(plotting_box)].copy()
         if complement_building_footprints:
-            filtered_gdf = complement_building_heights_gdf(filtered_gdf, filtered_gdf_comp)
+            filtered_gdf = complement_building_heights_from_gdf(filtered_gdf, filtered_gdf_comp)
         else:
             filtered_gdf = extract_building_heights_from_gdf(filtered_gdf, filtered_gdf_comp)
     elif geotiff_path_comp:

voxcity/geoprocessor/polygon.py

@@ -201,8 +201,9 @@ def extract_building_heights_from_gdf(gdf_0: gpd.GeoDataFrame, gdf_1: gpd.GeoDat
     
     # Print statistics about height updates
     if count_0 > 0:
-        print(f"{count_0} of the total {len(gdf_primary)} building footprint from OSM did not have height data.")
-        print(f"For {count_1} of these building footprints without height, values from Microsoft Building Footprints were assigned.")
+        # print(f"{count_0} of the total {len(gdf_primary)} building footprint from OSM did not have height data.")
+        print(f"For {count_1} of these building footprints without height, values from the complementary source were assigned.")
+        print(f"For {count_2} of these building footprints without height, no data exist in complementary data.")
 
     return gdf_primary
 
@@ -377,7 +378,6 @@ def complement_building_heights_from_gdf(gdf_0, gdf_1,
 
     Returns:
         gpd.GeoDataFrame: Updated GeoDataFrame (including new buildings).
-                         You can convert it back to a list of dict features if needed.
     """
     # Make a copy of input GeoDataFrames to avoid modifying originals
     gdf_primary = gdf_0.copy()
@@ -406,7 +406,6 @@ def complement_building_heights_from_gdf(gdf_0, gdf_1,
 
     # Compute intersection area
     intersect_gdf['intersect_area'] = intersect_gdf.area
-    # Weighted area (height_ref * intersect_area)
     intersect_gdf['height_area'] = intersect_gdf['height_ref'] * intersect_gdf['intersect_area']
 
     # ----------------------------------------------------------------
@@ -417,7 +416,7 @@ def complement_building_heights_from_gdf(gdf_0, gdf_1,
         'height_area': 'sum',
         'intersect_area': 'sum'
     }
-    grouped = intersect_gdf.groupby(gdf_primary[primary_id].name).agg(group_cols)
+    grouped = intersect_gdf.groupby(f'{primary_id}_1').agg(group_cols)
 
     # Weighted average
     grouped['weighted_height'] = grouped['height_area'] / grouped['intersect_area']
@@ -433,10 +432,10 @@ def complement_building_heights_from_gdf(gdf_0, gdf_1,
 
     # Where primary had zero or missing height, we assign the new weighted height
     zero_or_nan_mask = (gdf_primary['height_primary'] == 0) | (gdf_primary['height_primary'].isna())
-    gdf_primary.loc[zero_or_nan_mask, 'height_primary'] = gdf_primary.loc[zero_or_nan_mask, 'weighted_height']
-
-    # For any building that had no overlap, 'weighted_height' might be NaN.
-    # Keep it as NaN or set to 0 if you prefer:
+    
+    # Only update heights where we have valid weighted heights
+    valid_weighted_height_mask = zero_or_nan_mask & gdf_primary['weighted_height'].notna()
+    gdf_primary.loc[valid_weighted_height_mask, 'height_primary'] = gdf_primary.loc[valid_weighted_height_mask, 'weighted_height']
     gdf_primary['height_primary'] = gdf_primary['height_primary'].fillna(np.nan)
 
     # ----------------------------------------------------------------
@@ -448,10 +447,11 @@ def complement_building_heights_from_gdf(gdf_0, gdf_1,
     
     # For building-level intersection, do a left join of ref onto primary.
     # Then we'll identify which reference IDs are missing from the intersection result.
-    sjoin_gdf = gpd.sjoin(gdf_ref, gdf_primary, how='left', op='intersects')
-
-    # All reference buildings that did not intersect any primary building
-    non_intersect_ids = sjoin_gdf.loc[sjoin_gdf[primary_id].isna(), ref_id].unique()
+    sjoin_gdf = gpd.sjoin(gdf_ref, gdf_primary, how='left', predicate='intersects')
+    
+    # Find reference buildings that don't intersect with any primary building
+    non_intersect_mask = sjoin_gdf[f'{primary_id}_right'].isna()
+    non_intersect_ids = sjoin_gdf[non_intersect_mask][f'{ref_id}_left'].unique()
 
     # Extract them from the original reference GDF
     gdf_ref_non_intersect = gdf_ref[gdf_ref[ref_id].isin(non_intersect_ids)]
@@ -473,6 +473,29 @@ def complement_building_heights_from_gdf(gdf_0, gdf_1,
     # Concatenate
     final_gdf = pd.concat([gdf_primary, gdf_ref_non_intersect], ignore_index=True)
 
+    # Calculate statistics
+    count_total = len(gdf_primary)
+    count_0 = len(gdf_primary[zero_or_nan_mask])
+    count_1 = len(gdf_primary[valid_weighted_height_mask])
+    count_2 = count_0 - count_1
+    count_3 = len(gdf_ref_non_intersect)
+    count_4 = count_3
+    height_mask = gdf_ref_non_intersect['height'].notna() & (gdf_ref_non_intersect['height'] > 0)
+    count_5 = len(gdf_ref_non_intersect[height_mask])
+    count_6 = count_4 - count_5
+    final_height_mask = final_gdf['height'].notna() & (final_gdf['height'] > 0)
+    count_7 = len(final_gdf[final_height_mask])
+    count_8 = len(final_gdf)
+
+    # Print statistics if there were buildings without height data
+    if count_0 > 0:
+        print(f"{count_0} of the total {count_total} building footprints from base data source did not have height data.")
+        print(f"For {count_1} of these building footprints without height, values from complementary data were assigned.")
+        print(f"For the rest {count_2}, no data exists in complementary data.")
+        print(f"Footprints of {count_3} buildings were added from the complementary source.")
+        print(f"Of these {count_4} additional building footprints, {count_5} had height data while {count_6} had no height data.")
+        print(f"In total, {count_7} buildings had height data out of {count_8} total building footprints.")
+
     return final_gdf
 
 
@@ -616,8 +639,8 @@ def extract_building_heights_from_geotiff(geotiff_path, gdf):
                     gdf.at[idx, 'height'] = float(np.mean(heights))
                 else:
                     count_2 += 1
-                    gdf.at[idx, 'height'] = 10
-                    print(f"No valid height data for building at index {idx}")
+                    gdf.at[idx, 'height'] = np.nan
+                    # print(f"No valid height data for building at index {idx}")
             except ValueError as e:
                 print(f"Error processing building at index {idx}. Error: {str(e)}")
                 gdf.at[idx, 'height'] = None
@@ -626,7 +649,7 @@ def extract_building_heights_from_geotiff(geotiff_path, gdf):
     if count_0 > 0:
         print(f"{count_0} of the total {len(gdf)} building footprint from OSM did not have height data.")
         print(f"For {count_1} of these building footprints without height, values from complementary data were assigned.")
-        print(f"For {count_2} of these building footprints without height, no data exist in complementary data. Height values of 10m were set instead")
+        print(f"For {count_2} of these building footprints without height, no data exist in complementary data.")
 
     return gdf
 

{voxcity-0.3.21.dist-info → voxcity-0.3.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.21
+Version: 0.3.22
 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.21.dist-info → voxcity-0.3.22.dist-info}/RECORD

@@ -1,9 +1,9 @@
 voxcity/__init__.py,sha256=el9v3gfybHOF_GUYPeSOqN0-vCrTW0eU1mcvi0sEfeU,252
-voxcity/generator.py,sha256=2wmfiCXJREOC0zxq6GB8ECxtGjk42UYzGvf5vGZuEOg,34359
+voxcity/generator.py,sha256=dEhEGWF7Wgz8BwtX-eheAmn85VzhgJC9SckVQohVzzo,34406
 voxcity/downloader/__init__.py,sha256=OgGcGxOXF4tjcEL6DhOnt13DYPTvOigUelp5xIpTqM0,171
 voxcity/downloader/eubucco.py,sha256=XCkkdEPNuWdrnuxzL80Ext37WsgiCiZGueb-aQV5rvI,14476
-voxcity/downloader/gee.py,sha256=C5Y3UFAK4-AcBQwUd5FQNDwwxT_iqfElAHWiVJTkF9k,15471
-voxcity/downloader/mbfp.py,sha256=5fXq9S7qNVSLDdVtj67Da1pBAJP6kL4P8qLZTOmWqdw,3895
+voxcity/downloader/gee.py,sha256=hEN5OvQAltORYnrlPbmYcDequ6lKLmwyTbNaCZ81Vj8,16089
+voxcity/downloader/mbfp.py,sha256=pGJuXXLRuRedlORXfg8WlgAVwmKI30jxki9t-v5NejY,3972
 voxcity/downloader/oemj.py,sha256=YlCuWBQfi40gfmwQcGDeHiPOs4Pk_jLZq65d5R3IGMU,7886
 voxcity/downloader/omt.py,sha256=ByFvoQDnBOJF4qdVYNkDjn7cMvEhWwtD0mIV_T-zMEs,9017
 voxcity/downloader/osm.py,sha256=0VpYuPRiO3iru3nHM_or0nTDFb8ytUUDZieFX6zxB9Q,26338
@@ -15,10 +15,10 @@ voxcity/exporter/magicavoxel.py,sha256=Fsv7yGRXeKmp82xcG3rOb0t_HtoqltNq2tHl08xVl
 voxcity/exporter/obj.py,sha256=oW-kPoZj53nfmO9tXP3Wvizq6Kkjh-QQR8UBexRuMiI,21609
 voxcity/geoprocessor/__init_.py,sha256=JzPVhhttxBWvaZ0IGX2w7OWL5bCo_TIvpHefWeNXruA,133
 voxcity/geoprocessor/draw.py,sha256=8Em2NvazFpYfFJUqG9LofNXaxdghKLL_rNuztmPwn8Q,13911
-voxcity/geoprocessor/grid.py,sha256=aLb_iInDrhh5cacQOOtHPZ9IWFTWsQtF6hEgsA6TB2Y,43761
+voxcity/geoprocessor/grid.py,sha256=DYphECd0v4o7_ZH5rd-_AWSvNaKoAsQ2fuko1sh-2AM,44113
 voxcity/geoprocessor/mesh.py,sha256=u4j5wombULMc26yhH8seltMZvmeKab1oequnZYrbiuE,9454
 voxcity/geoprocessor/network.py,sha256=opb_kpUCAxDd1qtrWPStqR5reYZtVe96XxazNSen7Lk,18851
-voxcity/geoprocessor/polygon.py,sha256=EeAlawsI0AQHctxG_1rS8y3sLFijwmWtdIFtLIXHUCg,32231
+voxcity/geoprocessor/polygon.py,sha256=wMVn2Y7rfbzOlTBktq4pBNZ7-Dmh3jOqRBHk450Ywss,33669
 voxcity/geoprocessor/utils.py,sha256=1BRHp-DDeOA8HG8jplY7Eo75G3oXkVGL6DGONL4BA8A,19815
 voxcity/simulator/__init_.py,sha256=APdkcdaovj0v_RPOaA4SBvFUKT2RM7Hxuuz3Sux4gCo,65
 voxcity/simulator/solar.py,sha256=FOcHoUm4miJNyeCcGs2oL93Vu38Affyywt29dJcmIT4,31974
@@ -29,9 +29,9 @@ voxcity/utils/lc.py,sha256=RwPd-VY3POV3gTrBhM7TubgGb9MCd3nVah_G8iUEF7k,11562
 voxcity/utils/material.py,sha256=Vt3IID5Ft54HNJcEC4zi31BCPqi_687X3CSp7rXaRVY,5907
 voxcity/utils/visualization.py,sha256=WZkwxihy6XrSxMOPgAs0--MeoKK_lKIHRdPW9d-hQbQ,48626
 voxcity/utils/weather.py,sha256=P6s1y_EstBL1OGP_MR_6u3vr-t6Uawg8uDckJnoI7FI,21482
-voxcity-0.3.21.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.3.21.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
-voxcity-0.3.21.dist-info/METADATA,sha256=E2wp9_LPBuWZNHsmvvA2Cqo-PIHitNEXkSj2cBLlvsg,25186
-voxcity-0.3.21.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-voxcity-0.3.21.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.3.21.dist-info/RECORD,,
+voxcity-0.3.22.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.3.22.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
+voxcity-0.3.22.dist-info/METADATA,sha256=X27qtDw9i9619sVIcpoKLZ11DOHa_uOOLj3oRdSRcgc,25186
+voxcity-0.3.22.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+voxcity-0.3.22.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.3.22.dist-info/RECORD,,