diff --git a/hub/helpers/data/hub_usage_to_comnet_usage.py b/hub/helpers/data/hub_usage_to_comnet_usage.py index f58193ac..a0304208 100644 --- a/hub/helpers/data/hub_usage_to_comnet_usage.py +++ b/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 diff --git a/hub/helpers/data/hub_usage_to_eilat_usage.py b/hub/helpers/data/hub_usage_to_eilat_usage.py index e4d8a4cc..04da3203 100644 --- a/hub/helpers/data/hub_usage_to_eilat_usage.py +++ b/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 diff --git a/hub/helpers/data/hub_usage_to_hft_usage.py b/hub/helpers/data/hub_usage_to_hft_usage.py index dbc4847e..5d6d3e8f 100644 --- a/hub/helpers/data/hub_usage_to_hft_usage.py +++ b/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 diff --git a/hub/helpers/data/hub_usage_to_nrcan_usage.py b/hub/helpers/data/hub_usage_to_nrcan_usage.py index ed280903..8be15d2e 100644 --- a/hub/helpers/data/hub_usage_to_nrcan_usage.py +++ b/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 diff --git a/tests/test_results_import.py b/tests/test_results_import.py index 1befac19..5f227582 100644 --- a/tests/test_results_import.py +++ b/tests/test_results_import.py @@ -30,13 +30,13 @@ class TestResultsImport(TestCase): """ self._example_path = (Path(__file__).parent / 'tests_data').resolve() self._output_path = (Path(__file__).parent / 'tests_outputs').resolve() - file = 'test.geojson' + file = '2163_v1.geojson' file_path = (self._example_path / file).resolve() self._city = GeometryFactory('geojson', path=file_path, - height_field='citygml_me', - year_of_construction_field='ANNEE_CONS', - function_field='CODE_UTILI', + height_field='height', + year_of_construction_field='year_of_construction', + function_field='function', function_to_hub=Dictionaries().montreal_function_to_hub_function).city ConstructionFactory('nrcan', self._city).enrich()