voxcity 0.4.4__tar.gz → 0.4.6__tar.gz

{voxcity-0.4.4 → voxcity-0.4.6}/PKG-INFO

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

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

{voxcity-0.4.4 → voxcity-0.4.6}/src/voxcity/geoprocessor/grid.py

@@ -3,6 +3,7 @@ This module provides functions for creating and manipulating grids of building h
 """
 
 import numpy as np
+import pandas as pd
 import os
 from shapely.geometry import Polygon, box
 from scipy.ndimage import label, generate_binary_structure
@@ -575,6 +576,8 @@ def create_building_height_grid_from_gdf_polygon(
             height = complement_height
             
         min_height = row.get('min_height', 0)
+        if pd.isna(min_height):
+            min_height = 0      
         is_inner = row.get('is_inner', False)
         feature_id = row.get('id', idx_b)
 

{voxcity-0.4.4 → voxcity-0.4.6}/src/voxcity/geoprocessor/mesh.py

@@ -4,7 +4,7 @@ import matplotlib.colors as mcolors
 import matplotlib.cm as cm
 import matplotlib.pyplot as plt
 
-def create_voxel_mesh(voxel_array, class_id, meshsize=1.0, building_id_grid=None):
+def create_voxel_mesh(voxel_array, class_id, meshsize=1.0, building_id_grid=None, mesh_type=None):
     """
     Create a mesh from voxels preserving sharp edges, scaled by meshsize.
 
@@ -18,6 +18,11 @@ def create_voxel_mesh(voxel_array, class_id, meshsize=1.0, building_id_grid=None
         The real-world size of each voxel in meters, for x, y, and z.
     building_id_grid : np.ndarray (2D), optional
         2D grid of building IDs, shape (X, Y). Used when class_id=-3 (buildings).
+    mesh_type : str, optional
+        Type of mesh to create:
+        - None (default): create meshes for boundaries between different classes
+        - 'building_solar': only create meshes for boundaries between buildings (-3) 
+                           and void (0) or trees (-2)
 
     Returns
     -------
@@ -81,7 +86,7 @@ def create_voxel_mesh(voxel_array, class_id, meshsize=1.0, building_id_grid=None
             (x,   y-1, z)     # Bottom
         ]
 
-        # Only create faces where there's a transition between this class and "not this class"
+        # Only create faces where there's a transition based on mesh_type
         for face_idx, adj_coord in enumerate(adjacent_coords):
             try:
                 # If adj_coord is outside array bounds, it's a boundary => face is visible
@@ -89,7 +94,13 @@ def create_voxel_mesh(voxel_array, class_id, meshsize=1.0, building_id_grid=None
                     is_boundary = True
                 else:
                     adj_value = voxel_array[adj_coord]
-                    is_boundary = (adj_value == 0 or adj_value != class_id)
+                    
+                    if mesh_type == 'open_air' and class_id == -3:
+                        # For building_solar, only create faces at boundaries with void (0) or trees (-2)
+                        is_boundary = (adj_value == 0 or adj_value == -2)
+                    else:
+                        # Default behavior - create faces at any class change
+                        is_boundary = (adj_value == 0 or adj_value != class_id)
             except IndexError:
                 # Out of range => boundary
                 is_boundary = True

{voxcity-0.4.4 → voxcity-0.4.6}/src/voxcity/simulator/view.py

@@ -1708,7 +1708,8 @@ def get_surface_view_factor(voxel_data, meshsize, **kwargs):
             voxel_data, 
             building_class_id, 
             meshsize,
-            building_id_grid=building_id_grid
+            building_id_grid=building_id_grid,
+            mesh_type='open_air'
         )
         if building_mesh is None or len(building_mesh.faces) == 0:
             print("No surfaces found in voxel data for the specified class.")

{voxcity-0.4.4 → voxcity-0.4.6}/src/voxcity/utils/visualization.py

@@ -1270,7 +1270,7 @@ def visualize_numerical_grid_on_basemap(grid, rectangle_vertices, meshsize, valu
     plt.tight_layout()
     plt.show()
 
-def visualize_numerical_grid_gdf_on_basemap(gdf, value_name="value", cmap='viridis', vmin=None, vmax=None,
+def visualize_numerical_gdf_on_basemap(gdf, value_name="value", cmap='viridis', vmin=None, vmax=None,
                             alpha=0.6, figsize=(12, 8), basemap='CartoDB light',
                             show_edge=False, edge_color='black', edge_width=0.5):
     """Visualizes a GeoDataFrame with numerical values on a basemap.
@@ -1298,7 +1298,7 @@ def visualize_numerical_grid_gdf_on_basemap(gdf, value_name="value", cmap='virid
     fig, ax = plt.subplots(figsize=figsize)
     
     # Plot the GeoDataFrame
-    gdf_web.plot(column='value',
+    gdf_web.plot(column=value_name,
                  ax=ax,
                  alpha=alpha,
                  cmap=cmap,
@@ -1325,7 +1325,7 @@ def visualize_numerical_grid_gdf_on_basemap(gdf, value_name="value", cmap='virid
     plt.tight_layout()
     plt.show()
 
-def visualize_point_grid_on_basemap(point_gdf, value_name='value', **kwargs):
+def visualize_point_gdf_on_basemap(point_gdf, value_name='value', **kwargs):
     """Visualizes a point GeoDataFrame on a basemap with colors based on values.
     
     Args:

{voxcity-0.4.4 → voxcity-0.4.6}/src/voxcity.egg-info/PKG-INFO

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