voxcity 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

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/generator.py

@@ -16,7 +16,6 @@ The main functions are:
 
 import numpy as np
 import os
-
 # Local application/library specific imports
 from .downloader.mbfp import get_mbfp_gdf
 from .downloader.osm import load_gdf_from_openstreetmap, load_land_cover_gdf_from_osm
@@ -219,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":
@@ -765,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/geoprocessor/grid.py

@@ -10,7 +10,8 @@ from scipy.ndimage import label, generate_binary_structure
 from pyproj import Geod, Transformer, CRS
 import rasterio
 from affine import Affine
-from shapely.geometry import box
+from shapely.geometry import box, Polygon, Point, MultiPolygon
+
 from scipy.interpolate import griddata
 from shapely.errors import GEOSException
 import geopandas as gpd

{voxcity-0.5.4.dist-info → voxcity-0.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.4
+Version: 0.5.6
 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.5.4.dist-info → voxcity-0.5.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
 voxcity/__init__.py,sha256=el9v3gfybHOF_GUYPeSOqN0-vCrTW0eU1mcvi0sEfeU,252
-voxcity/generator.py,sha256=ea2JPJnUsOaVY3UojR8bODw4bTo2wUapWZVhWjwjEjs,42325
+voxcity/generator.py,sha256=XP5-_ojHvKdJ1aTY2EHDaegkRQJFYLLprTIV7zAco0k,42541
 voxcity/downloader/__init__.py,sha256=OgGcGxOXF4tjcEL6DhOnt13DYPTvOigUelp5xIpTqM0,171
-voxcity/downloader/citygml.py,sha256=phGxEz829mDGXEugs8rTQzARQy-_JyqfcDLMijR4DoM,24467
+voxcity/downloader/citygml.py,sha256=NUqtxQ2aBjdVxxsrPGh3DFHCa1ZcRFWZb3SmLyx8byg,24479
 voxcity/downloader/eubucco.py,sha256=XCkkdEPNuWdrnuxzL80Ext37WsgiCiZGueb-aQV5rvI,14476
 voxcity/downloader/gee.py,sha256=hEN5OvQAltORYnrlPbmYcDequ6lKLmwyTbNaCZ81Vj8,16089
 voxcity/downloader/mbfp.py,sha256=pGJuXXLRuRedlORXfg8WlgAVwmKI30jxki9t-v5NejY,3972
@@ -16,7 +16,7 @@ voxcity/exporter/magicavoxel.py,sha256=Fsv7yGRXeKmp82xcG3rOb0t_HtoqltNq2tHl08xVl
 voxcity/exporter/obj.py,sha256=0RBFPMKGRH6uNmCLIwAoYFko1bOZKtTSwg7QnoPMud0,21593
 voxcity/geoprocessor/__init_.py,sha256=JzPVhhttxBWvaZ0IGX2w7OWL5bCo_TIvpHefWeNXruA,133
 voxcity/geoprocessor/draw.py,sha256=8Em2NvazFpYfFJUqG9LofNXaxdghKLL_rNuztmPwn8Q,13911
-voxcity/geoprocessor/grid.py,sha256=g1go8vvv2q4epnkZIN6CvWieSqxFWtLEYqX5CPw6vUo,56340
+voxcity/geoprocessor/grid.py,sha256=JNTtapcVypZduryGUfOURj_s8rq3ZbtJMapdbmx7PJ0,56372
 voxcity/geoprocessor/mesh.py,sha256=r3cRPLgpbhjwgESBemHWWJ5pEWl2KdkRhID6mdLhios,11171
 voxcity/geoprocessor/network.py,sha256=opb_kpUCAxDd1qtrWPStqR5reYZtVe96XxazNSen7Lk,18851
 voxcity/geoprocessor/polygon.py,sha256=8Vb2AbkpKYhq1kk2hQMc-gitmUo9pFIe910v4p1vP2g,37772
@@ -30,9 +30,9 @@ voxcity/utils/lc.py,sha256=RwPd-VY3POV3gTrBhM7TubgGb9MCd3nVah_G8iUEF7k,11562
 voxcity/utils/material.py,sha256=Vt3IID5Ft54HNJcEC4zi31BCPqi_687X3CSp7rXaRVY,5907
 voxcity/utils/visualization.py,sha256=SF8W7sqvBl3sZbB5noWCY9ic2D34Gq01VZYJ9NDNZ4Y,85237
 voxcity/utils/weather.py,sha256=CFPtoqRTajwMRswswDChwQ3BW1cGsnA3orgWHgz7Ehg,26304
-voxcity-0.5.4.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.5.4.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
-voxcity-0.5.4.dist-info/METADATA,sha256=BRT790h7NawGol-GFlnP7MoxRCeZVk9z4tH8-6hQxfE,25733
-voxcity-0.5.4.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-voxcity-0.5.4.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.5.4.dist-info/RECORD,,
+voxcity-0.5.6.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.5.6.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
+voxcity-0.5.6.dist-info/METADATA,sha256=ObAFnBoJ-6FuRW6sqfrcrp9AW7gcKZz-T0W0vd40wcY,25733
+voxcity-0.5.6.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+voxcity-0.5.6.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.5.6.dist-info/RECORD,,