voxcity 0.6.28__py3-none-any.whl → 0.6.30__py3-none-any.whl

voxcity/geoprocessor/grid.py

@@ -1542,18 +1542,35 @@ def create_dem_grid_from_gdf_polygon(terrain_gdf, mesh_size, polygon):
 
     # ------------------------------------------------------------------------
     # 4. Nearest-neighbor join from terrain_gdf to grid points
+    #    Use a projected CRS (UTM zone from polygon centroid) for robust distances
     # ------------------------------------------------------------------------
     if 'elevation' not in terrain_gdf.columns:
         raise ValueError("terrain_gdf must have an 'elevation' column.")
 
-    # Nearest spatial join (requires GeoPandas >= 0.10)
-    # This will assign each grid point the nearest terrain_gdf elevation.
-    grid_points_elev = gpd.sjoin_nearest(
-        grid_points,
-        terrain_gdf[['elevation', 'geometry']],
-        how="left",
-        distance_col="dist_to_terrain"
-    )
+    try:
+        centroid = poly.centroid
+        lon_c, lat_c = float(centroid.x), float(centroid.y)
+        zone = int((lon_c + 180.0) // 6) + 1
+        epsg_proj = 32600 + zone if lat_c >= 0 else 32700 + zone
+        terrain_proj = terrain_gdf.to_crs(epsg=epsg_proj)
+        grid_points_proj = grid_points.to_crs(epsg=epsg_proj)
+
+        grid_points_elev = gpd.sjoin_nearest(
+            grid_points_proj,
+            terrain_proj[['elevation', 'geometry']],
+            how="left",
+            distance_col="dist_to_terrain"
+        )
+        # Keep original index mapping
+        grid_points_elev.index = grid_points.index
+    except Exception:
+        # Fallback to geographic join if projection fails
+        grid_points_elev = gpd.sjoin_nearest(
+            grid_points,
+            terrain_gdf[['elevation', 'geometry']],
+            how="left",
+            distance_col="dist_to_terrain"
+        )
 
     # ------------------------------------------------------------------------
     # 5. Build the final 2D height array

voxcity/utils/visualization.py

@@ -2502,7 +2502,30 @@ def visualize_voxcity_plotly(
             if max_dim > max_dimension:
                 stride = int(np.ceil(max_dim / max_dimension))
         if stride > 1:
-            vox = vox[::stride, ::stride, ::stride]
+            # Surface-aware downsampling:
+            # - Stride in X and Y for speed
+            # - Along Z, choose the topmost non-zero within each stride window
+            orig = voxel_array
+            nx0, ny0, nz0 = orig.shape
+            xs = orig[::stride, ::stride, :]
+            nx_ds, ny_ds, _ = xs.shape
+            nz_ds = int(np.ceil(nz0 / float(stride)))
+            vox = np.zeros((nx_ds, ny_ds, nz_ds), dtype=orig.dtype)
+            for k in range(nz_ds):
+                z0w = k * stride
+                z1w = min(z0w + stride, nz0)
+                W = xs[:, :, z0w:z1w]
+                if W.size == 0:
+                    continue
+                nz_mask = (W != 0)
+                has_any = nz_mask.any(axis=2)
+                # find topmost index within window where any class exists
+                rev_mask = nz_mask[:, :, ::-1]
+                idx_rev = rev_mask.argmax(axis=2)
+                real_idx = (W.shape[2] - 1) - idx_rev
+                # gather labels at that topmost index
+                gathered = np.take_along_axis(W, real_idx[..., None], axis=2).squeeze(-1)
+                vox[:, :, k] = np.where(has_any, gathered, 0)
 
         nx, ny, nz = vox.shape
 
@@ -2534,19 +2557,54 @@ def visualize_voxcity_plotly(
         else:
             vox_dict = get_voxel_color_map(voxel_color_map)
 
-    def exposed_face_masks(occ):
-        # occ shape (nx, ny, nz)
-        p = np.pad(occ, ((0,1),(0,0),(0,0)), constant_values=False)
+    def _bool_max_pool_3d(arr_bool, sx):
+        """Max-pool a 3D boolean array with cubic window of size sx.
+
+        Pads with False so the output shape equals ceil(n/sx) per axis.
+        """
+        if isinstance(sx, (tuple, list, np.ndarray)):
+            sx, sy, sz = int(sx[0]), int(sx[1]), int(sx[2])
+        else:
+            sy = sz = int(sx)
+            sx = int(sx)
+
+        a = np.asarray(arr_bool, dtype=bool)
+        nx, ny, nz = a.shape
+        px = (sx - (nx % sx)) % sx
+        py = (sy - (ny % sy)) % sy
+        pz = (sz - (nz % sz)) % sz
+        if px or py or pz:
+            a = np.pad(a, ((0, px), (0, py), (0, pz)), constant_values=False)
+        nxp, nyp, nzp = a.shape
+        a = a.reshape(nxp // sx, sx, nyp // sy, sy, nzp // sz, sz)
+        a = a.max(axis=1).max(axis=2).max(axis=4)
+        return a
+
+    # Build an occluder mask that represents occupancy of any class, including those not rendered.
+    # During downsampling, use max-pooling so omitted classes within a block still occlude neighbors.
+    occluder = None
+    if vox is not None:
+        if stride > 1:
+            try:
+                occluder = _bool_max_pool_3d((voxel_array != 0), stride)
+            except Exception:
+                occluder = (vox != 0)
+        else:
+            occluder = (vox != 0)
+
+    def exposed_face_masks(occ, occ_any):
+        # occ, occ_any shape (nx, ny, nz)
+        p = np.pad(occ_any, ((0,1),(0,0),(0,0)), constant_values=False)
         posx = occ & (~p[1:,:,:])
-        p = np.pad(occ, ((1,0),(0,0),(0,0)), constant_values=False)
+        p = np.pad(occ_any, ((1,0),(0,0),(0,0)), constant_values=False)
         negx = occ & (~p[:-1,:,:])
-        p = np.pad(occ, ((0,0),(0,1),(0,0)), constant_values=False)
+        p = np.pad(occ_any, ((0,0),(0,1),(0,0)), constant_values=False)
         posy = occ & (~p[:,1:,:])
-        p = np.pad(occ, ((0,0),(1,0),(0,0)), constant_values=False)
+        p = np.pad(occ_any, ((0,0),(1,0),(0,0)), constant_values=False)
         negy = occ & (~p[:,:-1,:])
-        p = np.pad(occ, ((0,0),(0,0),(0,1)), constant_values=False)
+        p = np.pad(occ_any, ((0,0),(0,0),(0,1)), constant_values=False)
         posz = occ & (~p[:,:,1:])
-        p = np.pad(occ, ((0,0),(0,0),(1,0)), constant_values=False)
+        p = np.pad(occ_any, ((0,0),(0,0),(1,0)), constant_values=False)
         negz = occ & (~p[:,:,:-1])
         return posx, negx, posy, negy, posz, negz
 
@@ -2639,7 +2697,7 @@ def visualize_voxcity_plotly(
             if not np.any(vox == cls):
                 continue
             occ = (vox == cls)
-            posx, negx, posy, negy, posz, negz = exposed_face_masks(occ)
+            posx, negx, posy, negy, posz, negz = exposed_face_masks(occ, occluder)
             color_rgb = vox_dict.get(int(cls), [128,128,128])
             add_faces(fig, posx, '+x', color_rgb)
             add_faces(fig, negx, '-x', color_rgb)

{voxcity-0.6.28.dist-info → voxcity-0.6.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.6.28
+Version: 0.6.30
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 License: MIT
 License-File: AUTHORS.rst
@@ -69,13 +69,15 @@ Description-Content-Type: text/markdown
 <!-- [![License: CC BY-SA 4.0](https://licensebuttons.net/l/by-sa/4.0/80x15.png)](https://creativecommons.org/licenses/by-sa/4.0/) -->
 
 <p align="center">
-  Tutorial preview: <a href="https://colab.research.google.com/drive/1Lofd3RawKMr6QuUsamGaF48u2MN0hfrP?usp=sharing">[Google Colab]</a> | Documentation: <a href="https://voxcity.readthedocs.io/en/latest">[Read the Docs]</a>
+  Tutorial preview: <a href="https://colab.research.google.com/drive/1Lofd3RawKMr6QuUsamGaF48u2MN0hfrP?usp=sharing">[Google Colab]</a> | Documentation: <a href="https://voxcity.readthedocs.io/en/latest">[Read the Docs]</a> | Video tutorial: <a href="https://youtu.be/qHusvKB07qk">[Watch on YouTube]</a>
 </p>
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/kunifujiwara/VoxCity/main/images/logo.png" alt="Voxcity logo" width="550">
 </p>
 
+ 
+
 # VoxCity
 
 **voxcity** is a Python package that provides a seamless solution for grid-based 3D city model generation and urban simulation for cities worldwide. VoxCity's generator module automatically downloads building heights, tree canopy heights, land cover, and terrain elevation within a specified target area, and voxelizes buildings, trees, land cover, and terrain to generate an integrated voxel city model. The simulator module enables users to conduct environmental simulations, including solar radiation and view index analyses. Users can export the generated models using several file formats compatible with external software, such as ENVI-met (INX), Blender, and Rhino (OBJ). Try it out using the [Google Colab Demo](https://colab.research.google.com/drive/1Lofd3RawKMr6QuUsamGaF48u2MN0hfrP?usp=sharing) or your local environment. For detailed documentation, API reference, and tutorials, visit our [Read the Docs](https://voxcity.readthedocs.io/en/latest) page.
@@ -90,6 +92,21 @@ Description-Content-Type: text/markdown
   <img src="https://raw.githubusercontent.com/kunifujiwara/VoxCity/main/images/concept.png" alt="Conceptual Diagram of voxcity" width="800">
 </p>
 
+## Tutorial
+
+- **Google Colab (interactive notebook)**: <a href="https://colab.research.google.com/drive/1Lofd3RawKMr6QuUsamGaF48u2MN0hfrP?usp=sharing">Open tutorial in Colab</a>
+- **YouTube video (walkthrough)**: <a href="https://youtu.be/qHusvKB07qk">Watch on YouTube</a>
+
+<p align="center">
+  <a href="https://youtu.be/qHusvKB07qk" title="Click to watch the VoxCity tutorial on YouTube">
+    <img src="images/youtube_thumbnail_play.png" alt="VoxCity Tutorial — Click to watch on YouTube" width="480">
+  </a>
+</p>
+
+<p align="center">
+  <em>Tutorial video by <a href="https://ual.sg/author/liang-xiucheng/">Xiucheng Liang</a></em>
+</p>
+
 
 ## Key Features
 
@@ -524,6 +541,8 @@ Fujiwara K, Tsurumi R, Kiyono T, Fan Z, Liang X, Lei B, Yap W, Ito K, Biljecki F
 
 ## Credit
 
+ - Tutorial video by <a href="https://ual.sg/author/liang-xiucheng/">Xiucheng Liang</a>
+
 This package was created with [Cookiecutter](https://github.com/audreyr/cookiecutter) and the [`audreyr/cookiecutter-pypackage`](https://github.com/audreyr/cookiecutter-pypackage) project template.
 
 --------------------------------------------------------------------------------

{voxcity-0.6.28.dist-info → voxcity-0.6.30.dist-info}/RECORD

@@ -5,7 +5,7 @@ voxcity/downloader/eubucco.py,sha256=ln1YNaaOgJfxNfCtVbYaMm775-bUvpAA_LDv60_i22w
 voxcity/downloader/gba.py,sha256=b-VmlVS8IzCR0OYfWgtlMpuZrB5_0M4EpG8BEBj6YEY,7184
 voxcity/downloader/gee.py,sha256=nvJvYqcSZyyontRtG2cFeb__ZJfeY4rRN1NBPORxLwQ,23557
 voxcity/downloader/mbfp.py,sha256=UXDVjsO0fnb0fSal9yqrSFEIBThnRmnutnp08kZTmCA,6595
-voxcity/downloader/oemj.py,sha256=iDacTpiqn7RAXuqyEtHP29m0Cycwta5sMy9-GdvX3Fg,12293
+voxcity/downloader/oemj.py,sha256=SeMId9MvI-DnGyREpqu5-6D-xwRdMJdYIGcAPFD95rw,16432
 voxcity/downloader/osm.py,sha256=7Wo6lSodci7gALMKLQ_0ricmn0ZrfUK90vKYQ-ayU2A,46285
 voxcity/downloader/overture.py,sha256=hVxu-3Fmuu2E1tEzcDcNyU1cR-aE-6h6jkcxkuqN1-s,13343
 voxcity/downloader/utils.py,sha256=tz6wt4B9BhEOyvoF5OYXlr8rUd5cBEDedWL3j__oT70,3099
@@ -14,11 +14,11 @@ voxcity/exporter/cityles.py,sha256=Kfl2PAn4WquqCdjOlyPrHysxPLaudh8QfsoC6WAXlvs,1
 voxcity/exporter/envimet.py,sha256=Sh7s1JdQ6SgT_L2Xd_c4gtEGWK2hTS87bccaoIqik-s,31105
 voxcity/exporter/magicavoxel.py,sha256=SfGEgTZRlossKx3Xrv9d3iKSX-HmfQJEL9lZHgWMDX4,12782
 voxcity/exporter/netcdf.py,sha256=48rJ3wDsFhi9ANbElhMjXLxWMJoJzBt1gFbN0ekPp-A,7404
-voxcity/exporter/obj.py,sha256=aiaG8hMuggNnyCwsFZVhisnHm3BbUHi8SX4m9CyCYgc,59565
-voxcity/generator.py,sha256=uaiXDejqVX9CSSg25QK_f1pDztcOTYjDc_4w0XGTBFY,69550
+voxcity/exporter/obj.py,sha256=iNszT4gurZZQurdl7hGWDyIhuZt50w1gZyMOt5XY2Kk,59888
+voxcity/generator.py,sha256=zJZSLcldMvfbRk2UGXzY25DJmJi1L4KZP0glPuMRFgg,69477
 voxcity/geoprocessor/__init__.py,sha256=WYxcAQrjGucIvGHF0JTC6rONZzL3kCms1S2vpzS6KaU,127
 voxcity/geoprocessor/draw.py,sha256=AZMWq23wxxDJygNloCbVzWAAr1JO7nC94umf9LSxJ5o,49248
-voxcity/geoprocessor/grid.py,sha256=NmlQwl1nJpS7MduVtJeJCG-xBfVIwKTOip7pMm3RhsY,76722
+voxcity/geoprocessor/grid.py,sha256=s64tCCY-pPiZjAWRWRJkBpb2FCkruOjq_nm1vD2unT8,77407
 voxcity/geoprocessor/mesh.py,sha256=A7uaCMWfm82KEoYPfQYpxv6xMtQKaU2PBVDfKTpngqg,32027
 voxcity/geoprocessor/network.py,sha256=YynqR0nq_NUra_cQ3Z_56KxfRia1b6-hIzGCj3QT-wE,25137
 voxcity/geoprocessor/polygon.py,sha256=DfzXf6R-qoWXEZv1z1aHCVfr-DCuCFw6lieQT5cNHPA,61188
@@ -30,10 +30,10 @@ voxcity/simulator/view.py,sha256=k3FoS6gsibR-eDrTHJivJSQfvN3Tg8R8eSTeMqd9ans,939
 voxcity/utils/__init__.py,sha256=Q-NYCqYnAAaF80KuNwpqIjbE7Ec3Gr4y_khMLIMhJrg,68
 voxcity/utils/lc.py,sha256=722Gz3lPbgAp0mmTZ-g-QKBbAnbxrcgaYwb1sa7q8Sk,16189
 voxcity/utils/material.py,sha256=H8K8Lq4wBL6dQtgj7esUW2U6wLCOTeOtelkTDJoRgMo,10007
-voxcity/utils/visualization.py,sha256=m9Tgyv47UrHvCx90E8s14Pry4Ys6YkvSI5ntfz87zn8,121406
+voxcity/utils/visualization.py,sha256=aI4ipzYCTuIIzi6PU-Chog2cHxNFn4bveBZ3ljnZD9g,123876
 voxcity/utils/weather.py,sha256=cb6ZooL42Hc4214OtFiJ78cCgWYM6VE-DU8S3e-urRg,48449
-voxcity-0.6.28.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.6.28.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
-voxcity-0.6.28.dist-info/METADATA,sha256=I_17a_1ggPLiowMqpolU0Y5CF4spJwTlR_H6f4XfaFk,26227
-voxcity-0.6.28.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-voxcity-0.6.28.dist-info/RECORD,,
+voxcity-0.6.30.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.6.30.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
+voxcity-0.6.30.dist-info/METADATA,sha256=6ns5bThD5uMWC05L8u2s4ZEJ_m5XTMEGQsrsmckA-B8,27039
+voxcity-0.6.30.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+voxcity-0.6.30.dist-info/RECORD,,