voxcity 0.3.11__tar.gz → 0.3.13__tar.gz

{voxcity-0.3.11 → voxcity-0.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.11
+Version: 0.3.13
 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>
@@ -458,7 +458,7 @@ G, edge_gdf = get_network_values(
 | Dataset | Spatial Coverage | Source/Data Acquisition |
 |---------|------------------|------------------------|
 | [OpenStreetMap](https://www.openstreetmap.org) | Worldwide (24% completeness in city centers) | Volunteered / updated continuously |
-| [Global ML Building Footprints](https://github.com/microsoft/GlobalMLBuildingFootprints) | North America, Europe, Australia | Prediction from satellite or aerial imagery / 2018-2019 for majority of the input imagery |
+| [Microsoft Building Footprints](https://github.com/microsoft/GlobalMLBuildingFootprints) | North America, Europe, Australia | Prediction from satellite or aerial imagery / 2018-2019 for majority of the input imagery |
 | [Open Buildings 2.5D Temporal Dataset](https://sites.research.google/gr/open-buildings/temporal/) | Africa, Latin America, and South and Southeast Asia | Prediction from satellite imagery / 2016-2023 |
 | [EUBUCCO v0.1](https://eubucco.com/) | 27 EU countries and Switzerland (378 regions and 40,829 cities) | OpenStreetMap, government datasets / 2003-2021 (majority is after 2019) |
 | [UT-GLOBUS](https://zenodo.org/records/11156602) | Worldwide (more than 1200 cities or locales) | Prediction from building footprints, population, spaceborne nDSM / not provided |

{voxcity-0.3.11 → voxcity-0.3.13}/README.md

@@ -400,7 +400,7 @@ G, edge_gdf = get_network_values(
 | Dataset | Spatial Coverage | Source/Data Acquisition |
 |---------|------------------|------------------------|
 | [OpenStreetMap](https://www.openstreetmap.org) | Worldwide (24% completeness in city centers) | Volunteered / updated continuously |
-| [Global ML Building Footprints](https://github.com/microsoft/GlobalMLBuildingFootprints) | North America, Europe, Australia | Prediction from satellite or aerial imagery / 2018-2019 for majority of the input imagery |
+| [Microsoft Building Footprints](https://github.com/microsoft/GlobalMLBuildingFootprints) | North America, Europe, Australia | Prediction from satellite or aerial imagery / 2018-2019 for majority of the input imagery |
 | [Open Buildings 2.5D Temporal Dataset](https://sites.research.google/gr/open-buildings/temporal/) | Africa, Latin America, and South and Southeast Asia | Prediction from satellite imagery / 2016-2023 |
 | [EUBUCCO v0.1](https://eubucco.com/) | 27 EU countries and Switzerland (378 regions and 40,829 cities) | OpenStreetMap, government datasets / 2003-2021 (majority is after 2019) |
 | [UT-GLOBUS](https://zenodo.org/records/11156602) | Worldwide (more than 1200 cities or locales) | Prediction from building footprints, population, spaceborne nDSM / not provided |

{voxcity-0.3.11 → voxcity-0.3.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "voxcity"
-version = "0.3.11"
+version = "0.3.13"
 requires-python = ">=3.10,<3.13"
 classifiers = [
     "Programming Language :: Python :: 3.10",
@@ -69,7 +69,7 @@ homepage = "https://github.com/kunifujiwara/voxcity"
 
 [tool.setuptools]
 package-dir = {"" = "src"}
-packages = ["voxcity", "voxcity.download", "voxcity.geo", "voxcity.file", "voxcity.sim", "voxcity.utils"]
+packages = ["voxcity", "voxcity.downloader", "voxcity.geoprocessor", "voxcity.exporter", "voxcity.simulator", "voxcity.utils"]
 
 [tool.setuptools.package-data]
 "*" = ["*.*"]

{voxcity-0.3.11 → voxcity-0.3.13}/src/voxcity/__init__.py

@@ -2,7 +2,7 @@ __author__ = """Kunihiko Fujiwara"""
 __email__ = 'kunihiko@nus.edu.sg'
 __version__ = '0.1.0'
 
-from .voxcity import *
+# from .generator import *
 # from .download import mbfp
 # # from .utils.draw import rotate_rectangle, draw_rectangle_map
 # from .geo import draw, utils

{voxcity-0.3.11/src/voxcity/download → voxcity-0.3.13/src/voxcity/downloader}/eubucco.py

@@ -18,7 +18,7 @@ from fiona.transform import transform_geom
 import logging
 import shapely
 
-from ..geo.utils import get_country_name
+from ..geoprocessor.utils import get_country_name
 
 # Dictionary mapping European countries to their EUBUCCO data download URLs
 country_links = {
@@ -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.11/src/voxcity/download → voxcity-0.3.13/src/voxcity/downloader}/mbfp.py

@@ -9,8 +9,8 @@ AI. It handles downloading quadkey-based data files and converting them to GeoJS
 import pandas as pd
 import os
 from .utils import download_file
-from ..geo.utils import tile_from_lat_lon, quadkey_to_tile
-from ..file.geojson import load_geojsons_from_multiple_gz, swap_coordinates
+from ..geoprocessor.utils import tile_from_lat_lon, quadkey_to_tile
+from ..geoprocessor.polygon import load_geojsons_from_multiple_gz, swap_coordinates
 
 def get_geojson_links(output_dir):
     """Download and load the dataset links CSV file containing building footprint URLs.

{voxcity-0.3.11/src/voxcity/file → voxcity-0.3.13/src/voxcity/exporter}/envimet.py

@@ -2,8 +2,8 @@ import os
 import numpy as np
 import datetime
 
-from ..geo.grid import apply_operation, translate_array, group_and_label_cells, process_grid
-from ..geo.utils import get_city_country_name_from_rectangle, get_timezone_info
+from ..geoprocessor.grid import apply_operation, translate_array, group_and_label_cells, process_grid
+from ..geoprocessor.utils import get_city_country_name_from_rectangle, get_timezone_info
 from ..utils.lc import convert_land_cover
 
 def array_to_string(arr):

voxcity-0.3.11/src/voxcity/voxcity.py → voxcity-0.3.13/src/voxcity/generator.py

@@ -18,13 +18,13 @@ import numpy as np
 import os
 
 # Local application/library specific imports
-from .download.mbfp import get_mbfp_geojson
-from .download.osm import load_geojsons_from_openstreetmap, load_land_cover_geojson_from_osm
-from .download.oemj import save_oemj_as_geotiff
-from .download.omt import load_geojsons_from_openmaptiles
-from .download.eubucco import load_geojson_from_eubucco
-from .download.overture import load_geojsons_from_overture
-from .download.gee import (
+from .downloader.mbfp import get_mbfp_geojson
+from .downloader.osm import load_geojsons_from_openstreetmap, load_land_cover_geojson_from_osm
+from .downloader.oemj import save_oemj_as_geotiff
+from .downloader.omt import load_geojsons_from_openmaptiles
+from .downloader.eubucco import load_geojson_from_eubucco
+from .downloader.overture import load_geojsons_from_overture
+from .downloader.gee import (
     initialize_earth_engine,
     get_roi,
     get_ee_image_collection,
@@ -36,7 +36,7 @@ from .download.gee import (
     save_geotiff_dynamic_world_v1,
     save_geotiff_open_buildings_temporal
 )
-from .geo.grid import (
+from .geoprocessor.grid import (
     group_and_label_cells, 
     process_grid,
     create_land_cover_grid_from_geotiff_polygon,
@@ -47,7 +47,7 @@ from .geo.grid import (
     create_building_height_grid_from_open_building_temporal_polygon
 )
 from .utils.lc import convert_land_cover, convert_land_cover_array
-from .file.geojson import get_geojson_from_gpkg, save_geojson
+from .geoprocessor.polygon import get_geojson_from_gpkg, save_geojson
 from .utils.visualization import (
     get_land_cover_classes,
     visualize_land_cover_grid,

{voxcity-0.3.11/src/voxcity/geo → voxcity-0.3.13/src/voxcity/geoprocessor}/__init_.py

@@ -2,3 +2,4 @@ from .draw import *
 from .grid import *
 from .utils import *
 from .network import *
+from .polygon import *

{voxcity-0.3.11/src/voxcity/geo → voxcity-0.3.13/src/voxcity/geoprocessor}/draw.py

@@ -7,9 +7,10 @@ from pyproj import Proj, transform
 from ipyleaflet import Map, DrawControl, Rectangle, Polygon as LeafletPolygon
 import ipyleaflet
 from geopy import distance
-from .utils import get_coordinates_from_cityname
 import shapely.geometry as geom
 
+from .utils import get_coordinates_from_cityname
+
 def rotate_rectangle(m, rectangle_vertices, angle):
     """
     Project rectangle to Mercator, rotate, and re-project to lat-lon.

{voxcity-0.3.11/src/voxcity/geo → voxcity-0.3.13/src/voxcity/geoprocessor}/grid.py

@@ -21,7 +21,7 @@ from .utils import (
     create_building_polygons,
     convert_format_lat_lon
 )
-from ..file.geojson import (
+from ..geoprocessor.polygon import (
     filter_buildings, 
     extract_building_heights_from_geotiff, 
     extract_building_heights_from_geojson,
@@ -32,7 +32,7 @@ from ..utils.lc import (
     create_land_cover_polygons, 
     get_dominant_class,
 )
-from ..download.gee import (
+from ..downloader.gee import (
     get_roi,
     save_geotiff_open_buildings_temporal
 )

{voxcity-0.3.11/src/voxcity/geo → voxcity-0.3.13/src/voxcity/geoprocessor}/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
 
@@ -163,11 +165,6 @@ def get_network_values(
 
     return G, edge_gdf
 
-# -------------------------------------------------------------------
-# Optionally import your DEM helper
-# -------------------------------------------------------------------
-from voxcity.geo.grid import grid_to_geodataframe
-
 # -------------------------------------------------------------------
 # 1) Functions for interpolation, parallelization, and slope
 # -------------------------------------------------------------------
@@ -484,6 +481,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 +505,43 @@ def analyze_network_slopes(
             alpha=settings['alpha'],
             legend_kwds={'label': f"{value_name} (%)"}
         )
-        ctx.add_basemap(ax, source=settings['basemap_style'], zoom=settings['zoom'])
+
+        # Add basemap with the same extent as the rectangle
+        ctx.add_basemap(
+            ax,
+            source=settings['basemap_style'],
+            zoom=settings['zoom'],
+            bounds=(minx, miny, maxx, maxy)  # Explicitly set the bounds of the basemap
+        )
+
+        # 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.11/src/voxcity/file/geojson.py → voxcity-0.3.13/src/voxcity/geoprocessor/polygon.py

@@ -20,7 +20,7 @@ import rasterio
 from rasterio.mask import mask
 import copy
 
-from ..geo.utils import validate_polygon_coordinates
+from .utils import validate_polygon_coordinates
 
 def filter_and_convert_gdf_to_geojson(gdf, rectangle_vertices):
     """
@@ -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.11/src/voxcity/sim → voxcity-0.3.13/src/voxcity/simulator}/solar.py

@@ -9,7 +9,7 @@ from astral.sun import elevation, azimuth
 
 from .view import trace_ray_generic, compute_vi_map_generic, get_sky_view_factor_map
 from ..utils.weather import get_nearest_epw_from_climate_onebuilding, read_epw_for_solar_simulation
-from ..file.obj import grid_to_obj, export_obj
+from ..exporter.obj import grid_to_obj, export_obj
 
 @njit(parallel=True)
 def compute_direct_solar_irradiance_map_binary(voxel_data, sun_direction, view_point_height, hit_values, meshsize, tree_k, tree_lad, inclusion_mode):

{voxcity-0.3.11/src/voxcity/sim → voxcity-0.3.13/src/voxcity/simulator}/view.py

@@ -46,8 +46,8 @@ import matplotlib.pyplot as plt
 import matplotlib.patches as mpatches
 from numba import njit, prange
 
-from ..file.geojson import find_building_containing_point, get_buildings_in_drawn_polygon
-from ..file.obj import grid_to_obj, export_obj
+from ..geoprocessor.polygon import find_building_containing_point, get_buildings_in_drawn_polygon
+from ..exporter.obj import grid_to_obj, export_obj
 
 @njit
 def calculate_transmittance(length, tree_k=0.6, tree_lad=1.0):

{voxcity-0.3.11 → voxcity-0.3.13}/src/voxcity/utils/visualization.py

@@ -19,14 +19,14 @@ import math
 
 from .lc import get_land_cover_classes
 # from ..geo.geojson import filter_buildings
-from ..geo.grid import (
+from ..geoprocessor.grid import (
     calculate_grid_size,
     create_coordinate_mesh,
     create_cell_polygon,
     grid_to_geodataframe
 )
 
-from ..geo.utils import (
+from ..geoprocessor.utils import (
     initialize_geod,
     calculate_distance,
     normalize_to_one_meter,

{voxcity-0.3.11 → voxcity-0.3.13}/src/voxcity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.11
+Version: 0.3.13
 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>
@@ -458,7 +458,7 @@ G, edge_gdf = get_network_values(
 | Dataset | Spatial Coverage | Source/Data Acquisition |
 |---------|------------------|------------------------|
 | [OpenStreetMap](https://www.openstreetmap.org) | Worldwide (24% completeness in city centers) | Volunteered / updated continuously |
-| [Global ML Building Footprints](https://github.com/microsoft/GlobalMLBuildingFootprints) | North America, Europe, Australia | Prediction from satellite or aerial imagery / 2018-2019 for majority of the input imagery |
+| [Microsoft Building Footprints](https://github.com/microsoft/GlobalMLBuildingFootprints) | North America, Europe, Australia | Prediction from satellite or aerial imagery / 2018-2019 for majority of the input imagery |
 | [Open Buildings 2.5D Temporal Dataset](https://sites.research.google/gr/open-buildings/temporal/) | Africa, Latin America, and South and Southeast Asia | Prediction from satellite imagery / 2016-2023 |
 | [EUBUCCO v0.1](https://eubucco.com/) | 27 EU countries and Switzerland (378 regions and 40,829 cities) | OpenStreetMap, government datasets / 2003-2021 (majority is after 2019) |
 | [UT-GLOBUS](https://zenodo.org/records/11156602) | Worldwide (more than 1200 cities or locales) | Prediction from building footprints, population, spaceborne nDSM / not provided |

voxcity-0.3.13/src/voxcity.egg-info/SOURCES.txt

@@ -0,0 +1,50 @@
+AUTHORS.rst
+CONTRIBUTING.rst
+HISTORY.rst
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+docs/Makefile
+docs/authors.rst
+docs/conf.py
+docs/index.rst
+docs/make.bat
+docs/archive/README.rst
+src/voxcity/__init__.py
+src/voxcity/generator.py
+src/voxcity.egg-info/PKG-INFO
+src/voxcity.egg-info/SOURCES.txt
+src/voxcity.egg-info/dependency_links.txt
+src/voxcity.egg-info/requires.txt
+src/voxcity.egg-info/top_level.txt
+src/voxcity/downloader/__init__.py
+src/voxcity/downloader/eubucco.py
+src/voxcity/downloader/gee.py
+src/voxcity/downloader/mbfp.py
+src/voxcity/downloader/oemj.py
+src/voxcity/downloader/omt.py
+src/voxcity/downloader/osm.py
+src/voxcity/downloader/overture.py
+src/voxcity/downloader/utils.py
+src/voxcity/exporter/__init_.py
+src/voxcity/exporter/envimet.py
+src/voxcity/exporter/magicavoxel.py
+src/voxcity/exporter/obj.py
+src/voxcity/geoprocessor/__init_.py
+src/voxcity/geoprocessor/draw.py
+src/voxcity/geoprocessor/grid.py
+src/voxcity/geoprocessor/network.py
+src/voxcity/geoprocessor/polygon.py
+src/voxcity/geoprocessor/utils.py
+src/voxcity/simulator/__init_.py
+src/voxcity/simulator/solar.py
+src/voxcity/simulator/utils.py
+src/voxcity/simulator/view.py
+src/voxcity/utils/__init_.py
+src/voxcity/utils/lc.py
+src/voxcity/utils/material.py
+src/voxcity/utils/visualization.py
+src/voxcity/utils/weather.py
+tests/__init__.py
+tests/voxelcity.py

voxcity-0.3.11/src/voxcity.egg-info/SOURCES.txt

@@ -1,50 +0,0 @@
-AUTHORS.rst
-CONTRIBUTING.rst
-HISTORY.rst
-LICENSE
-MANIFEST.in
-README.md
-pyproject.toml
-docs/Makefile
-docs/authors.rst
-docs/conf.py
-docs/index.rst
-docs/make.bat
-docs/archive/README.rst
-src/voxcity/__init__.py
-src/voxcity/voxcity.py
-src/voxcity.egg-info/PKG-INFO
-src/voxcity.egg-info/SOURCES.txt
-src/voxcity.egg-info/dependency_links.txt
-src/voxcity.egg-info/requires.txt
-src/voxcity.egg-info/top_level.txt
-src/voxcity/download/__init__.py
-src/voxcity/download/eubucco.py
-src/voxcity/download/gee.py
-src/voxcity/download/mbfp.py
-src/voxcity/download/oemj.py
-src/voxcity/download/omt.py
-src/voxcity/download/osm.py
-src/voxcity/download/overture.py
-src/voxcity/download/utils.py
-src/voxcity/file/__init_.py
-src/voxcity/file/envimet.py
-src/voxcity/file/geojson.py
-src/voxcity/file/magicavoxel.py
-src/voxcity/file/obj.py
-src/voxcity/geo/__init_.py
-src/voxcity/geo/draw.py
-src/voxcity/geo/grid.py
-src/voxcity/geo/network.py
-src/voxcity/geo/utils.py
-src/voxcity/sim/__init_.py
-src/voxcity/sim/solar.py
-src/voxcity/sim/utils.py
-src/voxcity/sim/view.py
-src/voxcity/utils/__init_.py
-src/voxcity/utils/lc.py
-src/voxcity/utils/material.py
-src/voxcity/utils/visualization.py
-src/voxcity/utils/weather.py
-tests/__init__.py
-tests/voxelcity.py