voxcity 0.5.3__tar.gz → 0.5.5__tar.gz

{voxcity-0.5.3 → voxcity-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.3
+Version: 0.5.5
 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.3 → voxcity-0.5.5}/pyproject.toml

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

{voxcity-0.5.3 → voxcity-0.5.5}/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
@@ -46,7 +45,9 @@ from .geoprocessor.grid import (
     create_building_height_grid_from_gdf_polygon,
     create_dem_grid_from_geotiff_polygon,
     create_land_cover_grid_from_gdf_polygon,
-    create_building_height_grid_from_open_building_temporal_polygon
+    create_building_height_grid_from_open_building_temporal_polygon,
+    create_vegetation_height_grid_from_gdf_polygon,
+    create_dem_grid_from_gdf_polygon
 )
 from .utils.lc import convert_land_cover, convert_land_cover_array
 from .geoprocessor.polygon import get_gdf_from_gpkg, save_geojson
@@ -734,6 +735,7 @@ def get_voxcity_CityGML(rectangle_vertices, url_citygml, land_cover_source, cano
     land_cover_grid = get_land_cover_grid(rectangle_vertices, meshsize, land_cover_source, output_dir, **kwargs)        
 
     # building_height_grid, building_min_height_grid, building_id_grid, building_gdf = get_building_height_grid(rectangle_vertices, meshsize, building_source, output_dir, **kwargs)
+    print("Creating building height grid")
     building_height_grid, building_min_height_grid, building_id_grid, filtered_buildings = create_building_height_grid_from_gdf_polygon(building_gdf, meshsize, rectangle_vertices, **kwargs)
 
     # Visualize grid if requested
@@ -770,6 +772,7 @@ def get_voxcity_CityGML(rectangle_vertices, url_citygml, land_cover_source, cano
     if kwargs.pop('flat_dem', None):
         dem_grid = np.zeros_like(land_cover_grid)
     else:
+        print("Creating Digital Elevation Model (DEM) grid")
         dem_grid = create_dem_grid_from_gdf_polygon(terrain_gdf, meshsize, rectangle_vertices)
         
         # Visualize grid if requested

{voxcity-0.5.3 → voxcity-0.5.5}/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.3 → voxcity-0.5.5}/src/voxcity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.3
+Version: 0.5.5
 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>