Merge remote-tracking branch 'origin/master'

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

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 = {

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):