voxcity 0.6.5__py3-none-any.whl → 0.6.6__py3-none-any.whl

voxcity/exporter/cityles.py

@@ -190,7 +190,7 @@ def _build_index_to_cityles_map(land_cover_source):
 
 
 def export_topog(building_height_grid, building_id_grid, output_path, 
-                 building_material='default'):
+                 building_material='default', cityles_landuse_grid=None):
     """
     Export topog.txt file for CityLES
     
@@ -226,8 +226,17 @@ def export_topog(building_height_grid, building_id_grid, output_path,
                 i_1based = i + 1
                 j_1based = j + 1
                 height = float(building_height_grid[j, i])
+                # Decide material code per cell
+                if cityles_landuse_grid is not None:
+                    cell_lu = int(cityles_landuse_grid[j, i])
+                    material_code_cell = cell_lu + 100
+                else:
+                    if height > 0:
+                        material_code_cell = material_code
+                    else:
+                        material_code_cell = 102
                 # Format: i j height material_code depth1 depth2 changed_material
-                f.write(f"{i_1based} {j_1based} {height:.1f} {material_code} 0.0 0.0 102\n")
+                f.write(f"{i_1based} {j_1based} {height:.1f} {material_code_cell} 0.0 0.0 102\n")
 
 
 def export_landuse(land_cover_grid, output_path, land_cover_source=None):
@@ -254,6 +263,8 @@ def export_landuse(land_cover_grid, output_path, land_cover_source=None):
 
     # Create mapping statistics
     mapping_stats = {}
+    # Prepare grid to return
+    cityles_landuse_grid = np.zeros((ny, nx), dtype=int)
 
     with open(filename, 'w') as f:
         # Write in row-major order (j varies first, then i)
@@ -263,6 +274,8 @@ def export_landuse(land_cover_grid, output_path, land_cover_source=None):
                 cityles_code = index_to_code.get(idx, 4)
                 f.write(f"{cityles_code}\n")
 
+                cityles_landuse_grid[j, i] = cityles_code
+
                 # Track mapping statistics
                 if idx not in mapping_stats:
                     mapping_stats[idx] = {'cityles_code': cityles_code, 'count': 0}
@@ -277,6 +290,8 @@ def export_landuse(land_cover_grid, output_path, land_cover_source=None):
         class_name = class_names[idx] if 0 <= idx < len(class_names) else 'Unknown'
         print(f"  {idx}: {class_name} -> CityLES {stats['cityles_code']}: "
               f"{stats['count']} cells ({percentage:.1f}%)")
+    
+    return cityles_landuse_grid
 
 
 def export_dem(dem_grid, output_path):
@@ -434,11 +449,17 @@ def export_cityles(building_height_grid, building_id_grid, canopy_height_grid,
     print(f"Land cover source: {land_cover_source}")
     
     # Export individual files
-    print("\nExporting topog.txt...")
-    export_topog(building_height_grid, building_id_grid, output_path, building_material)
-    
     print("\nExporting landuse.txt...")
-    export_landuse(land_cover_grid, output_path, land_cover_source)
+    cityles_landuse_grid = export_landuse(land_cover_grid, output_path, land_cover_source)
+
+    print("\nExporting topog.txt...")
+    export_topog(
+        building_height_grid,
+        building_id_grid,
+        output_path,
+        building_material,
+        cityles_landuse_grid=cityles_landuse_grid,
+    )
     
     print("\nExporting dem.txt...")
     export_dem(dem_grid, output_path)

{voxcity-0.6.5.dist-info → voxcity-0.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: voxcity
-Version: 0.6.5
+Version: 0.6.6
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 License: MIT
 Author: Kunihiko Fujiwara

{voxcity-0.6.5.dist-info → voxcity-0.6.6.dist-info}/RECORD

@@ -9,7 +9,7 @@ voxcity/downloader/osm.py,sha256=9nOVcVE50N76F5uquJbNIFr8Xajff4ac2Uj2oSGcFrc,425
 voxcity/downloader/overture.py,sha256=4YG2DMwUSSyZKUw_o8cGhMmAkPJon82aPqOFBvrre-Y,11987
 voxcity/downloader/utils.py,sha256=tz6wt4B9BhEOyvoF5OYXlr8rUd5cBEDedWL3j__oT70,3099
 voxcity/exporter/__init__.py,sha256=dvyWJ184Eik9tFc0VviGbzTQzZi7O0JNyrqi_n39pVI,94
-voxcity/exporter/cityles.py,sha256=Xe6VAt_vtfaMsfizXvc-WhzzemwweJz9iESJRvfVCpA,16665
+voxcity/exporter/cityles.py,sha256=OhsGODC8bFq0MTGc0nBnqRyqnqg1JXL7UaL66a-CKsQ,17418
 voxcity/exporter/envimet.py,sha256=Sh7s1JdQ6SgT_L2Xd_c4gtEGWK2hTS87bccaoIqik-s,31105
 voxcity/exporter/magicavoxel.py,sha256=SfGEgTZRlossKx3Xrv9d3iKSX-HmfQJEL9lZHgWMDX4,12782
 voxcity/exporter/obj.py,sha256=h1_aInpemcsu96fSTwjKMqX2VZAFYbZbElWd4M1ogyI,27973
@@ -30,8 +30,8 @@ voxcity/utils/lc.py,sha256=722Gz3lPbgAp0mmTZ-g-QKBbAnbxrcgaYwb1sa7q8Sk,16189
 voxcity/utils/material.py,sha256=H8K8Lq4wBL6dQtgj7esUW2U6wLCOTeOtelkTDJoRgMo,10007
 voxcity/utils/visualization.py,sha256=ZR9N-XKfydeSStO53IM2hGXyZJoeBiAyIMWw9Cb2MPM,116449
 voxcity/utils/weather.py,sha256=2Jtg-rIVJcsTtiKE-KuDnhIqS1-MSS16_zFRzj6zmu4,36435
-voxcity-0.6.5.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.6.5.dist-info/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
-voxcity-0.6.5.dist-info/METADATA,sha256=ebnpwEnZYPa0aSabyohTodRj8IlgoENztRWL-KG4DbU,26091
-voxcity-0.6.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-voxcity-0.6.5.dist-info/RECORD,,
+voxcity-0.6.6.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.6.6.dist-info/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
+voxcity-0.6.6.dist-info/METADATA,sha256=5LiF0gG85QUFhEMuBEbnnWp0X2icylygNS0QlEGEsPY,26091
+voxcity-0.6.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+voxcity-0.6.6.dist-info/RECORD,,