voxcity 0.3.24__tar.gz → 0.3.27__tar.gz

{voxcity-0.3.24 → voxcity-0.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.24
+Version: 0.3.27
 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<=3.20.3
 Requires-Dist: timezonefinder
 Requires-Dist: astral
 Requires-Dist: osmnx

{voxcity-0.3.24 → voxcity-0.3.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "voxcity"
-version = "0.3.24"
+version = "0.3.27"
 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<=3.20.3",
     "timezonefinder",
     "astral",
     "osmnx",

{voxcity-0.3.24 → voxcity-0.3.27}/src/voxcity/generator.py

@@ -82,7 +82,8 @@ def get_land_cover_grid(rectangle_vertices, meshsize, source, output_dir, **kwar
     print(f"Data source: {source}")
     
     # Initialize Earth Engine for accessing satellite data
-    initialize_earth_engine()
+    if source is not "OpenStreetMap":
+        initialize_earth_engine()
 
     # Create output directory if it doesn't exist
     os.makedirs(output_dir, exist_ok=True)
@@ -157,7 +158,8 @@ def get_building_height_grid(rectangle_vertices, meshsize, source, output_dir, *
     """
 
     # Initialize Earth Engine for accessing satellite data
-    initialize_earth_engine()
+    if source is not "OpenStreetMap":
+        initialize_earth_engine()
 
     print("Creating Building Height grid\n ")
     print(f"Data source: {source}")
@@ -320,7 +322,7 @@ def get_dem_grid(rectangle_vertices, meshsize, source, output_dir, **kwargs):
         image = get_dem_image(roi_buffered, source)
         
         # Save DEM data with appropriate resolution based on source
-        if source in ["England 1m DTM", 'DEM France 1m', 'DEM France 5m', 'AUSTRALIA 5M DEM']:
+        if source in ["England 1m DTM", 'DEM France 1m', 'DEM France 5m', 'AUSTRALIA 5M DEM', 'Netherlands 0.5m DTM']:
             save_geotiff(image, geotiff_path, scale=meshsize, region=roi_buffered, crs='EPSG:4326')
         elif source == 'USGS 3DEP 1m':
             scale = max(meshsize, 1.25)
@@ -569,7 +571,18 @@ def get_voxcity(rectangle_vertices, building_source, land_cover_source, canopy_h
         building_gdf.to_file(save_path, driver='GPKG')
     
     # Get canopy height data
-    canopy_height_grid = get_canopy_height_grid(rectangle_vertices, meshsize, canopy_height_source, output_dir, **kwargs)
+    if canopy_height_source == "Static":
+        # Create canopy height grid with same shape as land cover grid
+        canopy_height_grid = np.zeros_like(land_cover_grid, dtype=float)
+        
+        # Set default static height for trees (20 meters is a typical average tree height)
+        static_tree_height = kwargs.get("static_tree_height", 10.0)
+        tree_mask = (land_cover_grid == 4)
+        
+        # Set static height for tree cells
+        canopy_height_grid[tree_mask] = static_tree_height
+    else:
+        canopy_height_grid = get_canopy_height_grid(rectangle_vertices, meshsize, canopy_height_source, output_dir, **kwargs)
     
     # Handle DEM - either flat or from source
     if dem_source == "Flat":

{voxcity-0.3.24 → voxcity-0.3.27}/src/voxcity/utils/visualization.py

@@ -1109,6 +1109,116 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
         plt.show()
         plt.close()
 
+def visualize_voxcity_multi_view_with_multiple_sim_grids(voxel_array, meshsize, sim_configs, **kwargs):
+    """
+    Create multiple views of the voxel city data with multiple simulation grids.
+    
+    Args:
+        voxel_array: 3D numpy array containing voxel data
+        meshsize: Size of each voxel/cell
+        sim_configs: List of dictionaries, each containing configuration for a simulation grid:
+            {
+                'sim_grid': 2D numpy array of simulation values,
+                'z_offset': height offset in meters (default: 1.5),
+                'cmap_name': colormap name (default: 'viridis'),
+                'vmin': minimum value for colormap (optional),
+                'vmax': maximum value for colormap (optional),
+                'label': label for the colorbar (optional)
+            }
+        **kwargs: Additional arguments including:
+            - vox_dict: Dictionary mapping voxel values to colors
+            - output_directory: Directory to save output images
+            - output_file_name: Base filename for exports
+            - dem_grid: DEM grid for height information
+            - projection_type: 'perspective' or 'orthographic'
+            - distance_factor: Factor to adjust camera distance
+    """
+    os.system('Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &')
+    os.environ['DISPLAY'] = ':99'
+
+    # Configure PyVista settings
+    pv.set_plot_theme('document')
+    pv.global_theme.background = 'white'
+    pv.global_theme.window_size = [1024, 768]
+    pv.global_theme.jupyter_backend = 'static'
+
+    # Parse general kwargs
+    vox_dict = kwargs.get("vox_dict", get_default_voxel_color_map())
+    output_directory = kwargs.get("output_directory", 'output')
+    base_filename = kwargs.get("output_file_name", None)
+    dem_grid_ori = kwargs.get("dem_grid", None)
+    projection_type = kwargs.get("projection_type", "perspective")
+    distance_factor = kwargs.get("distance_factor", 1.0)
+
+    if dem_grid_ori is not None:
+        dem_grid = dem_grid_ori - np.min(dem_grid_ori)
+    
+    # Create meshes
+    print("Creating voxel meshes...")
+    meshes = create_city_meshes(voxel_array, vox_dict, meshsize=meshsize)
+
+    # Process each simulation grid
+    for i, config in enumerate(sim_configs):
+        sim_grid = config['sim_grid']
+        if sim_grid is None or dem_grid is None:
+            continue
+
+        z_offset = config.get('z_offset', 1.5)
+        cmap_name = config.get('cmap_name', 'viridis')
+        vmin = config.get('vmin', np.nanmin(sim_grid))
+        vmax = config.get('vmax', np.nanmax(sim_grid))
+        label = config.get('label', f'Simulation {i+1}')
+
+        print(f"Creating sim_grid surface mesh for {label}...")
+        sim_mesh = create_sim_surface_mesh(
+            sim_grid, dem_grid,
+            meshsize=meshsize,
+            z_offset=z_offset,
+            cmap_name=cmap_name,
+            vmin=vmin,
+            vmax=vmax
+        )
+        
+        if sim_mesh is not None:
+            meshes[f"sim_surface_{i}"] = sim_mesh
+            
+            # Create colorbar for this simulation
+            norm = mcolors.Normalize(vmin=vmin, vmax=vmax)
+            scalar_map = cm.ScalarMappable(norm=norm, cmap=cmap_name)
+            
+            fig, ax = plt.subplots(figsize=(6, 1))
+            plt.colorbar(scalar_map, cax=ax, orientation='horizontal', label=label)
+            plt.tight_layout()
+            plt.show()
+
+    # Export if filename provided
+    if base_filename is not None:
+        print(f"Exporting files to '{base_filename}.*' ...")
+        os.makedirs(output_directory, exist_ok=True)
+        export_meshes(meshes, output_directory, base_filename)
+
+    # Create and save multiple views
+    print("Creating multiple views...")        
+    os.makedirs(output_directory, exist_ok=True)
+    image_files = create_multi_view_scene(
+        meshes, 
+        output_directory=output_directory,
+        projection_type=projection_type,
+        distance_factor=distance_factor
+    )
+
+    # Display each view separately
+    for view_name, img_file in image_files:
+        plt.figure(figsize=(12, 8))
+        img = plt.imread(img_file)
+        plt.imshow(img)
+        plt.title(view_name.replace('_', ' ').title(), pad=20)
+        plt.axis('off')
+        plt.show()
+        plt.close()
+
+    return meshes
+
 # def create_interactive_scene(meshes):
 #     scene = trimesh.Scene()
 #     scene.ambient_light = np.array([0.1, 0.1, 0.1, 1.0])

{voxcity-0.3.24 → voxcity-0.3.27}/src/voxcity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.24
+Version: 0.3.27
 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<=3.20.3
 Requires-Dist: timezonefinder
 Requires-Dist: astral
 Requires-Dist: osmnx

{voxcity-0.3.24 → voxcity-0.3.27}/src/voxcity.egg-info/requires.txt

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