voxcity 0.3.13__py3-none-any.whl → 0.3.15__py3-none-any.whl

voxcity/utils/visualization.py

@@ -775,5 +775,140 @@ def visualize_numerical_grid_on_basemap(grid, rectangle_vertices, meshsize, valu
     # Set title and remove axes
     ax.set_axis_off()
     
+    plt.tight_layout()
+    plt.show()
+
+def visualize_numerical_grid_gdf_on_basemap(gdf, value_name="value", cmap='viridis', vmin=None, vmax=None,
+                            alpha=0.6, figsize=(12, 8), basemap='CartoDB light',
+                            show_edge=False, edge_color='black', edge_width=0.5):
+    """Visualizes a GeoDataFrame with numerical values on a basemap.
+    
+    Args:
+        gdf: GeoDataFrame containing grid cells with 'geometry' and 'value' columns
+        value_name: Name of the value column and legend label (default: "value")
+        cmap: Colormap to use (default: 'viridis')
+        vmin: Minimum value for colormap scaling (default: None)
+        vmax: Maximum value for colormap scaling (default: None)
+        alpha: Transparency of the grid overlay (default: 0.6)
+        figsize: Figure size in inches (default: (12, 8))
+        basemap: Basemap style (default: 'CartoDB light')
+        show_edge: Whether to show cell edges (default: False)
+        edge_color: Color of cell edges (default: 'black')
+        edge_width: Width of cell edges (default: 0.5)
+    """
+    # Convert to Web Mercator if not already in that CRS
+    if gdf.crs != 'EPSG:3857':
+        gdf_web = gdf.to_crs(epsg=3857)
+    else:
+        gdf_web = gdf
+    
+    # Create figure and axis
+    fig, ax = plt.subplots(figsize=figsize)
+    
+    # Plot the GeoDataFrame
+    gdf_web.plot(column='value',
+                 ax=ax,
+                 alpha=alpha,
+                 cmap=cmap,
+                 vmin=vmin,
+                 vmax=vmax,
+                 legend=True,
+                 legend_kwds={'label': value_name},
+                 edgecolor=edge_color if show_edge else 'none',
+                 linewidth=edge_width if show_edge else 0)
+    
+    # Add basemap
+    basemaps = {
+        'CartoDB dark': ctx.providers.CartoDB.DarkMatter,
+        'CartoDB light': ctx.providers.CartoDB.Positron,
+        'CartoDB voyager': ctx.providers.CartoDB.Voyager,
+        'CartoDB light no labels': ctx.providers.CartoDB.PositronNoLabels,
+        'CartoDB dark no labels': ctx.providers.CartoDB.DarkMatterNoLabels,
+    }
+    ctx.add_basemap(ax, source=basemaps[basemap])
+    
+    # Set title and remove axes
+    ax.set_axis_off()
+    
+    plt.tight_layout()
+    plt.show()
+
+def visualize_point_grid_on_basemap(point_gdf, value_name='value', **kwargs):
+    """Visualizes a point GeoDataFrame on a basemap with colors based on values.
+    
+    Args:
+        point_gdf: GeoDataFrame with point geometries and values
+        value_name: Name of the column containing values to visualize (default: 'value')
+        **kwargs: Optional visualization parameters including:
+            - figsize: Tuple for figure size (default: (12, 8))
+            - colormap: Matplotlib colormap name (default: 'viridis')
+            - markersize: Size of points (default: 20)
+            - alpha: Transparency of points (default: 0.7)
+            - vmin: Minimum value for colormap scaling (default: None)
+            - vmax: Maximum value for colormap scaling (default: None)
+            - title: Plot title (default: None)
+            - basemap_style: Contextily basemap style (default: CartoDB.Positron)
+            - zoom: Basemap zoom level (default: 15)
+            
+    Returns:
+        matplotlib figure and axis objects
+    """
+    import matplotlib.pyplot as plt
+    import contextily as ctx
+    
+    # Set default parameters
+    defaults = {
+        'figsize': (12, 8),
+        'colormap': 'viridis',
+        'markersize': 20,
+        'alpha': 0.7,
+        'vmin': None,
+        'vmax': None,
+        'title': None,
+        'basemap_style': ctx.providers.CartoDB.Positron,
+        'zoom': 15
+    }
+    
+    # Update defaults with provided kwargs
+    settings = {**defaults, **kwargs}
+    
+    # Create figure and axis
+    fig, ax = plt.subplots(figsize=settings['figsize'])
+    
+    # Convert to Web Mercator for basemap compatibility
+    point_gdf_web = point_gdf.to_crs(epsg=3857)
+    
+    # Plot points
+    scatter = point_gdf_web.plot(
+        column=value_name,
+        ax=ax,
+        cmap=settings['colormap'],
+        markersize=settings['markersize'],
+        alpha=settings['alpha'],
+        vmin=settings['vmin'],
+        vmax=settings['vmax'],
+        legend=True,
+        legend_kwds={
+            'label': value_name,
+            'orientation': 'vertical',
+            'shrink': 0.8
+        }
+    )
+    
+    # Add basemap
+    ctx.add_basemap(
+        ax,
+        source=settings['basemap_style'],
+        zoom=settings['zoom']
+    )
+    
+    # Set title if provided
+    if settings['title']:
+        plt.title(settings['title'])
+    
+    # Remove axes
+    ax.set_axis_off()
+    
+    # Adjust layout to prevent colorbar cutoff
     plt.tight_layout()
     plt.show()

{voxcity-0.3.13.dist-info → voxcity-0.3.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.13
+Version: 0.3.15
 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>
@@ -225,7 +225,7 @@ from voxcity import get_voxcity
 
 voxcity_grid, building_height_grid, building_min_height_grid, \
 building_id_grid, canopy_height_grid, land_cover_grid, dem_grid, \
-building_geojson = get_voxcity(
+building_gdf = get_voxcity(
     rectangle_vertices,
     building_source,
     land_cover_source,
@@ -410,7 +410,7 @@ landmark_kwargs = {
     "output_directory": "output",             # Directory to save output files
     "output_file_name": "landmark_visibility" # Base filename for outputs
 }
-landmark_vis_map = get_landmark_visibility_map(voxcity_grid, building_id_grid, building_geojson, meshsize, **landmark_kwargs)
+landmark_vis_map = get_landmark_visibility_map(voxcity_grid, building_id_grid, building_gdf, meshsize, **landmark_kwargs)
 ```
 <p align="center">
   <img src="https://raw.githubusercontent.com/kunifujiwara/VoxCity/main/images/landmark.png" alt="Landmark Visibility Map Rendered in Rhino" width="500">

{voxcity-0.3.13.dist-info → voxcity-0.3.15.dist-info}/RECORD

@@ -1,36 +1,36 @@
 voxcity/__init__.py,sha256=el9v3gfybHOF_GUYPeSOqN0-vCrTW0eU1mcvi0sEfeU,252
-voxcity/generator.py,sha256=n0nSzDYddmQDHi4pLOaN2YY8xfZC0Rbl8nD7MvYSmHg,33695
+voxcity/generator.py,sha256=SDaX1gLAq8NEPVZD8h_bFzUQcm8FjcAJzAy6yMXVsxg,33441
 voxcity/downloader/__init__.py,sha256=OgGcGxOXF4tjcEL6DhOnt13DYPTvOigUelp5xIpTqM0,171
-voxcity/downloader/eubucco.py,sha256=BaaMitzPDFXjeH-F7XfDzULpq89hVNEDYpsxeStZYDM,15002
+voxcity/downloader/eubucco.py,sha256=XCkkdEPNuWdrnuxzL80Ext37WsgiCiZGueb-aQV5rvI,14476
 voxcity/downloader/gee.py,sha256=j7jmzp44T3M6j_4DwhU9Y8Y6gqbZo1zFIlduQPc0jvk,14339
-voxcity/downloader/mbfp.py,sha256=xmITDh9mCMnLWjYfjarEr2FEwAW5812IncJxo33IC7c,3959
+voxcity/downloader/mbfp.py,sha256=5fXq9S7qNVSLDdVtj67Da1pBAJP6kL4P8qLZTOmWqdw,3895
 voxcity/downloader/oemj.py,sha256=YlCuWBQfi40gfmwQcGDeHiPOs4Pk_jLZq65d5R3IGMU,7886
-voxcity/downloader/omt.py,sha256=EjzimZMFXcjWNRlUEwPIjeTmE4rPh_9bjsgZyro8_mo,8819
-voxcity/downloader/osm.py,sha256=HHSuj6jiQrThrfyJMWHE2nQ0Rqkx4UsXopk8AoNZS6Q,26536
-voxcity/downloader/overture.py,sha256=daOvsySC2KIcTcMJUSA7XdbMELJuyLAIM2vr1DRLGp0,7714
+voxcity/downloader/omt.py,sha256=ByFvoQDnBOJF4qdVYNkDjn7cMvEhWwtD0mIV_T-zMEs,9017
+voxcity/downloader/osm.py,sha256=0VpYuPRiO3iru3nHM_or0nTDFb8ytUUDZieFX6zxB9Q,26338
+voxcity/downloader/overture.py,sha256=2m7pHymE60iaqxa3H4gxAMtJioHd831R5kCS73dxzW8,7821
 voxcity/downloader/utils.py,sha256=z6MdPxM96FWQVqvZW2Eg5pMewVHVysUP7F6ueeCwMfI,1375
 voxcity/exporter/__init_.py,sha256=cVyNyE6axEpSd3CT5hGuMOAlOyU1p8lVP4jkF1-0Ad8,94
 voxcity/exporter/envimet.py,sha256=m-y2IYw-yp45AT2wN9UIlxvMjvDvupTKzyfRJl057fE,24300
 voxcity/exporter/magicavoxel.py,sha256=Fsv7yGRXeKmp82xcG3rOb0t_HtoqltNq2tHl08xVlqY,7500
 voxcity/exporter/obj.py,sha256=oW-kPoZj53nfmO9tXP3Wvizq6Kkjh-QQR8UBexRuMiI,21609
 voxcity/geoprocessor/__init_.py,sha256=FFJFf6idmAtmNkwfKPt3ERGSIzjb8tt35D1n9QQbCA8,112
-voxcity/geoprocessor/draw.py,sha256=vhO5O8_Hc0eMOfnczz6k2ZqplTX64FA6DL-XryOxIJs,13557
-voxcity/geoprocessor/grid.py,sha256=bQvcNjUZ1D124c8QYAs1Pba63bfjRorGr-9wxde9M1w,36298
+voxcity/geoprocessor/draw.py,sha256=7T99AUr2qdt1OTfn4W61_Lph7HGz0_WcgoY6Ezo7sB4,13246
+voxcity/geoprocessor/grid.py,sha256=Q5LSEuAuFMWXnGoJJ2g6RM-E2fkKxBkD8BbiAJeEpNs,43431
 voxcity/geoprocessor/network.py,sha256=opb_kpUCAxDd1qtrWPStqR5reYZtVe96XxazNSen7Lk,18851
-voxcity/geoprocessor/polygon.py,sha256=1U8FYtTbOUrDmK6ZIdECXpf8FuUvT8QKgIhthypDQ54,33566
+voxcity/geoprocessor/polygon.py,sha256=8fU2Ayu2Y_G1z7Mbj8KoSKVurdPuAVbASjGMVS36ftM,32249
 voxcity/geoprocessor/utils.py,sha256=1BRHp-DDeOA8HG8jplY7Eo75G3oXkVGL6DGONL4BA8A,19815
 voxcity/simulator/__init_.py,sha256=APdkcdaovj0v_RPOaA4SBvFUKT2RM7Hxuuz3Sux4gCo,65
 voxcity/simulator/solar.py,sha256=FOcHoUm4miJNyeCcGs2oL93Vu38Affyywt29dJcmIT4,31974
 voxcity/simulator/utils.py,sha256=sEYBB2-hLJxTiXQps1_-Fi7t1HN3-1OPOvBCWtgIisA,130
-voxcity/simulator/view.py,sha256=4H19dMrHNzLuGtkzVEdOTsF1fl_ZcRC29HIxGVJBlGE,36770
+voxcity/simulator/view.py,sha256=zNbfTLQ2Jo0V5-rFA3-xamRjOuw3H3MBrLKpQp8x3hY,36737
 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=3cNjJdwIaOlzwgK08S39F1VYNf7vu-x9d4UUiKwXRVo,31943
+voxcity/utils/visualization.py,sha256=2bv3y-1zkUX0cm_YbMHwe_Vt9J2R3QhouaVAGNifQXg,36805
 voxcity/utils/weather.py,sha256=P6s1y_EstBL1OGP_MR_6u3vr-t6Uawg8uDckJnoI7FI,21482
-voxcity-0.3.13.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.3.13.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
-voxcity-0.3.13.dist-info/METADATA,sha256=XWJTqfQEG1Qfvp9XsTMK_xUau4smVj0iUpQgjCCPlDw,25122
-voxcity-0.3.13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-voxcity-0.3.13.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.3.13.dist-info/RECORD,,
+voxcity-0.3.15.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.3.15.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
+voxcity-0.3.15.dist-info/METADATA,sha256=aYm-Aa9Cskc-L7wKMJj25ikqTB4uDyN0h1fBS_DN3Fw,25114
+voxcity-0.3.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+voxcity-0.3.15.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.3.15.dist-info/RECORD,,