voxcity 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

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/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.dist-info → voxcity-0.5.5.dist-info}/METADATA

@@ -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.dist-info → voxcity-0.5.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 voxcity/__init__.py,sha256=el9v3gfybHOF_GUYPeSOqN0-vCrTW0eU1mcvi0sEfeU,252
-voxcity/generator.py,sha256=n1iHtM_BQkZSmCIwo0KzRv-bLHzhDSOYvbqhe0lRoB8,42127
+voxcity/generator.py,sha256=w0MUwVBP-TVWIzmYbliGsawowoA-i7CYzvdlzU7GfNA,42323
 voxcity/downloader/__init__.py,sha256=OgGcGxOXF4tjcEL6DhOnt13DYPTvOigUelp5xIpTqM0,171
 voxcity/downloader/citygml.py,sha256=phGxEz829mDGXEugs8rTQzARQy-_JyqfcDLMijR4DoM,24467
 voxcity/downloader/eubucco.py,sha256=XCkkdEPNuWdrnuxzL80Ext37WsgiCiZGueb-aQV5rvI,14476
@@ -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.3.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.5.3.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
-voxcity-0.5.3.dist-info/METADATA,sha256=MOCifakrQKv-7z7NynNKlhx04vcGO5plzD60DxoEySk,25733
-voxcity-0.5.3.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-voxcity-0.5.3.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.5.3.dist-info/RECORD,,
+voxcity-0.5.5.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.5.5.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
+voxcity-0.5.5.dist-info/METADATA,sha256=_U2ts1B05uLVSjdckucrHh8-hYL1Q644EH6UOW9tOTg,25733
+voxcity-0.5.5.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+voxcity-0.5.5.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.5.5.dist-info/RECORD,,