voxcity 0.6.5__tar.gz → 0.6.6__tar.gz

{voxcity-0.6.5 → voxcity-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: voxcity
-Version: 0.6.5
+Version: 0.6.6
 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
 Author: Kunihiko Fujiwara

{voxcity-0.6.5 → voxcity-0.6.6}/pyproject.toml

@@ -1,96 +1,123 @@
-[tool.poetry]
-name = "voxcity"
-version = "0.6.5"
-description = "voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data"
-readme = "README.md"
-license = "MIT"
-authors = ["Kunihiko Fujiwara <fujiwara.kunihiko@takenaka.co.jp>"]
-maintainers = ["Kunihiko Fujiwara <fujiwara.kunihiko@takenaka.co.jp>"]
-requires-python = ">=3.10,<3.13"
-classifiers = [
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-]
-packages = [
-    {include = "voxcity", from = "src"}
-]
-
-[tool.poetry.dependencies]
-python = ">=3.10,<3.13"
-typer = "*"
-pandas = "*"
-requests = "*"
-pyproj = "*"
-ipyleaflet = "*"
-geopandas = "*"
-rasterio = "1.3.11"
-shapely = "*"
-gdown = "*"
-numpy = "*"
-matplotlib = "*"
-contextily = "*"
-fiona = "*"
-rtree = "*"
-plotly = "*"
-tqdm = "*"
-scipy = "*"
-affine = "*"
-earthengine-api = "*"
-geemap = "*"
-rio-cogeo = "*"
-geopy = "*"
-py-vox-io = "*"
-numba = "*"
-reverse_geocoder = "*"
-pycountry = "*"
-seaborn = "*"
-overturemaps = "*"
-protobuf = "*"
-timezonefinder = "*"
-astral = "*"
-osmnx = "*"
-joblib = "*"
-trimesh = "*"
-pyvista = "*"
-IPython = "*"
-lxml = "*"
-scikit-learn = "*"
-
-[tool.poetry.group.dev.dependencies]
-coverage = "*"
-mypy = "*"
-pytest = "*"
-ruff = "*"
-
-[tool.poetry.urls]
-bugs = "https://github.com/kunifujiwara/voxcity/issues"
-changelog = "https://github.com/kunifujiwara/voxcity/blob/master/changelog.md"
-homepage = "https://github.com/kunifujiwara/voxcity"
-
-[tool.setuptools]
-package-dir = {"" = "src"}
-
-[tool.mypy]
-files = "."
-strict = true
-warn_unreachable = true
-warn_no_return = true
-
-[[tool.mypy.overrides]]
-module = "tests.*"
-allow_untyped_defs = true
-disable_error_code = "attr-defined"
-
-[tool.pytest.ini_options]
-markers = [
-    "slow: marks tests as slow (deselect with '-m \"not slow\"')",
-    "integration: marks tests as integration tests",
-    "gee: marks tests that require Google Earth Engine authentication",
-]
-addopts = "-v --tb=short"
-testpaths = ["tests"]
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
+[tool.poetry]
+name = "voxcity"
+version = "0.6.6"
+description = "voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data"
+readme = "README.md"
+license = "MIT"
+authors = ["Kunihiko Fujiwara <fujiwara.kunihiko@takenaka.co.jp>"]
+maintainers = ["Kunihiko Fujiwara <fujiwara.kunihiko@takenaka.co.jp>"]
+requires-python = ">=3.10,<3.13"
+classifiers = [
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+packages = [
+    {include = "voxcity", from = "src"}
+]
+
+[tool.poetry.dependencies]
+python = ">=3.10,<3.13"
+typer = "*"
+pandas = "*"
+requests = "*"
+pyproj = "*"
+ipyleaflet = "*"
+geopandas = "*"
+rasterio = "1.3.11"
+shapely = "*"
+gdown = "*"
+numpy = "*"
+matplotlib = "*"
+contextily = "*"
+fiona = "*"
+rtree = "*"
+plotly = "*"
+tqdm = "*"
+scipy = "*"
+affine = "*"
+earthengine-api = "*"
+geemap = "*"
+rio-cogeo = "*"
+geopy = "*"
+py-vox-io = "*"
+numba = "*"
+reverse_geocoder = "*"
+pycountry = "*"
+seaborn = "*"
+overturemaps = "*"
+protobuf = "*"
+timezonefinder = "*"
+astral = "*"
+osmnx = "*"
+joblib = "*"
+trimesh = "*"
+pyvista = "*"
+IPython = "*"
+lxml = "*"
+scikit-learn = "*"
+
+[tool.poetry.group.dev.dependencies]
+coverage = "*"
+mypy = "*"
+pytest = "*"
+ruff = "*"
+
+[tool.poetry.urls]
+bugs = "https://github.com/kunifujiwara/voxcity/issues"
+changelog = "https://github.com/kunifujiwara/voxcity/blob/master/changelog.md"
+homepage = "https://github.com/kunifujiwara/voxcity"
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+
+[tool.mypy]
+files = "."
+strict = true
+warn_unreachable = true
+warn_no_return = true
+
+[[tool.mypy.overrides]]
+module = "tests.*"
+allow_untyped_defs = true
+disable_error_code = "attr-defined"
+
+[tool.pytest.ini_options]
+markers = [
+    "slow: marks tests as slow (deselect with '-m \"not slow\"')",
+    "integration: marks tests as integration tests",
+    "gee: marks tests that require Google Earth Engine authentication",
+]
+addopts = "-v --tb=short"
+testpaths = ["tests"]
+
+[tool.coverage.run]
+branch = true
+source = ["src/voxcity"]
+omit = [
+  # Visualization and I/O heavy modules (non-deterministic / GUI)
+  "src/voxcity/utils/visualization.py",
+  # External data/network heavy downloaders
+  "src/voxcity/downloader/gee.py",
+  "src/voxcity/downloader/mbfp.py",
+  "src/voxcity/downloader/oemj.py",
+  "src/voxcity/downloader/overture.py",
+  "src/voxcity/downloader/citygml.py",
+  # Pure exporters (file writers) not critical for algorithmic coverage
+  "src/voxcity/exporter/*",
+]
+
+[tool.coverage.report]
+show_missing = true
+skip_covered = false
+exclude_lines = [
+  "pragma: no cover",
+  "def __repr__",
+  "if __name__ == .__main__.:",
+  "raise NotImplementedError",
+  "pass",
+]
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

{voxcity-0.6.5 → voxcity-0.6.6}/src/voxcity/exporter/cityles.py

@@ -190,7 +190,7 @@ def _build_index_to_cityles_map(land_cover_source):
 
 
 def export_topog(building_height_grid, building_id_grid, output_path, 
-                 building_material='default'):
+                 building_material='default', cityles_landuse_grid=None):
     """
     Export topog.txt file for CityLES
     
@@ -226,8 +226,17 @@ def export_topog(building_height_grid, building_id_grid, output_path,
                 i_1based = i + 1
                 j_1based = j + 1
                 height = float(building_height_grid[j, i])
+                # Decide material code per cell
+                if cityles_landuse_grid is not None:
+                    cell_lu = int(cityles_landuse_grid[j, i])
+                    material_code_cell = cell_lu + 100
+                else:
+                    if height > 0:
+                        material_code_cell = material_code
+                    else:
+                        material_code_cell = 102
                 # Format: i j height material_code depth1 depth2 changed_material
-                f.write(f"{i_1based} {j_1based} {height:.1f} {material_code} 0.0 0.0 102\n")
+                f.write(f"{i_1based} {j_1based} {height:.1f} {material_code_cell} 0.0 0.0 102\n")
 
 
 def export_landuse(land_cover_grid, output_path, land_cover_source=None):
@@ -254,6 +263,8 @@ def export_landuse(land_cover_grid, output_path, land_cover_source=None):
 
     # Create mapping statistics
     mapping_stats = {}
+    # Prepare grid to return
+    cityles_landuse_grid = np.zeros((ny, nx), dtype=int)
 
     with open(filename, 'w') as f:
         # Write in row-major order (j varies first, then i)
@@ -263,6 +274,8 @@ def export_landuse(land_cover_grid, output_path, land_cover_source=None):
                 cityles_code = index_to_code.get(idx, 4)
                 f.write(f"{cityles_code}\n")
 
+                cityles_landuse_grid[j, i] = cityles_code
+
                 # Track mapping statistics
                 if idx not in mapping_stats:
                     mapping_stats[idx] = {'cityles_code': cityles_code, 'count': 0}
@@ -277,6 +290,8 @@ def export_landuse(land_cover_grid, output_path, land_cover_source=None):
         class_name = class_names[idx] if 0 <= idx < len(class_names) else 'Unknown'
         print(f"  {idx}: {class_name} -> CityLES {stats['cityles_code']}: "
               f"{stats['count']} cells ({percentage:.1f}%)")
+    
+    return cityles_landuse_grid
 
 
 def export_dem(dem_grid, output_path):
@@ -434,11 +449,17 @@ def export_cityles(building_height_grid, building_id_grid, canopy_height_grid,
     print(f"Land cover source: {land_cover_source}")
     
     # Export individual files
-    print("\nExporting topog.txt...")
-    export_topog(building_height_grid, building_id_grid, output_path, building_material)
-    
     print("\nExporting landuse.txt...")
-    export_landuse(land_cover_grid, output_path, land_cover_source)
+    cityles_landuse_grid = export_landuse(land_cover_grid, output_path, land_cover_source)
+
+    print("\nExporting topog.txt...")
+    export_topog(
+        building_height_grid,
+        building_id_grid,
+        output_path,
+        building_material,
+        cityles_landuse_grid=cityles_landuse_grid,
+    )
     
     print("\nExporting dem.txt...")
     export_dem(dem_grid, output_path)