Merge pull request 'Correct small bug in merge city' (#1) from bug_in_merge_city into main

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

hub/city_model_structure/city.py

@@ -459,6 +459,7 @@ class City:
         for surface in city_object.surfaces:
           radiation = surface.global_irradiance
           if 'year' not in radiation and 'month' not in radiation:
+
             continue
           elif "year" in radiation:
             building_radiation += radiation["year"].iloc[0]
@@ -468,11 +469,11 @@ class City:
         if building_radiation < min_radiation:
           min_radiation = building_radiation
           selected_city_object = city_object
-    # merge the city object with the minimum radiation
+      # merge the city object with the minimum radiation
-    if selected_city_object is not None:
+      if selected_city_object is not None:
-      _merge_city.add_city_object(selected_city_object)
+        _merge_city.add_city_object(selected_city_object)
-    else:
+      else:
-      _merge_city.add_city_object(building)
+        _merge_city.add_city_object(building)
     return _merge_city
 
   @property