Correct merge mistake

city_model_structure/energy_system.py

@@ -2,6 +2,7 @@
 EnergySystem module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Contributor Peter Yefi peteryefi@gmail.com
 """
 
 from city_model_structure.city_object import CityObject
@@ -15,8 +16,25 @@ class EnergySystem(CityObject):
   def __init__(self, name, lod, surfaces, city_lower_corner):
     super().__init__(name, lod, surfaces, city_lower_corner)
     self._heat_pump = None
+    self._type = 'energy_system'
 
   @property
   def heat_pump(self) -> HeatPump:
     return self._heat_pump
 
+  @heat_pump.setter
+  def heat_pump(self, value):
+    """
+    Set heat pump for energy system
+    :param value: HeatPump
+    """
+    if self._heat_pump is None:
+      self._heat_pump = value
+
+  @property
+  def type(self) -> str:
+    """
+    Type of city object
+    :return: str
+    """
+    return self._type

imports/energy_systems/xlsx_heat_pump_parameters.py

@@ -22,7 +22,7 @@ class XlsxHeatPumpParameters:
 
   def __init__(self, city, base_path):
     self._city = city
-    self._base_path = (base_path / 'heat_pumps/Air source.xlsx')
+    self._base_path = (base_path / 'heat_pumps/Air Source.xlsx')
 
   def _read_file(self) -> Dict:
     """