voxcity 0.3.10__tar.gz → 0.3.12__tar.gz

{voxcity-0.3.10 → voxcity-0.3.12}/PKG-INFO

@@ -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 → voxcity-0.3.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "voxcity"
-version = "0.3.10"
+version = "0.3.12"
 requires-python = ">=3.10,<3.13"
 classifiers = [
     "Programming Language :: Python :: 3.10",

{voxcity-0.3.10 → voxcity-0.3.12}/src/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-0.3.10 → voxcity-0.3.12}/src/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-0.3.10 → voxcity-0.3.12}/src/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-0.3.10 → voxcity-0.3.12}/src/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 → voxcity-0.3.12}/src/voxcity.egg-info/PKG-INFO

@@ -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>