voxcity 0.5.28__py3-none-any.whl → 0.5.29__py3-none-any.whl

voxcity/geoprocessor/draw.py

@@ -513,7 +513,12 @@ def draw_additional_buildings(building_gdf=None, initial_center=None, zoom=17):
     Args:
         building_gdf (GeoDataFrame, optional): Existing building footprints to display.
             If None, creates a new empty GeoDataFrame.
-            Must have 'geometry' column and optionally 'height' column.
+            Expected columns: ['id', 'height', 'min_height', 'geometry', 'building_id']
+            - 'id': Integer ID from data sources (e.g., OSM building id)
+            - 'height': Building height in meters (set by user input)
+            - 'min_height': Minimum height in meters (defaults to 0.0)
+            - 'geometry': Building footprint polygon
+            - 'building_id': Unique building identifier
         initial_center (tuple, optional): Initial map center as (lon, lat).
             If None, centers on existing buildings or defaults to (-100, 40).
         zoom (int): Initial zoom level (default=17).
@@ -534,16 +539,21 @@ def draw_additional_buildings(building_gdf=None, initial_center=None, zoom=17):
     if building_gdf is None:
         # Create empty GeoDataFrame with required columns
         updated_gdf = gpd.GeoDataFrame(
-            columns=['geometry', 'height', 'building_id'],
+            columns=['id', 'height', 'min_height', 'geometry', 'building_id'],
             crs='EPSG:4326'
         )
     else:
         # Make a copy to avoid modifying the original
         updated_gdf = building_gdf.copy()
+        # Ensure all required columns exist
         if 'height' not in updated_gdf.columns:
             updated_gdf['height'] = 10.0  # Default height
+        if 'min_height' not in updated_gdf.columns:
+            updated_gdf['min_height'] = 0.0  # Default min_height
         if 'building_id' not in updated_gdf.columns:
             updated_gdf['building_id'] = range(len(updated_gdf))
+        if 'id' not in updated_gdf.columns:
+            updated_gdf['id'] = range(len(updated_gdf))
     
     # Determine map center
     if initial_center is not None:
@@ -567,14 +577,19 @@ def draw_additional_buildings(building_gdf=None, initial_center=None, zoom=17):
             lat_lon_coords = [(c[1], c[0]) for c in coords[:-1]]
             
             height = row.get('height', 10.0)
+            min_height = row.get('min_height', 0.0)
+            building_id = row.get('building_id', idx)
+            bldg_id = row.get('id', idx)
             bldg_layer = LeafletPolygon(
                 locations=lat_lon_coords,
                 color="blue",
                 fill_color="blue",
                 fill_opacity=0.3,
                 weight=2,
-                popup=HTML(f"<b>Building ID:</b> {row.get('building_id', idx)}<br>"
-                          f"<b>Height:</b> {height}m")
+                popup=HTML(f"<b>Building ID:</b> {building_id}<br>"
+                          f"<b>ID:</b> {bldg_id}<br>"
+                          f"<b>Height:</b> {height}m<br>"
+                          f"<b>Min Height:</b> {min_height}m")
             )
             m.add_layer(bldg_layer)
             building_layers[idx] = bldg_layer
@@ -664,17 +679,21 @@ def draw_additional_buildings(building_gdf=None, initial_center=None, zoom=17):
                 # Create polygon geometry
                 polygon = geom.Polygon(current_polygon['vertices'])
                 
-                # Get next building ID
+                # Get next building ID and ID values (ensure uniqueness)
                 if len(updated_gdf) > 0:
-                    next_id = int(updated_gdf['building_id'].max() + 1)
+                    next_building_id = int(updated_gdf['building_id'].max() + 1)
+                    next_id = int(updated_gdf['id'].max() + 1)
                 else:
+                    next_building_id = 1
                     next_id = 1
                 
                 # Create new row data
                 new_row_data = {
                     'geometry': polygon,
                     'height': float(height_input.value),
-                    'building_id': next_id
+                    'min_height': 0.0,  # Default value as requested
+                    'building_id': next_building_id,
+                    'id': next_id
                 }
                 
                 # Add any additional columns
@@ -696,8 +715,10 @@ def draw_additional_buildings(building_gdf=None, initial_center=None, zoom=17):
                     fill_color="blue",
                     fill_opacity=0.3,
                     weight=2,
-                    popup=HTML(f"<b>Building ID:</b> {next_id}<br>"
-                              f"<b>Height:</b> {height_input.value}m")
+                    popup=HTML(f"<b>Building ID:</b> {next_building_id}<br>"
+                              f"<b>ID:</b> {next_id}<br>"
+                              f"<b>Height:</b> {height_input.value}m<br>"
+                              f"<b>Min Height:</b> 0.0m")
                 )
                 m.add_layer(new_layer)
                 
@@ -707,8 +728,8 @@ def draw_additional_buildings(building_gdf=None, initial_center=None, zoom=17):
                 add_button.disabled = True
                 clear_button.disabled = True
                 
-                print(f"Building {next_id} added successfully!")
-                print(f"Height: {height_input.value}m")
+                print(f"Building {next_building_id} added successfully!")
+                print(f"ID: {next_id}, Height: {height_input.value}m, Min Height: 0.0m")
                 print(f"Total buildings: {len(updated_gdf)}")
     
     def clear_drawing_click(b):

{voxcity-0.5.28.dist-info → voxcity-0.5.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.28
+Version: 0.5.29
 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.5.28.dist-info → voxcity-0.5.29.dist-info}/RECORD

@@ -15,7 +15,7 @@ voxcity/exporter/envimet.py,sha256=Sh7s1JdQ6SgT_L2Xd_c4gtEGWK2hTS87bccaoIqik-s,3
 voxcity/exporter/magicavoxel.py,sha256=SfGEgTZRlossKx3Xrv9d3iKSX-HmfQJEL9lZHgWMDX4,12782
 voxcity/exporter/obj.py,sha256=h1_aInpemcsu96fSTwjKMqX2VZAFYbZbElWd4M1ogyI,27973
 voxcity/geoprocessor/__init__.py,sha256=JzPVhhttxBWvaZ0IGX2w7OWL5bCo_TIvpHefWeNXruA,133
-voxcity/geoprocessor/draw.py,sha256=qTYzXEF8GKWh3hquirspzlzwXTIzl39y9VuEJ0WjOis,32031
+voxcity/geoprocessor/draw.py,sha256=t0W7M8ZflJRjXIBuyvszQm_f6r39dK_fBO_7_0dKFAs,33354
 voxcity/geoprocessor/grid.py,sha256=lhELyznlk4Jt7vnd0uOpMCLPCjrYQjX7qtQq-xHkYE4,64161
 voxcity/geoprocessor/mesh.py,sha256=ElqAE2MA8KZs7yD7B1P88XYmryC6F9nkkP6cXv7FzIk,30777
 voxcity/geoprocessor/network.py,sha256=YynqR0nq_NUra_cQ3Z_56KxfRia1b6-hIzGCj3QT-wE,25137
@@ -30,9 +30,9 @@ voxcity/utils/lc.py,sha256=h2yOWLUIrrummkyMyhRK5VbyrsPtslS0MJov_y0WGIQ,18925
 voxcity/utils/material.py,sha256=H8K8Lq4wBL6dQtgj7esUW2U6wLCOTeOtelkTDJoRgMo,10007
 voxcity/utils/visualization.py,sha256=T-jKrCA4UMm93p-1O678RWM7e99iE0_Lj4wD07efcwI,112918
 voxcity/utils/weather.py,sha256=2Jtg-rIVJcsTtiKE-KuDnhIqS1-MSS16_zFRzj6zmu4,36435
-voxcity-0.5.28.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.5.28.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
-voxcity-0.5.28.dist-info/METADATA,sha256=1-Vf32nGdVvGxmOMXMcfTIi4IM92x4uGq5T7qzlDbxY,26724
-voxcity-0.5.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-voxcity-0.5.28.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.5.28.dist-info/RECORD,,
+voxcity-0.5.29.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.5.29.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
+voxcity-0.5.29.dist-info/METADATA,sha256=ssD5wLFfzw97c49s0o1_CFpgBaKMeG2AxKzJ2-n3ufY,26724
+voxcity-0.5.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+voxcity-0.5.29.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.5.29.dist-info/RECORD,,