voxcity 0.5.5__tar.gz → 0.5.8__tar.gz

{voxcity-0.5.5 → voxcity-0.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.5
+Version: 0.5.8
 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>
@@ -45,7 +45,7 @@ Requires-Dist: pycountry
 Requires-Dist: osm2geojson
 Requires-Dist: seaborn
 Requires-Dist: overturemaps
-Requires-Dist: protobuf<=3.20.3
+Requires-Dist: protobuf<6,>=4.21
 Requires-Dist: timezonefinder
 Requires-Dist: astral
 Requires-Dist: osmnx

{voxcity-0.5.5 → voxcity-0.5.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "voxcity"
-version = "0.5.5"
+version = "0.5.8"
 requires-python = ">=3.10,<3.13"
 classifiers = [
     "Programming Language :: Python :: 3.10",
@@ -47,7 +47,7 @@ dependencies = [
     "osm2geojson",
     "seaborn",
     "overturemaps",
-    "protobuf<=3.20.3",
+    "protobuf>=4.21,<6",
     "timezonefinder",
     "astral",
     "osmnx",
@@ -56,7 +56,6 @@ dependencies = [
     "pyvista",
     "IPython",
     "lxml"
-
 ]
 
 [project.optional-dependencies]

{voxcity-0.5.5 → voxcity-0.5.8}/src/voxcity/downloader/citygml.py

@@ -488,8 +488,8 @@ def load_plateau_with_terrain(url, base_dir):
 
         # Save
         gdf_buildings_swapped['id'] = gdf_buildings_swapped.index
-        gdf_buildings_swapped.to_file('all_buildings_with_elevation.geojson', driver='GeoJSON')
-        print(f"\nBuildings saved to all_buildings_with_elevation.geojson")
+        # gdf_buildings_swapped.to_file('all_buildings_with_elevation.geojson', driver='GeoJSON')
+        # print(f"\nBuildings saved to all_buildings_with_elevation.geojson")
     else:
         gdf_buildings_swapped = None
 
@@ -520,8 +520,8 @@ def load_plateau_with_terrain(url, base_dir):
         }
 
         gdf_terrain_swapped = gpd.GeoDataFrame(terrain_data, geometry='geometry', crs='EPSG:6697')
-        gdf_terrain_swapped.to_file('terrain_elevation.geojson', driver='GeoJSON')
-        print(f"Terrain saved to terrain_elevation.geojson")
+        # gdf_terrain_swapped.to_file('terrain_elevation.geojson', driver='GeoJSON')
+        # print(f"Terrain saved to terrain_elevation.geojson")
     else:
         gdf_terrain_swapped = None
 
@@ -548,8 +548,8 @@ def load_plateau_with_terrain(url, base_dir):
             'geometry':       swapped_geometries
         }
         gdf_vegetation_swapped = gpd.GeoDataFrame(vegetation_data, geometry='geometry', crs='EPSG:6697')
-        gdf_vegetation_swapped.to_file('vegetation_elevation.geojson', driver='GeoJSON')
-        print(f"Vegetation saved to vegetation_elevation.geojson")
+        # gdf_vegetation_swapped.to_file('vegetation_elevation.geojson', driver='GeoJSON')
+        # print(f"Vegetation saved to vegetation_elevation.geojson")
     else:
         gdf_vegetation_swapped = None
 

{voxcity-0.5.5 → voxcity-0.5.8}/src/voxcity/exporter/obj.py

@@ -9,6 +9,8 @@ import numpy as np
 import os
 from numba import njit, prange
 import matplotlib.pyplot as plt
+import trimesh
+import numpy as np
 from ..utils.visualization import get_voxel_color_map
 
 def convert_colormap_indices(original_map):

{voxcity-0.5.5 → voxcity-0.5.8}/src/voxcity/generator.py

@@ -218,8 +218,6 @@ def get_building_height_grid(rectangle_vertices, meshsize, source, output_dir, *
                 gdf_comp = get_mbfp_gdf(output_dir, rectangle_vertices)
             elif building_complementary_source == 'OpenStreetMap':
                 gdf_comp = load_gdf_from_openstreetmap(rectangle_vertices)
-            elif building_complementary_source == 'OSM Buildings':
-                gdf_comp = load_gdf_from_osmbuildings(rectangle_vertices)
             elif building_complementary_source == 'EUBUCCO v0.1':
                 gdf_comp = load_gdf_from_eubucco(rectangle_vertices, output_dir)
             elif building_complementary_source == "OpenMapTiles":
@@ -764,7 +762,14 @@ def get_voxcity_CityGML(rectangle_vertices, url_citygml, land_cover_source, cano
     else:
         canopy_height_grid_comp = get_canopy_height_grid(rectangle_vertices, meshsize, canopy_height_source, output_dir, **kwargs)
     
-    canopy_height_grid = create_vegetation_height_grid_from_gdf_polygon(vegetation_gdf, meshsize, rectangle_vertices)
+    # In the get_voxcity_CityGML function, modify it to handle None vegetation_gdf
+    if vegetation_gdf is not None:
+        canopy_height_grid = create_vegetation_height_grid_from_gdf_polygon(vegetation_gdf, meshsize, rectangle_vertices)
+    else:
+        # Create an empty canopy_height_grid with the same shape as your other grids
+        # This depends on the expected shape, you might need to adjust
+        canopy_height_grid = np.zeros_like(building_height_grid)
+
     mask = (canopy_height_grid == 0) & (canopy_height_grid_comp != 0)
     canopy_height_grid[mask] = canopy_height_grid_comp[mask]
     

{voxcity-0.5.5 → voxcity-0.5.8}/src/voxcity/geoprocessor/grid.py

@@ -11,6 +11,7 @@ from pyproj import Geod, Transformer, CRS
 import rasterio
 from affine import Affine
 from shapely.geometry import box, Polygon, Point, MultiPolygon
+import warnings
 
 from scipy.interpolate import griddata
 from shapely.errors import GEOSException

{voxcity-0.5.5 → voxcity-0.5.8}/src/voxcity/utils/visualization.py

@@ -43,6 +43,7 @@ from ..geoprocessor.mesh import (
     create_city_meshes,
     export_meshes
 )
+# from ..exporter.obj import save_obj_from_colored_mesh
 from .material import get_material_dict
 
 # def get_voxel_color_map():
@@ -74,6 +75,7 @@ from .material import get_material_dict
 #         13: [150, 166, 190],    #  'Building (ground surface)'
 #         14: [239, 228, 176],    #  'No Data (ground surface)'
 #     }
+
 def get_voxel_color_map(color_scheme='default'):
     """
     Returns a color map for voxel visualization based on the specified color scheme.
@@ -1528,6 +1530,7 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
     vmax = kwargs.get("vmax", np.nanmax(sim_grid))
     projection_type = kwargs.get("projection_type", "perspective")
     distance_factor = kwargs.get("distance_factor", 1.0)
+    save_obj = kwargs.get("save_obj", False)
 
     # Create meshes
     print("Creating voxel meshes...")
@@ -1579,6 +1582,13 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
         plt.axis('off')
         plt.show()
         plt.close()
+    
+        # After creating the meshes and before visualization
+    if save_obj:
+        output_directory = kwargs.get('output_directory', 'output')
+        output_file_name = kwargs.get('output_file_name', 'voxcity_mesh')
+        obj_path, mtl_path = save_obj_from_colored_mesh(meshes, output_directory, output_file_name)
+        print(f"Saved mesh files to:\n  {obj_path}\n  {mtl_path}")
 
 def visualize_voxcity_multi_view_with_multiple_sim_grids(voxel_array, meshsize, sim_configs, **kwargs):
     """
@@ -1610,7 +1620,9 @@ def visualize_voxcity_multi_view_with_multiple_sim_grids(voxel_array, meshsize,
     # Configure PyVista settings
     pv.set_plot_theme('document')
     pv.global_theme.background = 'white'
-    pv.global_theme.window_size = [1024, 768]
+    window_width = kwargs.get("window_width", 1024)
+    window_height = kwargs.get("window_height", 768)
+    pv.global_theme.window_size = [window_width, window_height]
     pv.global_theme.jupyter_backend = 'static'
 
     # Parse general kwargs
@@ -1743,7 +1755,9 @@ def visualize_voxcity_with_sim_meshes(voxel_array, meshsize, custom_meshes=None,
     # Configure PyVista settings
     pv.set_plot_theme('document')
     pv.global_theme.background = 'white'
-    pv.global_theme.window_size = [1024, 768]
+    window_width = kwargs.get("window_width", 1024)
+    window_height = kwargs.get("window_height", 768)
+    pv.global_theme.window_size = [window_width, window_height]
     pv.global_theme.jupyter_backend = 'static'
     
     # Parse kwargs
@@ -1764,6 +1778,7 @@ def visualize_voxcity_with_sim_meshes(voxel_array, meshsize, custom_meshes=None,
     colorbar_title = kwargs.get("colorbar_title", "")
     value_name = kwargs.get("value_name", None)
     nan_color = kwargs.get("nan_color", "gray")
+    save_obj = kwargs.get("save_obj", False)
     
     if value_name is None:
         print("Set value_name")
@@ -1891,7 +1906,7 @@ def visualize_voxcity_with_sim_meshes(voxel_array, meshsize, custom_meshes=None,
 
     # Display each view separately
     for view_name, img_file in image_files:
-        plt.figure(figsize=(12, 8))
+        plt.figure(figsize=(24, 16))
         img = plt.imread(img_file)
         plt.imshow(img)
         plt.title(view_name.replace('_', ' ').title(), pad=20)
@@ -1899,6 +1914,13 @@ def visualize_voxcity_with_sim_meshes(voxel_array, meshsize, custom_meshes=None,
         plt.show()
         plt.close()
         
+    # After creating the meshes and before visualization
+    if save_obj:
+        output_directory = kwargs.get('output_directory', 'output')
+        output_file_name = kwargs.get('output_file_name', 'voxcity_mesh')
+        obj_path, mtl_path = save_obj_from_colored_mesh(meshes, output_directory, output_file_name)
+        print(f"Saved mesh files to:\n  {obj_path}\n  {mtl_path}")
+    
     return image_files
 
 def visualize_building_sim_results(voxel_array, meshsize, building_sim_mesh, **kwargs):
@@ -1952,4 +1974,70 @@ def visualize_building_sim_results(voxel_array, meshsize, building_sim_mesh, **k
         meshsize,
         custom_meshes=custom_meshes,
         **kwargs
-    )
+    )
+
+def save_obj_from_colored_mesh(meshes, output_path, base_filename):
+    """
+    Save colored meshes as OBJ and MTL files.
+    
+    Parameters
+    ----------
+    meshes : dict
+        Dictionary of trimesh.Trimesh objects with face colors.
+    output_path : str
+        Directory path where to save the files.
+    base_filename : str
+        Base name for the output files (without extension).
+        
+    Returns
+    -------
+    tuple
+        Paths to the saved (obj_file, mtl_file).
+    """
+    
+    os.makedirs(output_path, exist_ok=True)
+    obj_path = os.path.join(output_path, f"{base_filename}.obj")
+    mtl_path = os.path.join(output_path, f"{base_filename}.mtl")
+    
+    # Combine all meshes
+    combined_mesh = trimesh.util.concatenate(list(meshes.values()))
+    
+    # Create unique materials for each unique face color
+    face_colors = combined_mesh.visual.face_colors
+    unique_colors = np.unique(face_colors, axis=0)
+    
+    # Write MTL file
+    with open(mtl_path, 'w') as mtl_file:
+        for i, color in enumerate(unique_colors):
+            material_name = f'material_{i}'
+            mtl_file.write(f'newmtl {material_name}\n')
+            # Convert RGBA to RGB float values
+            rgb = color[:3].astype(float) / 255.0
+            mtl_file.write(f'Kd {rgb[0]:.6f} {rgb[1]:.6f} {rgb[2]:.6f}\n')
+            mtl_file.write(f'd {color[3]/255.0:.6f}\n\n')  # Alpha value
+    
+    # Create material groups based on face colors
+    color_to_material = {tuple(c): f'material_{i}' for i, c in enumerate(unique_colors)}
+    
+    # Write OBJ file
+    with open(obj_path, 'w') as obj_file:
+        obj_file.write(f'mtllib {os.path.basename(mtl_path)}\n')
+        
+        # Write vertices
+        for vertex in combined_mesh.vertices:
+            obj_file.write(f'v {vertex[0]:.6f} {vertex[1]:.6f} {vertex[2]:.6f}\n')
+        
+        # Write faces grouped by material
+        current_material = None
+        for face_idx, face in enumerate(combined_mesh.faces):
+            face_color = tuple(face_colors[face_idx])
+            material_name = color_to_material[face_color]
+            
+            if material_name != current_material:
+                obj_file.write(f'usemtl {material_name}\n')
+                current_material = material_name
+            
+            # OBJ indices are 1-based
+            obj_file.write(f'f {face[0]+1} {face[1]+1} {face[2]+1}\n')
+    
+    return obj_path, mtl_path

{voxcity-0.5.5 → voxcity-0.5.8}/src/voxcity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.5
+Version: 0.5.8
 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>
@@ -45,7 +45,7 @@ Requires-Dist: pycountry
 Requires-Dist: osm2geojson
 Requires-Dist: seaborn
 Requires-Dist: overturemaps
-Requires-Dist: protobuf<=3.20.3
+Requires-Dist: protobuf<6,>=4.21
 Requires-Dist: timezonefinder
 Requires-Dist: astral
 Requires-Dist: osmnx

{voxcity-0.5.5 → voxcity-0.5.8}/src/voxcity.egg-info/requires.txt

@@ -28,7 +28,7 @@ pycountry
 osm2geojson
 seaborn
 overturemaps
-protobuf<=3.20.3
+protobuf<6,>=4.21
 timezonefinder
 astral
 osmnx