voxcity 0.5.4__tar.gz → 0.5.6__tar.gz

{voxcity-0.5.4 → voxcity-0.5.6}/PKG-INFO

@@ -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 → voxcity-0.5.6}/pyproject.toml

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

{voxcity-0.5.4 → voxcity-0.5.6}/src/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-0.5.4 → voxcity-0.5.6}/src/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-0.5.4 → voxcity-0.5.6}/src/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 → voxcity-0.5.6}/src/voxcity.egg-info/PKG-INFO

@@ -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>