Merge remote-tracking branch 'origin/main'

hub/city_model_structure/building_demand/thermal_control.py

@@ -4,6 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2022 Concordia CERC group
 Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
+from math import inf
 from typing import Union, List
 from hub.city_model_structure.attributes.schedule import Schedule
 
@@ -22,16 +23,14 @@ class ThermalControl:
 
   @staticmethod
   def _maximum_value(schedules):
-    maximum = -1000
+    maximum = -inf
     for schedule in schedules:
-      for value in schedule.values:
+      maximum = max(maximum, max(schedule.values))
-        if value > maximum:
-          maximum = value
     return maximum
 
   @staticmethod
   def _minimum_value(schedules):
-    minimum = 1000
+    minimum = inf
     for schedule in schedules:
       minimum = min(minimum, min(schedule.values))
     return minimum

hub/city_model_structure/city.py

@@ -101,7 +101,7 @@ class City:
     Get city location
     :return: Location
     """
-    return self._get_location().city
+    return self._get_location()
 
   @property
   def name(self):
@@ -113,6 +113,15 @@ class City:
       return self._get_location().city
     return self._name
 
+  @name.setter
+  def name(self, value):
+    """
+    Set city name
+    :param value:str
+    """
+    if value is not None:
+      self._name = str(value)
+
   @property
   def climate_reference_city(self) -> Union[None, str]:
     """
@@ -275,15 +284,6 @@ class City:
     """
     return self._srs_name
 
-  @name.setter
-  def name(self, value):
-    """
-    Set city name
-    :param value:str
-    """
-    if value is not None:
-      self._name = str(value)
-
   @staticmethod
   def load(city_filename) -> City:
     """

hub/helpers/data/hub_usage_to_comnet_usage.py

@@ -73,7 +73,9 @@ class HubUsageToComnetUsage:
       cte.AUTOMOTIVE_FACILITY: 'BA Automotive Facility',
       cte.PARKING_GARAGE: 'BA Parking Garage',
       cte.RELIGIOUS: 'BA Religious Building',
-      cte.NON_HEATED: 'n/a'
+      cte.NON_HEATED: 'n/a',
+      cte.DATACENTER: 'n/a',
+      cte.FARM: 'n/a'
     }
 
   @property

hub/helpers/data/hub_usage_to_eilat_usage.py

@@ -17,7 +17,9 @@ class HubUsageToEilatUsage:
     self._dictionary = {
       cte.RESIDENTIAL: 'Residential',
       cte.HOTEL: 'Hotel employees',
-      cte.DORMITORY: 'Dormitory'
+      cte.DORMITORY: 'Dormitory',
+      cte.DATACENTER: 'n/a',
+      cte.FARM: 'n/a'
     }
 
   @property

hub/helpers/data/hub_usage_to_hft_usage.py

@@ -73,7 +73,9 @@ class HubUsageToHftUsage:
       cte.AUTOMOTIVE_FACILITY: 'n/a',
       cte.PARKING_GARAGE: 'n/a',
       cte.RELIGIOUS: 'event location',
-      cte.NON_HEATED: 'non-heated'
+      cte.NON_HEATED: 'non-heated',
+      cte.DATACENTER: 'n/a',
+      cte.FARM: 'n/a'
     }
 
   @property

hub/helpers/data/hub_usage_to_nrcan_usage.py

@@ -73,7 +73,10 @@ class HubUsageToNrcanUsage:
       cte.AUTOMOTIVE_FACILITY: 'Automotive facility',
       cte.PARKING_GARAGE: 'Storage garage',
       cte.RELIGIOUS: 'Religious building',
-      cte.NON_HEATED: 'n/a'
+      cte.NON_HEATED: 'n/a',
+      cte.DATACENTER: 'n/a',
+      cte.FARM: 'n/a'
+
     }
 
   @property

hub/helpers/data/montreal_function_to_hub_function.py

@@ -623,8 +623,12 @@ class MontrealFunctionToHubFunction:
                         '8192': cte.FARM,
                         '2439': cte.INDUSTRY,
                         '3891': cte.INDUSTRY,
-                        '6354': cte.WORKSHOP
+                        '6354': cte.WORKSHOP,
-                      }
+                        '4815': cte.NON_HEATED,
+                        '6651': cte.WORKSHOP,
+                        '2822': cte.INDUSTRY,
+                        '2821': cte.INDUSTRY
+                        }
 
   @property
   def dictionary(self) -> dict:

hub/helpers/geometry_helper.py

@@ -312,7 +312,7 @@ class GeometryHelper:
           country = file_country_code
           city = file_city_name
           region_code = f'{file_country_code}.{admin1_code}.{admin2_code}'
-    return Location(country, city, region_code)
+    return Location(country, city, region_code, latitude, longitude)
 
   @staticmethod
   def distance_between_points(vertex1, vertex2):

hub/helpers/location.py

@@ -11,10 +11,12 @@ class Location:
   """
   Location
   """
-  def __init__(self, country, city, region_code):
+  def __init__(self, country, city, region_code, climate_reference_city_latitude, climate_reference_city_longitude):
     self._country = country
     self._city = city
     self._region_code = region_code
+    self._climate_reference_city_latitude = climate_reference_city_latitude
+    self._climate_reference_city_longitude = climate_reference_city_longitude
 
   @property
   def city(self):
@@ -36,3 +38,17 @@ class Location:
     Get region
     """
     return self._region_code
+
+  @property
+  def climate_reference_city_latitude(self):
+    """
+    Get climate-reference-city latitude
+    """
+    return self._climate_reference_city_latitude
+
+  @property
+  def climate_reference_city_longitude(self):
+    """
+    Get climate-reference-city longitude
+    """
+    return self._climate_reference_city_longitude

hub/imports/construction/helpers/construction_helper.py

@@ -42,7 +42,6 @@ class ConstructionHelper:
     'Varennes': '6',
     'Laval': '6',
     'Longueuil': '6',
-    'Saint-Leonard': '6',
     'Mont-Royal': '6',
     'Deux-Montagnes': '6',
     'Dorval': '6',
@@ -58,6 +57,8 @@ class ConstructionHelper:
     'Pointe-Claire': '6',
     'Boucherville': '6',
     'Mascouche': '6',
+    'Saint-Leonard': '6',
+    'La Prairie': '6'
   }
 
   _reference_city_to_israel_climate_zone = {

hub/version.py

@@ -1,4 +1,4 @@
 """
 Hub version number
 """
-__version__ = '0.1.8.4'
+__version__ = '0.1.8.8'