voxcity 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

voxcity/download/eubucco.py

@@ -314,4 +314,8 @@ def load_geojson_from_eubucco(rectangle_vertices, output_dir):
         raw_data = json.load(f)
     geojson_data = raw_data['features']
 
+    # Add id to each building's properties
+    for i, feature in enumerate(geojson_data):
+        feature['properties']['id'] = i + 1
+
     return geojson_data

voxcity/file/geojson.py

@@ -58,11 +58,13 @@ def filter_and_convert_gdf_to_geojson(gdf, rectangle_vertices):
 
     # Create GeoJSON features from filtered geometries
     features = []
+    feature_id = 1
     for idx, row in filtered_gdf.iterrows():
         geom = row['geometry'].__geo_interface__
         properties = {
             'height': row['height'],
-            'confidence': row['confidence']
+            'confidence': row['confidence'],
+            'id': feature_id
         }
 
         # Handle MultiPolygon by splitting into separate Polygon features
@@ -74,10 +76,11 @@ def filter_and_convert_gdf_to_geojson(gdf, rectangle_vertices):
                 }
                 feature = {
                     'type': 'Feature',
-                    'properties': properties,
+                    'properties': properties.copy(),  # Use copy to avoid shared references
                     'geometry': single_geom
                 }
                 features.append(feature)
+                feature_id += 1
         elif geom['type'] == 'Polygon':
             feature = {
                 'type': 'Feature',
@@ -85,6 +88,7 @@ def filter_and_convert_gdf_to_geojson(gdf, rectangle_vertices):
                 'geometry': geom
             }
             features.append(feature)
+            feature_id += 1
         else:
             pass  # Skip other geometry types
 

voxcity/geo/network.py

@@ -3,13 +3,15 @@ import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 import geopandas as gpd
-from shapely.geometry import LineString
+from shapely.geometry import LineString, Polygon
+import shapely.ops as ops
 import networkx as nx
 import osmnx as ox
 import os
 import shapely
 from shapely.geometry import Point
 from shapely.ops import transform
+import pyproj
 from pyproj import Transformer
 from joblib import Parallel, delayed
 
@@ -484,6 +486,17 @@ def analyze_network_slopes(
 
     # 10) Visualization
     if settings['vis_graph']:
+        # Create a Polygon from the rectangle vertices
+        rectangle_polygon = Polygon(rectangle_vertices)
+
+        # Convert the rectangle polygon to the same CRS as edge_gdf_web
+        rectangle_gdf = gpd.GeoDataFrame(index=[0], crs='epsg:4326', geometry=[rectangle_polygon])
+        rectangle_gdf_web = rectangle_gdf.to_crs(epsg=3857)
+
+        # Get the bounding box of the rectangle
+        minx, miny, maxx, maxy = rectangle_gdf_web.total_bounds
+
+        # Plot the edges
         edge_gdf_web = edge_gdf.to_crs(epsg=3857)
         fig, ax = plt.subplots(figsize=settings['fig_size'])
         edge_gdf_web.plot(
@@ -497,9 +510,38 @@ def analyze_network_slopes(
             alpha=settings['alpha'],
             legend_kwds={'label': f"{value_name} (%)"}
         )
+
+        # Add basemap
         ctx.add_basemap(ax, source=settings['basemap_style'], zoom=settings['zoom'])
+
+        # Set the plot limits to the bounding box of the rectangle
+        ax.set_xlim(minx, maxx)
+        ax.set_ylim(miny, maxy)
+
+        # Turn off the axis
         ax.set_axis_off()
+
+        # Add title
         plt.title(f'Network {value_name} Analysis', pad=20)
+
+        # Show the plot
         plt.show()
+        # edge_gdf_web = edge_gdf.to_crs(epsg=3857)
+        # fig, ax = plt.subplots(figsize=settings['fig_size'])
+        # edge_gdf_web.plot(
+        #     column=value_name, 
+        #     ax=ax, 
+        #     cmap=settings['colormap'], 
+        #     legend=True, 
+        #     vmin=settings['vmin'], 
+        #     vmax=settings['vmax'],
+        #     linewidth=settings['edge_width'],
+        #     alpha=settings['alpha'],
+        #     legend_kwds={'label': f"{value_name} (%)"}
+        # )
+        # ctx.add_basemap(ax, source=settings['basemap_style'], zoom=settings['zoom'])
+        # ax.set_axis_off()
+        # plt.title(f'Network {value_name} Analysis', pad=20)
+        # plt.show()
 
     return G, edge_gdf

voxcity/sim/solar.py

@@ -573,7 +573,7 @@ def get_cumulative_global_solar_irradiance(
             vmax = kwargs.get("vmax", max(direct_normal_irradiance_scaling, diffuse_irradiance_scaling) * 1000)
             cmap = plt.cm.get_cmap(colormap).copy()
             cmap.set_bad(color='lightgray')
-            plt.figure(figsize=(8, 6))
+            plt.figure(figsize=(10, 8))
             # plt.title(f"Global Solar Irradiance at {time_local.strftime('%Y-%m-%d %H:%M:%S')}")
             plt.imshow(global_map, origin='lower', cmap=cmap, vmin=vmin, vmax=vmax)
             plt.axis('off')
@@ -591,7 +591,7 @@ def get_cumulative_global_solar_irradiance(
         vmax = kwargs.get("vmax", np.nanmax(cumulative_map))
         cmap = plt.cm.get_cmap(colormap).copy()
         cmap.set_bad(color='lightgray')
-        plt.figure(figsize=(8, 6))
+        plt.figure(figsize=(10, 8))
         # plt.title("Cumulative Global Solar Irradiance Map")
         plt.imshow(cumulative_map, origin='lower', cmap=cmap, vmin=vmin, vmax=vmax)
         plt.colorbar(label='Cumulative Global Solar Irradiance (W/m²·hour)')

{voxcity-0.3.10.dist-info → voxcity-0.3.12.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 voxcity/__init__.py,sha256=HJM0D2Mv9qpk4JdVzt2SRAAk-hA1D_pCO0ezZH9F7KA,248
 voxcity/voxcity.py,sha256=tZOgRnyvw4ZHuuJr_QP3qeen5DxhYOkDglNDtpB0hzY,33664
 voxcity/download/__init__.py,sha256=OgGcGxOXF4tjcEL6DhOnt13DYPTvOigUelp5xIpTqM0,171
-voxcity/download/eubucco.py,sha256=e1JXBuUfBptSDvNznSGckRs5Xgrj_SAFxk445J_o4KY,14854
+voxcity/download/eubucco.py,sha256=u2MoAIm_ylMDr1DPqqktcC_KS0iny2IJbFzUlUSvR8o,14993
 voxcity/download/gee.py,sha256=j7jmzp44T3M6j_4DwhU9Y8Y6gqbZo1zFIlduQPc0jvk,14339
 voxcity/download/mbfp.py,sha256=aQOGKP0pV6J6MCBXG9J6kQX04_S31rMjJEVvgrgOPg4,3942
 voxcity/download/oemj.py,sha256=YlCuWBQfi40gfmwQcGDeHiPOs4Pk_jLZq65d5R3IGMU,7886
@@ -11,16 +11,16 @@ voxcity/download/overture.py,sha256=daOvsySC2KIcTcMJUSA7XdbMELJuyLAIM2vr1DRLGp0,
 voxcity/download/utils.py,sha256=z6MdPxM96FWQVqvZW2Eg5pMewVHVysUP7F6ueeCwMfI,1375
 voxcity/file/__init_.py,sha256=cVyNyE6axEpSd3CT5hGuMOAlOyU1p8lVP4jkF1-0Ad8,94
 voxcity/file/envimet.py,sha256=SPVoSyYTMNyDRDFWsI0YAsIsb6yt_SXZeDUlhyqlEqY,24282
-voxcity/file/geojson.py,sha256=h6WYr1bdvzC46w6CbjKzO4wMtVrKTSF7SGaOUuUMkCM,33412
+voxcity/file/geojson.py,sha256=dZTRkz4LQspWdNyfJZuwsymSeKqhx0v-bF-L9_1iudg,33571
 voxcity/file/magicavoxel.py,sha256=Fsv7yGRXeKmp82xcG3rOb0t_HtoqltNq2tHl08xVlqY,7500
 voxcity/file/obj.py,sha256=oW-kPoZj53nfmO9tXP3Wvizq6Kkjh-QQR8UBexRuMiI,21609
 voxcity/geo/__init_.py,sha256=AZYQxK1zY1M_mDT1HmgcdVI86OAtwK7CNo3AOScLHco,88
 voxcity/geo/draw.py,sha256=roljWXyqYdsWYkmb-5_WNxrJrfV5lnAt8uZblCCo_3Q,13555
 voxcity/geo/grid.py,sha256=_MzO-Cu2GhlP9nuCql6f1pfbU2_OAL27aQ_zCj1u_zk,36288
-voxcity/geo/network.py,sha256=P1oaosieFPuWj9QbU9VmZHpoXV3HR61VssZMcUZLYIw,17403
+voxcity/geo/network.py,sha256=egAHsqVYNcDIPPHv0RnVBQCLpfsdsWXf0ltrkZi2V7A,18905
 voxcity/geo/utils.py,sha256=1BRHp-DDeOA8HG8jplY7Eo75G3oXkVGL6DGONL4BA8A,19815
 voxcity/sim/__init_.py,sha256=APdkcdaovj0v_RPOaA4SBvFUKT2RM7Hxuuz3Sux4gCo,65
-voxcity/sim/solar.py,sha256=wpnDC3BAm4edx5Z-dz2g_5rqnFNi_YKXneHY2RVBk1w,31968
+voxcity/sim/solar.py,sha256=ddzEjN9s9zEABMPu1S0k-NXlNtIYDl12EAwiaaASJs0,31970
 voxcity/sim/utils.py,sha256=sEYBB2-hLJxTiXQps1_-Fi7t1HN3-1OPOvBCWtgIisA,130
 voxcity/sim/view.py,sha256=FoXovh406hmvL1obaIXi2MyiRnPdXHY9SWxqfqmcJnc,36758
 voxcity/utils/__init_.py,sha256=nLYrj2huBbDBNMqfchCwexGP8Tlt9O_XluVDG7MoFkw,98
@@ -28,9 +28,9 @@ voxcity/utils/lc.py,sha256=RwPd-VY3POV3gTrBhM7TubgGb9MCd3nVah_G8iUEF7k,11562
 voxcity/utils/material.py,sha256=Vt3IID5Ft54HNJcEC4zi31BCPqi_687X3CSp7rXaRVY,5907
 voxcity/utils/visualization.py,sha256=FNBMN0V5IPuAdqvLHnqSGYqNS7jWesg0ZADEtsUtl0A,31925
 voxcity/utils/weather.py,sha256=P6s1y_EstBL1OGP_MR_6u3vr-t6Uawg8uDckJnoI7FI,21482
-voxcity-0.3.10.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.3.10.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
-voxcity-0.3.10.dist-info/METADATA,sha256=Lf4DIH1_hPKyQkxAset4cMlL5dJWwHosXpBgj6Ybta8,25122
-voxcity-0.3.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-voxcity-0.3.10.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.3.10.dist-info/RECORD,,
+voxcity-0.3.12.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.3.12.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
+voxcity-0.3.12.dist-info/METADATA,sha256=ASX53F7pGZnhPvOD8PSO5Sg_6TMbsdo5r9YDaNy6wV4,25122
+voxcity-0.3.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+voxcity-0.3.12.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.3.12.dist-info/RECORD,,