voxcity 0.3.25__tar.gz → 0.3.27__tar.gz

{voxcity-0.3.25 → voxcity-0.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.25
+Version: 0.3.27
 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>
@@ -45,7 +45,7 @@ Requires-Dist: pycountry
 Requires-Dist: osm2geojson
 Requires-Dist: seaborn
 Requires-Dist: overturemaps
-Requires-Dist: protobuf==3.20.3
+Requires-Dist: protobuf<=3.20.3
 Requires-Dist: timezonefinder
 Requires-Dist: astral
 Requires-Dist: osmnx

{voxcity-0.3.25 → voxcity-0.3.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "voxcity"
-version = "0.3.25"
+version = "0.3.27"
 requires-python = ">=3.10,<3.13"
 classifiers = [
     "Programming Language :: Python :: 3.10",
@@ -47,7 +47,7 @@ dependencies = [
     "osm2geojson",
     "seaborn",
     "overturemaps",
-    "protobuf==3.20.3",
+    "protobuf<=3.20.3",
     "timezonefinder",
     "astral",
     "osmnx",

{voxcity-0.3.25 → voxcity-0.3.27}/src/voxcity/generator.py

@@ -82,7 +82,8 @@ def get_land_cover_grid(rectangle_vertices, meshsize, source, output_dir, **kwar
     print(f"Data source: {source}")
     
     # Initialize Earth Engine for accessing satellite data
-    initialize_earth_engine()
+    if source is not "OpenStreetMap":
+        initialize_earth_engine()
 
     # Create output directory if it doesn't exist
     os.makedirs(output_dir, exist_ok=True)
@@ -157,7 +158,8 @@ def get_building_height_grid(rectangle_vertices, meshsize, source, output_dir, *
     """
 
     # Initialize Earth Engine for accessing satellite data
-    initialize_earth_engine()
+    if source is not "OpenStreetMap":
+        initialize_earth_engine()
 
     print("Creating Building Height grid\n ")
     print(f"Data source: {source}")
@@ -320,7 +322,7 @@ def get_dem_grid(rectangle_vertices, meshsize, source, output_dir, **kwargs):
         image = get_dem_image(roi_buffered, source)
         
         # Save DEM data with appropriate resolution based on source
-        if source in ["England 1m DTM", 'DEM France 1m', 'DEM France 5m', 'AUSTRALIA 5M DEM']:
+        if source in ["England 1m DTM", 'DEM France 1m', 'DEM France 5m', 'AUSTRALIA 5M DEM', 'Netherlands 0.5m DTM']:
             save_geotiff(image, geotiff_path, scale=meshsize, region=roi_buffered, crs='EPSG:4326')
         elif source == 'USGS 3DEP 1m':
             scale = max(meshsize, 1.25)
@@ -569,7 +571,18 @@ def get_voxcity(rectangle_vertices, building_source, land_cover_source, canopy_h
         building_gdf.to_file(save_path, driver='GPKG')
     
     # Get canopy height data
-    canopy_height_grid = get_canopy_height_grid(rectangle_vertices, meshsize, canopy_height_source, output_dir, **kwargs)
+    if canopy_height_source == "Static":
+        # Create canopy height grid with same shape as land cover grid
+        canopy_height_grid = np.zeros_like(land_cover_grid, dtype=float)
+        
+        # Set default static height for trees (20 meters is a typical average tree height)
+        static_tree_height = kwargs.get("static_tree_height", 10.0)
+        tree_mask = (land_cover_grid == 4)
+        
+        # Set static height for tree cells
+        canopy_height_grid[tree_mask] = static_tree_height
+    else:
+        canopy_height_grid = get_canopy_height_grid(rectangle_vertices, meshsize, canopy_height_source, output_dir, **kwargs)
     
     # Handle DEM - either flat or from source
     if dem_source == "Flat":

{voxcity-0.3.25 → voxcity-0.3.27}/src/voxcity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.25
+Version: 0.3.27
 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>
@@ -45,7 +45,7 @@ Requires-Dist: pycountry
 Requires-Dist: osm2geojson
 Requires-Dist: seaborn
 Requires-Dist: overturemaps
-Requires-Dist: protobuf==3.20.3
+Requires-Dist: protobuf<=3.20.3
 Requires-Dist: timezonefinder
 Requires-Dist: astral
 Requires-Dist: osmnx

{voxcity-0.3.25 → voxcity-0.3.27}/src/voxcity.egg-info/requires.txt

@@ -28,7 +28,7 @@ pycountry
 osm2geojson
 seaborn
 overturemaps
-protobuf==3.20.3
+protobuf<=3.20.3
 timezonefinder
 astral
 osmnx