voxcity 0.3.19__tar.gz → 0.3.20__tar.gz

{voxcity-0.3.19 → voxcity-0.3.20}/PKG-INFO

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

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

{voxcity-0.3.19 → voxcity-0.3.20}/src/voxcity/geoprocessor/mesh.py

@@ -2,6 +2,7 @@ import numpy as np
 import trimesh
 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):
     """
@@ -158,13 +159,19 @@ def create_sim_surface_mesh(sim_grid, dem_grid,
 
     # If vmin/vmax not provided, use actual min/max of the valid sim data
     if vmin is None:
-        vmin = np.nanmin(valid_values)
+        vmin = np.nanmin(valid_values) 
     if vmax is None:
         vmax = np.nanmax(valid_values)
-
-    # Prepare the colormap
+        
+    # Prepare the colormap and create colorbar
     norm = mcolors.Normalize(vmin=vmin, vmax=vmax)
     scalar_map = cm.ScalarMappable(norm=norm, cmap=cmap_name)
+    
+    # Create a figure just for the colorbar
+    fig, ax = plt.subplots(figsize=(6, 1))
+    plt.colorbar(scalar_map, cax=ax, orientation='horizontal')
+    plt.tight_layout()
+    plt.close()
 
     vertices = []
     faces = []
@@ -180,7 +187,7 @@ def create_sim_surface_mesh(sim_grid, dem_grid,
             if np.isnan(val):
                 continue
 
-            z_base = dem_grid_flipped[x, y] + z_offset
+            z_base = meshsize * int(dem_grid_flipped[x, y] / meshsize + 1.5) + z_offset            
 
             # 4 corners in (x,y)*meshsize
             v0 = [ x      * meshsize,  y      * meshsize, z_base ]

{voxcity-0.3.19 → voxcity-0.3.20}/src/voxcity/utils/visualization.py

@@ -4,6 +4,7 @@ from mpl_toolkits.mplot3d import Axes3D
 from tqdm import tqdm
 import matplotlib.colors as mcolors
 from matplotlib.colors import ListedColormap, BoundaryNorm
+import matplotlib.cm as cm
 import contextily as ctx
 from shapely.geometry import Polygon
 import plotly.graph_objects as go
@@ -999,7 +1000,7 @@ def create_multi_view_scene(meshes, output_directory="output"):
 
     return images
 
-def visualize_voxcity_multi_view(voxel_array, **kwargs):
+def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
     """
     Create multiple views of the voxel city data.
     """
@@ -1030,12 +1031,12 @@ def visualize_voxcity_multi_view(voxel_array, **kwargs):
     output_directory = kwargs.get("output_directory", 'output')
     base_filename = kwargs.get("output_file_name", None)
     sim_grid = kwargs.get("sim_grid", None)
-    dem_grid = kwargs.get("dem_grid", None)
-    meshsize = kwargs.get("meshsize", 1.0) / 5
+    dem_grid_ori = kwargs.get("dem_grid", None)
+    dem_grid = dem_grid_ori - np.min(dem_grid_ori)
     z_offset = kwargs.get("view_point_height", 1.5)
     cmap_name = kwargs.get("colormap", "viridis")
-    vmin = kwargs.get("vmin", 0)
-    vmax = kwargs.get("vmax", 1)
+    vmin = kwargs.get("vmin", np.nanmin(sim_grid))
+    vmax = kwargs.get("vmax", np.nanmax(sim_grid))
 
     # Create meshes
     print("Creating voxel meshes...")
@@ -1054,6 +1055,17 @@ def visualize_voxcity_multi_view(voxel_array, **kwargs):
         )
         if sim_mesh is not None:
             meshes["sim_surface"] = sim_mesh
+            # If vmin/vmax not provided, use actual min/max of the valid sim data
+            
+        # Prepare the colormap and create colorbar
+        norm = mcolors.Normalize(vmin=vmin, vmax=vmax)
+        scalar_map = cm.ScalarMappable(norm=norm, cmap=cmap_name)
+        
+        # Create a figure and axis for the colorbar but don't display
+        fig, ax = plt.subplots(figsize=(6, 1))
+        plt.colorbar(scalar_map, cax=ax, orientation='horizontal')
+        plt.tight_layout()
+        plt.show()
 
     # Export if filename provided
     if base_filename is not None:

{voxcity-0.3.19 → voxcity-0.3.20}/src/voxcity.egg-info/PKG-INFO

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