Merge pull request 'retrofit_project' (#25) from retrofit_project into main

Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/25

hub/city_model_structure/building.py

@@ -616,8 +616,8 @@ class Building(CityObject):
           for key, item in _working_hours.items():
             saved_values = _working_hours_per_thermal_zone[key]
             for i, value in enumerate(item):
-              if saved_values[i] == 1:
-                value = 1
+              _working_hours[key][i] = max(_working_hours[key][i], saved_values[i])
+
     _total_hours = 0
     for key in _working_hours:
       hours = sum(_working_hours[key])

hub/exports/exports_factory.py

@@ -17,7 +17,7 @@ class ExportsFactory:
   """
   Exports factory class
   """
-  def __init__(self, handler, city, path,target_buildings=None,adjacent_buildings=None):
+  def __init__(self, handler, city, path, target_buildings=None, adjacent_buildings=None):
     self._city = city
     self._handler = '_' + handler.lower()
     validate_import_export_type(ExportsFactory, handler)