Merge pull request #3607 from architecture-building-systems/terrian-helper-fetch

Fetch terrain data from external source

Author: reyery

.github/workflows/main.yml

@@ -28,4 +28,6 @@ jobs:
 
       - name: Run tests
         shell: bash -l {0}
-        run: cea test --workflow slow
+        run: |
+          cea test --type unittest
+          cea test --type integration

.github/workflows/pull.request.yml

@@ -66,4 +66,6 @@ jobs:
 
       - name: Run tests
         shell: bash -l {0}
-        run: cea test --workflow quick
+        run: |
+          cea test --type unittest
+          cea test --type integration

.github/workflows/setup_build.yml

@@ -114,9 +114,13 @@ jobs:
           path: gui
           repository: architecture-building-systems/CityEnergyAnalyst-GUI
 
-      - uses: mamba-org/setup-micromamba@v1
-        with:
-          micromamba-binary-path: gui/dependencies/micromamba
+      - name: Fetch micromamba
+        run: |
+          cd gui
+          mkdir -p ./dependencies/arm64
+          curl -Ls https://micro.mamba.pm/api/micromamba/osx-arm64/latest | tar -xvj -C ./dependencies/arm64 --strip-components=1 bin/micromamba
+          mkdir -p ./dependencies/x64
+          curl -Ls https://micro.mamba.pm/api/micromamba/osx-64/latest | tar -xvj -C ./dependencies/x64 --strip-components=1 bin/micromamba 
 
       - name: Save Apple API Key secret to file
         env:

CHANGELOG.md

@@ -1,3 +1,5 @@
+- 2024-05-27 - 3.36.0 - #3586 Add nullable info for column schema
+- 2024-05-21 - 3.36.0 - #3584 Release 3.36.0
 - 2024-05-16 - 3.35.6 - #3583 Use MKL for Windows to solve memory errors
 - 2024-05-15 - 3.35.6 - #3574 Add trees as shading for radiation script
 - 2024-05-14 - 3.35.6 - #3576 Consider adjacent walls by default

CREDITS.md

@@ -1,7 +1,7 @@
 How to Cite
 ===========
 
-The CEA Team. (2024). City Energy Analyst (v3.36.0). Zenodo. https://doi.org/10.5281/zenodo.10950383
+The CEA Team. (2024). City Energy Analyst (v3.36.1). Zenodo. https://doi.org/10.5281/zenodo.11382063
 
 The CEA team
 ============
@@ -11,6 +11,25 @@ and split into the categories of developers, product owner, project sponsor and
 
 
 <!-- credits -->
+- Version 3.36.1 - May 2024
+
+    Developers:
+    * Reynold Mok
+    * Martín Mosteiro Romero
+    * Mathias Niffeler
+    * Zhongming Shi
+
+    Product lead:
+    * Zhongming Shi
+
+    Product sponsor:
+    * [Arno Schlueter](https://systems.arch.ethz.ch/arno-schlueter)
+    * [Toni Piëch Foundation](https://www.tonipiechfoundation.org/)
+
+    Others:
+    * https://cityenergyanalyst.com/people
+
+
 - Version 3.36.0 - May 2024
 
     Developers:

README.rst

@@ -4,10 +4,8 @@
     :alt: GitHub license
 .. |repo_size| image:: https://img.shields.io/github/repo-size/architecture-building-systems/CityEnergyAnalyst
     :alt: Repo Size
-.. |lines_of_code| image:: https://img.shields.io/tokei/lines/github/architecture-building-systems/CityEnergyAnalyst
-    :alt: Lines of code
-.. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.10950383.svg
-   :target: https://doi.org/10.5281/zenodo.10950383
+.. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.11382063.svg
+   :target: https://doi.org/10.5281/zenodo.11382063
 
 .. image:: cea_logo.png
     :scale: 25 %
@@ -33,4 +31,4 @@ We invite all CEA users to get acquainted with the CEA Dashboard and CEA Console
 Cite us:
 --------
 
-The CEA Team. (2024). City Energy Analyst (v3.36.0). Zenodo. https://doi.org/10.5281/zenodo.10950383
+The CEA Team. (2024). City Energy Analyst (v3.36.1). Zenodo. https://doi.org/10.5281/zenodo.11382063

bin/create_trace_graphviz.py

@@ -12,7 +12,7 @@
 
 import yaml
 import cea.config
-from cea.tests.trace_inputlocator import create_graphviz_output
+from cea.utilities.trace_inputlocator.trace_inputlocator import create_graphviz_output
 
 def main(config):
     with open(config.trace_inputlocator.yaml_output_file, 'r') as f:

cea/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.36.0"
+__version__ = "3.36.1"
 
 
 class ConfigError(Exception):

cea/datamanagement/surroundings_helper.py

@@ -10,6 +10,7 @@
 import pandas as pd
 from geopandas import GeoDataFrame as gdf
 from geopandas.tools import sjoin as spatial_join
+from shapely import MultiPolygon
 
 import cea.config
 import cea.inputlocator
@@ -35,7 +36,11 @@ def calc_surrounding_area(zone_gdf, buffer_m):
     :param float buffer_m: Buffer to add to zone building geometries
     :return: Surrounding area GeoDataFrame
     """
-    surrounding_area = gdf(geometry=[zone_gdf.geometry.buffer(buffer_m).unary_union], crs=zone_gdf.crs)
+    merged_zone = zone_gdf.geometry.unary_union
+    if isinstance(merged_zone, MultiPolygon):
+        merged_zone = merged_zone.convex_hull
+
+    surrounding_area = gdf(geometry=[merged_zone.buffer(buffer_m)], crs=zone_gdf.crs)
     return surrounding_area
 
 
@@ -135,7 +140,6 @@ def erase_no_surrounding_areas(all_surroundings, zone, area_with_buffer):
     :return: GeoDataFrame with surrounding buildings
     """
     buffer_polygon = area_with_buffer.to_crs(zone.crs).geometry.values[0]
-    zone_area = gdf(geometry=[zone.geometry.unary_union], crs=zone.crs)
 
     within_buffer = all_surroundings.geometry.intersects(buffer_polygon)
     surroundings = all_surroundings[within_buffer]
@@ -144,7 +148,7 @@ def erase_no_surrounding_areas(all_surroundings, zone, area_with_buffer):
                                    if not any([s_building_footprint.intersects(z_building_footprint)
                                                for z_building_footprint in zone.geometry])]
     footprints_gdf = gdf(geometry=footprints_without_overlaps, crs=surroundings.crs)
-    relevant_surroundings = spatial_join(surroundings, footprints_gdf, op='within')
+    relevant_surroundings = spatial_join(surroundings, footprints_gdf, predicate='within')
 
     return relevant_surroundings.copy()
 
@@ -175,8 +179,7 @@ def geometry_extractor_osm(locator, config):
     # get footprints of all the surroundings
     print("Getting building footprints")
     area_with_buffer_polygon = area_with_buffer.to_crs(get_geographic_coordinate_system()).geometry.values[0]
-    all_surroundings = osmnx.geometries.geometries_from_polygon(polygon=area_with_buffer_polygon,
-                                                                tags={"building": True})
+    all_surroundings = osmnx.features_from_polygon(polygon=area_with_buffer_polygon, tags={"building": True})
     all_surroundings = all_surroundings.to_crs(get_projected_coordinate_system(float(lat), float(lon)))
 
     # erase overlapping area