diff --git a/hub/exports/building_energy/idf.py b/hub/exports/building_energy/idf.py index 0270d866..9ebf99f3 100644 --- a/hub/exports/building_energy/idf.py +++ b/hub/exports/building_energy/idf.py @@ -56,7 +56,6 @@ class Idf: _SIMPLE = 'Simple' idf_surfaces = { - # todo: make an enum for all the surface types cte.WALL: 'wall', cte.GROUND: 'floor', cte.ROOF: 'roof' diff --git a/hub/exports/exports_factory.py b/hub/exports/exports_factory.py index 8778e758..a0bcf805 100644 --- a/hub/exports/exports_factory.py +++ b/hub/exports/exports_factory.py @@ -31,18 +31,6 @@ class ExportsFactory: self._adjacent_buildings = adjacent_buildings self._base_uri = base_uri - @property - def _citygml(self): - """ - Export to citygml - :return: None - """ - raise NotImplementedError - - @property - def _collada(self): - raise NotImplementedError - @property def _stl(self): """ diff --git a/hub/imports/geometry/citygml.py b/hub/imports/geometry/citygml.py index 0cfe88c5..aa352ef8 100644 --- a/hub/imports/geometry/citygml.py +++ b/hub/imports/geometry/citygml.py @@ -23,7 +23,6 @@ class CityGml: def __init__(self, path, - extrusion_height_field=None, year_of_construction_field=None, function_field=None, function_to_hub=None, @@ -32,7 +31,6 @@ class CityGml: self._lod = None self._lod1_tags = ['lod1Solid', 'lod1MultiSurface'] self._lod2_tags = ['lod2Solid', 'lod2MultiSurface', 'lod2MultiCurve'] - self._extrusion_height_field = extrusion_height_field self._function_to_hub = function_to_hub if hub_crs is None: hub_crs = 'EPSG:26911' diff --git a/hub/imports/geometry_factory.py b/hub/imports/geometry_factory.py index 247288ef..21dba708 100644 --- a/hub/imports/geometry_factory.py +++ b/hub/imports/geometry_factory.py @@ -41,7 +41,6 @@ class GeometryFactory: :return: City """ return CityGml(self._path, - self._height_field, self._year_of_construction_field, self._function_field, self._function_to_hub, diff --git a/hub/imports/weather/helpers/weather.py b/hub/imports/weather/helpers/weather.py index 9d894991..7603cb5b 100644 --- a/hub/imports/weather/helpers/weather.py +++ b/hub/imports/weather/helpers/weather.py @@ -24,7 +24,8 @@ class Weather: 'DE.01.082': 'https://energyplus-weather.s3.amazonaws.com/europe_wmo_region_6/DEU/DEU_Stuttgart.107380_IWEC/DEU_Stuttgart.107380_IWEC.epw', 'US.NY.047': 'https://energyplus-weather.s3.amazonaws.com/north_and_central_america_wmo_region_4/USA/NY/USA_NY_New.York.City-Central.Park.94728_TMY/USA_NY_New.York.City-Central.Park.94728_TMY.epw', 'CA.10.12': 'https://energyplus-weather.s3.amazonaws.com/north_and_central_america_wmo_region_4/CAN/PQ/CAN_PQ_Quebec.717140_CWEC/CAN_PQ_Quebec.717140_CWEC.epw', - 'IL.01.': 'https://energyplus-weather.s3.amazonaws.com/europe_wmo_region_6/ISR/ISR_Eilat.401990_MSI/ISR_Eilat.401990_MSI.epw' + 'IL.01.': 'https://energyplus-weather.s3.amazonaws.com/europe_wmo_region_6/ISR/ISR_Eilat.401990_MSI/ISR_Eilat.401990_MSI.epw', + 'ES.07.PM': 'https://energyplus-weather.s3.amazonaws.com/europe_wmo_region_6/ESP/ESP_Palma.083060_SWEC/ESP_Palma.083060_SWEC.epw' } # todo: this dictionary need to be completed, a data science student task?