voxcity 0.5.22__py3-none-any.whl → 0.5.23__py3-none-any.whl

voxcity/simulator/solar.py

@@ -1341,11 +1341,12 @@ def get_building_solar_irradiance(
     # # Optional OBJ export
     # obj_export = kwargs.get("obj_export", False)
     # if obj_export:
-    #     _export_solar_irradiance_mesh(
-    #         irradiance_mesh,
-    #         face_global,
-    #         **kwargs
-    #     )
+    #     # Get export parameters
+    #     output_dir = kwargs.get("output_directory", "output")
+    #     output_file_name = kwargs.get("output_file_name", "solar_irradiance")
+
+    #     # Export the mesh directly
+    #     irradiance_mesh.export(f"{output_dir}/{output_file_name}.obj")
     
     return irradiance_mesh
 
@@ -1426,6 +1427,8 @@ def get_cumulative_building_solar_irradiance(
     face_cum_global  = np.zeros(n_faces, dtype=np.float64)
     
     boundary_mask = None
+    instant_kwargs = kwargs.copy()
+    instant_kwargs['obj_export'] = False
     
     # Iterate over each timestep
     for idx, (time_utc, row) in enumerate(df_period_utc.iterrows()):
@@ -1450,7 +1453,7 @@ def get_cumulative_building_solar_irradiance(
             DNI,
             DHI,
             show_plot=False,  # or any other flags
-            **kwargs
+            **instant_kwargs
         )
         
         # Extract arrays
@@ -1488,14 +1491,15 @@ def get_cumulative_building_solar_irradiance(
     
     cumulative_mesh.name = "Cumulative Solar Irradiance (Wh/m²)"
     
-    # Optional export
+    # # Optional OBJ export
     # obj_export = kwargs.get("obj_export", False)
     # if obj_export:
-    #     _export_solar_irradiance_mesh(
-    #         cumulative_mesh,
-    #         face_cum_global,
-    #         **kwargs
-    #     )
+    #     # Get export parameters
+    #     output_dir = kwargs.get("output_directory", "output")
+    #     output_file_name = kwargs.get("output_file_name", "solar_irradiance")
+
+    #     # Export the mesh directly
+    #     irradiance_mesh.export(f"{output_dir}/{output_file_name}.obj")
     
     return cumulative_mesh
 

voxcity/utils/visualization.py

@@ -2069,11 +2069,18 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
         plt.tight_layout()
         plt.show()
 
-    # Export mesh files if requested
-    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)
+    # # Export mesh files if requested
+    # 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)
+
+    # Export OBJ mesh files if requested
+    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}")
 
     # Generate and display multiple camera views
     if show_views:  
@@ -2091,13 +2098,6 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
             plt.show()
             plt.close()
     
-    # Export OBJ mesh files if requested
-    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):
     """
     Create multiple views of the voxel city data with multiple simulation grids.

{voxcity-0.5.22.dist-info → voxcity-0.5.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.22
+Version: 0.5.23
 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>
@@ -64,10 +64,11 @@ Dynamic: license-file
 [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/drive/1Lofd3RawKMr6QuUsamGaF48u2MN0hfrP?usp=sharing)
 [![License](https://img.shields.io/pypi/l/voxcity.svg)](https://pypi.org/project/voxcity/)
 [![Downloads](https://pepy.tech/badge/voxcity)](https://pepy.tech/project/voxcity)
+[![Documentation Status](https://readthedocs.org/projects/voxcity/badge/?version=latest)](https://voxcity.readthedocs.io/en/latest/?badge=latest)
 <!-- [![License: CC BY-SA 4.0](https://licensebuttons.net/l/by-sa/4.0/80x15.png)](https://creativecommons.org/licenses/by-sa/4.0/) -->
 
 <p align="center">
-  Tutorial preview: <a href="https://colab.research.google.com/drive/1Lofd3RawKMr6QuUsamGaF48u2MN0hfrP?usp=sharing">[Google Colab]</a>
+  Tutorial preview: <a href="https://colab.research.google.com/drive/1Lofd3RawKMr6QuUsamGaF48u2MN0hfrP?usp=sharing">[Google Colab]</a> | Documentation: <a href="https://voxcity.readthedocs.io/en/latest">[Read the Docs]</a>
 </p>
 
 <p align="center">
@@ -76,7 +77,7 @@ Dynamic: license-file
 
 # VoxCity
 
-**voxcity** is a Python package that provides a seamless solution for grid-based 3D city model generation and urban simulation for cities worldwide. VoxCity's generator module automatically downloads building heights, tree canopy heights, land cover, and terrain elevation within a specified target area, and voxelizes buildings, trees, land cover, and terrain to generate an integrated voxel city model. The simulator module enables users to conduct environmental simulations, including solar radiation and view index analyses. Users can export the generated models using several file formats compatible with external software, such as ENVI-met (INX), Blender, and Rhino (OBJ). Try it out using the [Google Colab Demo](https://colab.research.google.com/drive/1Lofd3RawKMr6QuUsamGaF48u2MN0hfrP?usp=sharing) or your local environment.
+**voxcity** is a Python package that provides a seamless solution for grid-based 3D city model generation and urban simulation for cities worldwide. VoxCity's generator module automatically downloads building heights, tree canopy heights, land cover, and terrain elevation within a specified target area, and voxelizes buildings, trees, land cover, and terrain to generate an integrated voxel city model. The simulator module enables users to conduct environmental simulations, including solar radiation and view index analyses. Users can export the generated models using several file formats compatible with external software, such as ENVI-met (INX), Blender, and Rhino (OBJ). Try it out using the [Google Colab Demo](https://colab.research.google.com/drive/1Lofd3RawKMr6QuUsamGaF48u2MN0hfrP?usp=sharing) or your local environment. For detailed documentation, API reference, and tutorials, visit our [Read the Docs](https://voxcity.readthedocs.io/en/latest) page.
 
 <!-- <p align="center">
   <picture>

{voxcity-0.5.22.dist-info → voxcity-0.5.23.dist-info}/RECORD

@@ -10,7 +10,7 @@ voxcity/downloader/osm.py,sha256=kXiUedT7dwPOQ_4nxXptfeqNb5RKTIsQLG5km7Q8kKk,416
 voxcity/downloader/overture.py,sha256=4YG2DMwUSSyZKUw_o8cGhMmAkPJon82aPqOFBvrre-Y,11987
 voxcity/downloader/utils.py,sha256=tz6wt4B9BhEOyvoF5OYXlr8rUd5cBEDedWL3j__oT70,3099
 voxcity/exporter/__init__.py,sha256=2htEXMrq6knO8JMROtfz-0HFGddsAJkXqNUB2_MhqvM,70
-voxcity/exporter/envimet.py,sha256=P-tx7YTPK1GpcFzuqJz4M_ov8b_b73IqTjYRoVVOZDs,30385
+voxcity/exporter/envimet.py,sha256=un8Ay55XttGWFkFzkxLymHoRuA-UJkowQ4bMCjod_Jk,31093
 voxcity/exporter/magicavoxel.py,sha256=SfGEgTZRlossKx3Xrv9d3iKSX-HmfQJEL9lZHgWMDX4,12782
 voxcity/exporter/obj.py,sha256=h1_aInpemcsu96fSTwjKMqX2VZAFYbZbElWd4M1ogyI,27973
 voxcity/geoprocessor/__init__.py,sha256=JzPVhhttxBWvaZ0IGX2w7OWL5bCo_TIvpHefWeNXruA,133
@@ -19,19 +19,19 @@ voxcity/geoprocessor/grid.py,sha256=Uy8Oz4iL7vnPMqp_qtp4dQrs00yd2L9CSIPmF5KnbtI,
 voxcity/geoprocessor/mesh.py,sha256=MK2rkBfVyLQ_nkhgLMa6R3_SxYFE2-MHaSiRP6bJ7no,28584
 voxcity/geoprocessor/network.py,sha256=YynqR0nq_NUra_cQ3Z_56KxfRia1b6-hIzGCj3QT-wE,25137
 voxcity/geoprocessor/polygon.py,sha256=-LonxtW5du3UP61oygqtDJl6GGsCYnUuN9KYwl1UFdc,53707
-voxcity/geoprocessor/utils.py,sha256=OnSdFkObfHBtDyu3BQJ81CwsLZy1VtPZQLGAXA3y4Ec,29584
+voxcity/geoprocessor/utils.py,sha256=DVg3EMRytLQLEQeXLvNgjt1Ynoa689EsD-To-14xgSQ,30369
 voxcity/simulator/__init__.py,sha256=APdkcdaovj0v_RPOaA4SBvFUKT2RM7Hxuuz3Sux4gCo,65
-voxcity/simulator/solar.py,sha256=HUvSm7IHOpU8JyF6rib54LXBijoWaWM87dKYGeC_BxA,82298
+voxcity/simulator/solar.py,sha256=t7zOSxBObQMuWvQSiHN9AViJstzfkXqAg3BpIppn0KA,82694
 voxcity/simulator/utils.py,sha256=sEYBB2-hLJxTiXQps1_-Fi7t1HN3-1OPOvBCWtgIisA,130
 voxcity/simulator/view.py,sha256=F2c-XFdRN811_RJvsznRjbUu5Uv7C6iniezsUMD-Olw,59419
 voxcity/utils/__init__.py,sha256=Q-NYCqYnAAaF80KuNwpqIjbE7Ec3Gr4y_khMLIMhJrg,68
 voxcity/utils/lc.py,sha256=h2yOWLUIrrummkyMyhRK5VbyrsPtslS0MJov_y0WGIQ,18925
 voxcity/utils/material.py,sha256=H8K8Lq4wBL6dQtgj7esUW2U6wLCOTeOtelkTDJoRgMo,10007
-voxcity/utils/visualization.py,sha256=-Hc9XJbAppI0CB_Sfrlv0kLnJGRBdY2u8g0jdCPYT7w,112803
+voxcity/utils/visualization.py,sha256=QWeWaIXFqOnUZT6TF2Boctz8v9xQoz-GZS3f0E7LmqA,112813
 voxcity/utils/weather.py,sha256=2Jtg-rIVJcsTtiKE-KuDnhIqS1-MSS16_zFRzj6zmu4,36435
-voxcity-0.5.22.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.5.22.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
-voxcity-0.5.22.dist-info/METADATA,sha256=O2KHPSdT7b4w_W13HKe6K8ARWiqTF7QUSlBvnk4-BgY,26328
-voxcity-0.5.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-voxcity-0.5.22.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.5.22.dist-info/RECORD,,
+voxcity-0.5.23.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.5.23.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
+voxcity-0.5.23.dist-info/METADATA,sha256=qYB15e8LlRWQ9aOsUxH9UUIHHXnwhpx1dkTA6AmC5pQ,26695
+voxcity-0.5.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+voxcity-0.5.23.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.5.23.dist-info/RECORD,,