diff --git a/city_model_structure/attributes/usage_zone.py b/city_model_structure/attributes/usage_zone.py index 1f73c500..bc69600a 100644 --- a/city_model_structure/attributes/usage_zone.py +++ b/city_model_structure/attributes/usage_zone.py @@ -36,6 +36,7 @@ class UsageZone: self._heating_schedule = None self._cooling_schedule = None self._ventilation_schedule = None + self._schedules = None self._volume_geometry = None @property @@ -248,6 +249,18 @@ class UsageZone: """ self._ventilation_schedule = values + @property + def schedules(self): + """ + """ + return self._schedules + + @schedules.setter + def schedules(self, values): + """ + """ + self._schedules = values + @property def occupancy_density(self): """ diff --git a/tests/test_exports.py b/tests/test_exports.py index c1285d8e..2fb3ed9e 100644 --- a/tests/test_exports.py +++ b/tests/test_exports.py @@ -3,6 +3,7 @@ TestExports test and validate the city export formats SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ + from pathlib import Path from unittest import TestCase import pandas as pd diff --git a/tests/test_geometry_factory.py b/tests/test_geometry_factory.py index bab9c5f4..5c1c8f5e 100644 --- a/tests/test_geometry_factory.py +++ b/tests/test_geometry_factory.py @@ -9,7 +9,6 @@ from pathlib import Path from unittest import TestCase from city_model_structure.city import City from imports.geometry_factory import GeometryFactory -from city_model_structure.attributes.surface import Surface class TestGeometryFactory(TestCase): @@ -198,8 +197,8 @@ class TestGeometryFactory(TestCase): Test city surfaces triangulation and polygon creation :return: """ - file = (self._example_path / 'gml_17_12_2020.pickle').resolve() - city = City.load(file) + file = (self._example_path / 'gml_17_12_2020.gml').resolve() + city = GeometryFactory('citygml', file)._city_debug counter = 0 for building in city.buildings: