voxcity 0.4.3__py3-none-any.whl → 0.4.4__py3-none-any.whl

voxcity/generator.py

@@ -82,7 +82,7 @@ def get_land_cover_grid(rectangle_vertices, meshsize, source, output_dir, **kwar
     print(f"Data source: {source}")
     
     # Initialize Earth Engine for accessing satellite data
-    if source is not "OpenStreetMap":
+    if source != "OpenStreetMap":
         initialize_earth_engine()
 
     # Create output directory if it doesn't exist
@@ -158,7 +158,7 @@ def get_building_height_grid(rectangle_vertices, meshsize, source, output_dir, *
     """
 
     # Initialize Earth Engine for accessing satellite data
-    if source is not "OpenStreetMap":
+    if source not in ["OpenStreetMap", "Overture", "Local file"]:
         initialize_earth_engine()
 
     print("Creating Building Height grid\n ")
@@ -236,7 +236,9 @@ def get_building_height_grid(rectangle_vertices, meshsize, source, output_dir, *
     # Visualize grid if requested
     grid_vis = kwargs.get("gridvis", True)    
     if grid_vis:
-        visualize_numerical_grid(np.flipud(building_height_grid), meshsize, "building height (m)", cmap='viridis', label='Value')
+        building_height_grid_nan = building_height_grid.copy()
+        building_height_grid_nan[building_height_grid_nan == 0] = np.nan
+        visualize_numerical_grid(np.flipud(building_height_grid_nan), meshsize, "building height (m)", cmap='viridis', label='Value')
 
     return building_height_grid, building_min_height_grid, building_id_grid, filtered_buildings
 
@@ -282,7 +284,9 @@ def get_canopy_height_grid(rectangle_vertices, meshsize, source, output_dir, **k
     # Visualize grid if requested
     grid_vis = kwargs.get("gridvis", True)    
     if grid_vis:
-        visualize_numerical_grid(np.flipud(canopy_height_grid), meshsize, "Tree canopy height", cmap='Greens', label='Tree canopy height (m)')
+        canopy_height_grid_nan = canopy_height_grid.copy()
+        canopy_height_grid_nan[canopy_height_grid_nan == 0] = np.nan
+        visualize_numerical_grid(np.flipud(canopy_height_grid_nan), meshsize, "Tree canopy height", cmap='Greens', label='Tree canopy height (m)')
 
     return canopy_height_grid
 

voxcity/geoprocessor/polygon.py

@@ -156,7 +156,7 @@ def extract_building_heights_from_gdf(gdf_0: gpd.GeoDataFrame, gdf_1: gpd.GeoDat
 
     # Process each building in primary dataset that needs height data
     for idx_primary, row in gdf_primary.iterrows():
-        if row['height'] == 0:
+        if row['height'] <= 0 or pd.isna(row['height']):
             count_0 += 1
             geom = row.geometry
             
@@ -619,7 +619,7 @@ def extract_building_heights_from_geotiff(geotiff_path, gdf):
         transformer = Transformer.from_crs(CRS.from_epsg(4326), src.crs, always_xy=True)
 
         # Filter buildings that need height processing
-        mask_condition = (gdf.geometry.geom_type == 'Polygon') & (gdf.get('height', 0) <= 0)
+        mask_condition = (gdf.geometry.geom_type == 'Polygon') & ((gdf.get('height', 0) <= 0) | gdf.get('height').isna())
         buildings_to_process = gdf[mask_condition]
         count_0 = len(buildings_to_process)
 
@@ -815,14 +815,24 @@ def process_building_footprints_by_overlap(filtered_gdf, overlap_threshold=0.5):
     if 'id' not in gdf.columns:
         gdf['id'] = gdf.index
     
-    # Calculate areas and sort by area (descending)
-    gdf['area'] = gdf.geometry.area
-    gdf = gdf.sort_values(by='area', ascending=False)
-    gdf = gdf.reset_index(drop=True)
+    # Check if CRS is set before transforming
+    if gdf.crs is None:
+        # Work with original geometries if no CRS is set
+        gdf_projected = gdf.copy()
+    else:
+        # Store original CRS to convert back later
+        original_crs = gdf.crs
+        # Project to Web Mercator for accurate area calculation
+        gdf_projected = gdf.to_crs("EPSG:3857")
+    
+    # Calculate areas on the geometries
+    gdf_projected['area'] = gdf_projected.geometry.area
+    gdf_projected = gdf_projected.sort_values(by='area', ascending=False)
+    gdf_projected = gdf_projected.reset_index(drop=True)
     
     # Create spatial index for efficient querying
     spatial_idx = index.Index()
-    for i, geom in enumerate(gdf.geometry):
+    for i, geom in enumerate(gdf_projected.geometry):
         if geom.is_valid:
             spatial_idx.insert(i, geom.bounds)
         else:
@@ -835,10 +845,10 @@ def process_building_footprints_by_overlap(filtered_gdf, overlap_threshold=0.5):
     id_mapping = {}
     
     # Process each building (skip the largest one)
-    for i in range(1, len(gdf)):
-        current_poly = gdf.iloc[i].geometry
-        current_area = gdf.iloc[i].area
-        current_id = gdf.iloc[i]['id']
+    for i in range(1, len(gdf_projected)):
+        current_poly = gdf_projected.iloc[i].geometry
+        current_area = gdf_projected.iloc[i].area
+        current_id = gdf_projected.iloc[i]['id']
         
         # Skip if already mapped
         if current_id in id_mapping:
@@ -854,8 +864,8 @@ def process_building_footprints_by_overlap(filtered_gdf, overlap_threshold=0.5):
         potential_overlaps = [j for j in spatial_idx.intersection(current_poly.bounds) if j < i]
         
         for j in potential_overlaps:
-            larger_poly = gdf.iloc[j].geometry
-            larger_id = gdf.iloc[j]['id']
+            larger_poly = gdf_projected.iloc[j].geometry
+            larger_id = gdf_projected.iloc[j]['id']
             
             # Skip if already processed
             if larger_id in id_mapping:
@@ -876,7 +886,7 @@ def process_building_footprints_by_overlap(filtered_gdf, overlap_threshold=0.5):
                     # Replace ID if overlap exceeds threshold
                     if overlap_ratio > overlap_threshold:
                         id_mapping[current_id] = larger_id
-                        gdf.at[i, 'id'] = larger_id
+                        gdf_projected.at[i, 'id'] = larger_id
                         break  # Stop at first significant overlap
             except (GEOSException, ValueError) as e:
                 # Handle geometry errors gracefully

voxcity/utils/visualization.py

@@ -1450,7 +1450,7 @@ def create_multi_view_scene(meshes, output_directory="output", projection_type="
 
     # Add orthographic views
     ortho_views = {
-        'xy_top': [center + np.array([0, 0, distance]), center, (0, 1, 0)],
+        'xy_top': [center + np.array([0, 0, distance]), center, (-1, 0, 0)],
         'yz_right': [center + np.array([distance, 0, 0]), center, (0, 0, 1)],
         'xz_front': [center + np.array([0, distance, 0]), center, (0, 0, 1)],
         'yz_left': [center + np.array([-distance, 0, 0]), center, (0, 0, 1)],
@@ -1787,7 +1787,7 @@ def visualize_voxcity_with_sim_meshes(voxel_array, meshsize, custom_meshes=None,
                 # Set vmin/vmax if not provided
                 local_vmin = vmin if vmin is not None else np.nanmin(values[~np.isnan(values)])
                 local_vmax = vmax if vmax is not None else np.nanmax(values[~np.isnan(values)])
-                
+
                 # Create colors
                 cmap = cm.get_cmap(cmap_name)
                 norm = mcolors.Normalize(vmin=local_vmin, vmax=local_vmax)

{voxcity-0.4.3.dist-info → voxcity-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.4.3
+Version: 0.4.4
 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.4.3.dist-info → voxcity-0.4.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 voxcity/__init__.py,sha256=el9v3gfybHOF_GUYPeSOqN0-vCrTW0eU1mcvi0sEfeU,252
-voxcity/generator.py,sha256=rsS5Z77Esgomho9Bd3HRQeYlncvyEG1CEHUXAB_SHxw,35048
+voxcity/generator.py,sha256=0RKWcWKfwFs2xcepyEDLMQdHqGhAGlpPwhNe6UJTRuI,35348
 voxcity/downloader/__init__.py,sha256=OgGcGxOXF4tjcEL6DhOnt13DYPTvOigUelp5xIpTqM0,171
 voxcity/downloader/eubucco.py,sha256=XCkkdEPNuWdrnuxzL80Ext37WsgiCiZGueb-aQV5rvI,14476
 voxcity/downloader/gee.py,sha256=hEN5OvQAltORYnrlPbmYcDequ6lKLmwyTbNaCZ81Vj8,16089
@@ -18,7 +18,7 @@ voxcity/geoprocessor/draw.py,sha256=8Em2NvazFpYfFJUqG9LofNXaxdghKLL_rNuztmPwn8Q,
 voxcity/geoprocessor/grid.py,sha256=t-KAdYOk1iUeBuOMcoAb5e4hzJjMIfVItTdFP6FJs1A,44340
 voxcity/geoprocessor/mesh.py,sha256=z6e-BigN_K1CGpS9mopkf121pbCnBFJMu32XYfqpLI4,10506
 voxcity/geoprocessor/network.py,sha256=opb_kpUCAxDd1qtrWPStqR5reYZtVe96XxazNSen7Lk,18851
-voxcity/geoprocessor/polygon.py,sha256=wXU3K-lghAlAOe_C-m1YD4_75DvCWzdszuWieenP5mA,37208
+voxcity/geoprocessor/polygon.py,sha256=8Vb2AbkpKYhq1kk2hQMc-gitmUo9pFIe910v4p1vP2g,37772
 voxcity/geoprocessor/utils.py,sha256=1BRHp-DDeOA8HG8jplY7Eo75G3oXkVGL6DGONL4BA8A,19815
 voxcity/simulator/__init_.py,sha256=APdkcdaovj0v_RPOaA4SBvFUKT2RM7Hxuuz3Sux4gCo,65
 voxcity/simulator/solar.py,sha256=amJ5GJtzdG9NE7oxrLj4EMRxGvDY9s2BQdDJ2paFfn0,56709
@@ -27,11 +27,11 @@ voxcity/simulator/view.py,sha256=-CM-pPbfthg_meyMdcZs9Ar3CHaZhw2fRf_dM6ioN_Q,748
 voxcity/utils/__init_.py,sha256=nLYrj2huBbDBNMqfchCwexGP8Tlt9O_XluVDG7MoFkw,98
 voxcity/utils/lc.py,sha256=RwPd-VY3POV3gTrBhM7TubgGb9MCd3nVah_G8iUEF7k,11562
 voxcity/utils/material.py,sha256=Vt3IID5Ft54HNJcEC4zi31BCPqi_687X3CSp7rXaRVY,5907
-voxcity/utils/visualization.py,sha256=8r7ffnvBCAmvEYnJQ4KKh18aaah3G9ARoV9EDXUyo8I,85255
+voxcity/utils/visualization.py,sha256=UJ2wyFFbuI6glZJ8adyiVtNlZFUgleC278S-r2OO33g,85240
 voxcity/utils/weather.py,sha256=CFPtoqRTajwMRswswDChwQ3BW1cGsnA3orgWHgz7Ehg,26304
-voxcity-0.4.3.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.4.3.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
-voxcity-0.4.3.dist-info/METADATA,sha256=kCm6TzscCstqLacexWTUM6I1u9qm_wT-AeYdlCe8P9o,25527
-voxcity-0.4.3.dist-info/WHEEL,sha256=EaM1zKIUYa7rQnxGiOCGhzJABRwy4WO57rWMR3_tj4I,91
-voxcity-0.4.3.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.4.3.dist-info/RECORD,,
+voxcity-0.4.4.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.4.4.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
+voxcity-0.4.4.dist-info/METADATA,sha256=73PRyC5f-BPeFk8FpmZvaUvUVYGVDqAHMK-_Rj_oQs0,25527
+voxcity-0.4.4.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+voxcity-0.4.4.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.4.4.dist-info/RECORD,,

{voxcity-0.4.3.dist-info → voxcity-0.4.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.9.1)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any