update

Author: HoeppJ

teaser/data/dataclass.py

@@ -29,6 +29,8 @@ class DataClass(object):
     construction_data : ConstructionData
         The prefix of this parameter indicates which statistical data about building
         elements should be used. Its type is the enum class ConstructionData.
+        To utilize a custom TypeElements via parameter custom_path_type_elements (cf. below)
+        use ConstructionData.custom.
     custom_path_type_elements: str or Path
         Custom path to JSON file of TypeElements. Default: None
     custom_path_material_templates: str or Path
@@ -64,10 +66,12 @@ def __init__(self,
 
         """Construct DataClass."""
         self.element_bind = None
-        if custom_path_type_elements:
-            self.path_tb = custom_path_type_elements
-        elif not custom_path_type_elements and construction_data.is_custom():
-            raise KeyError("Provide path to custom type elements .json file")
+        if construction_data.is_custom():
+            if custom_path_type_elements:
+                self.path_tb = custom_path_type_elements
+            elif not custom_path_type_elements:
+                raise KeyError("Provide path to custom type elements JSON file "
+                               "or change ConstructionData to a known construction type")
         elif construction_data.is_iwu():
             self.path_tb = utils.get_full_path(
                 "data/input/inputdata/TypeElements_IWU.json"

teaser/data/utilities.py

@@ -91,7 +91,7 @@ class ConstructionData(Enum):
     kfw_70 = "kfw_70"
     kfw_85 = "kfw_85"
     kfw_100 = "kfw_100"
-    custom = "Custom"
+    custom = "custom"
 
     def get_prefix(self):
         parts = self.value.split("_", 2)
@@ -114,8 +114,7 @@ def is_kfw(self):
         return self.get_prefix() == "kfw"
 
     def is_custom(self):
-        if not any(s in self.value for s in ["iwu", "tabula_de", "tabula_dk", "kfw"]):
-            return "custom" in self.value
+        return self.value == "custom"
 
 # Dictionary that maps GeometryData enumeration values to their corresponding building classes.
 geometries = {