From c764c96debf5bf77e986a6772a0e0a2861d1ffd6 Mon Sep 17 00:00:00 2001 From: pilar Date: Mon, 22 Jun 2020 14:34:29 -0400 Subject: [PATCH] added "residential" type to us_to_library_types.py added building_type = "residential" to us_archetypes.xml 20 buildings example returns geometrical errors in third building --- city_model_structure/bixi_feature.py | 2 +- physics/physics_feeders/helpers/us_to_library_types.py | 2 +- usage/usage_feeders/helpers/us_function_to_usage.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/city_model_structure/bixi_feature.py b/city_model_structure/bixi_feature.py index ebd4bbf7..69b2fa45 100644 --- a/city_model_structure/bixi_feature.py +++ b/city_model_structure/bixi_feature.py @@ -27,6 +27,6 @@ class BixiFeature(CityObject): def gps_coordinates(self): """ Get bixi feature coordinates - :return: length + :return: [x, y, z] """ return self._coordinates diff --git a/physics/physics_feeders/helpers/us_to_library_types.py b/physics/physics_feeders/helpers/us_to_library_types.py index 1ccdfd5f..2d97805b 100644 --- a/physics/physics_feeders/helpers/us_to_library_types.py +++ b/physics/physics_feeders/helpers/us_to_library_types.py @@ -11,7 +11,7 @@ class UsToLibraryTypes: """ standards = { 'ASHRAE Std189': 1, - 'ASHRAE 90.1-2004': 2 + 'ASHRAE 90.1_2004': 2 } reference_city_climate_zone = { diff --git a/usage/usage_feeders/helpers/us_function_to_usage.py b/usage/usage_feeders/helpers/us_function_to_usage.py index 4f42ec40..51f7a0d4 100644 --- a/usage/usage_feeders/helpers/us_function_to_usage.py +++ b/usage/usage_feeders/helpers/us_function_to_usage.py @@ -26,8 +26,9 @@ class UsFunctionToUsage: 'stand alone retail': 'retail', 'strip mall': 'hall', 'supermarket': 'retail', - 'warehouse': 'industry' - } + 'warehouse': 'industry', + 'residential': 'residential' + } @staticmethod def usage(building_function):