reestablished name and country_code in city.py

city_model_structure/attributes/thermal_zone.py

@@ -187,3 +187,20 @@ class ThermalZone:
     :return: None
     """
     self._usage_zones = values
+
+  @property
+  def volume(self):
+    """
+    Get thermal zone volume
+    :return: float
+    """
+    return self._volume
+
+  @volume.setter
+  def volume(self, value):
+    """
+    Set thermal zone volume
+    :param value: float
+    :return: None
+    """
+    self._volume = value

city_model_structure/city.py

@@ -54,16 +54,7 @@ class City:
     City country code
     :return: str
     """
-    return self._country_code
-
-  @country_code.setter
-  def country_code(self, value):
-    """
-    City country code
-    :param value:str
-    :return: None
-    """
-    self._country_code = value
+    return self._get_location[0]
 
   @property
   def name(self):
@@ -71,15 +62,7 @@ class City:
     City name
     :return: str
     """
-    return self._name
-
-  @name.setter
-  def name(self, value):
-    """
-    City name
-    :return: str
-    """
-    self._name = value
+    return self._get_location[1]
 
   @property
   def city_objects(self) -> Union[List[CityObject], None]: