From 686ba2536bc0e5d067fb0713abfb3b8e448f245b Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Sun, 7 Feb 2021 19:08:34 +1100
Subject: [PATCH] Fix bug where you could create mapped representations without
 having a type product

---
 .../bim/module/geometry/map_representation.py | 36 ++++++++-----------
 .../bim/module/geometry/operator.py           |  8 +----
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/ifcblenderexport/blenderbim/bim/module/geometry/map_representation.py b/src/ifcblenderexport/blenderbim/bim/module/geometry/map_representation.py
index 73dace0ebf..58b3218c99 100644
--- a/src/ifcblenderexport/blenderbim/bim/module/geometry/map_representation.py
+++ b/src/ifcblenderexport/blenderbim/bim/module/geometry/map_representation.py
@@ -1,26 +1,24 @@
 class Usecase:
     def __init__(self, file, settings=None):
         self.file = file
-        self.settings = {
-            "product": None,
-            "representation": None,
-        }
+        self.settings = {"representation": None}
         self.ifc_vertices = []
         for key, value in settings.items():
             self.settings[key] = value
 
     def execute(self):
-        self.zero = self.file.createIfcCartesianPoint((0.0, 0.0, 0.0))
-        self.x_axis = self.file.createIfcDirection((1.0, 0.0, 0.0))
-        self.y_axis = self.file.createIfcDirection((0.0, 1.0, 0.0))
-        self.z_axis = self.file.createIfcDirection((0.0, 0.0, 1.0))
+        mapping_source = self.get_mapping_source()
 
-        self.get_mapping_source()
+        if not mapping_source:
+            return
 
-        mapping_target = self.file.createIfcCartesianTransformationOperator3D(
-            self.x_axis, self.y_axis, self.zero, 1, self.z_axis
-        )
-        mapped_item = self.file.createIfcMappedItem(self.get_mapping_source(), mapping_target)
+        zero = self.file.createIfcCartesianPoint((0.0, 0.0, 0.0))
+        x_axis = self.file.createIfcDirection((1.0, 0.0, 0.0))
+        y_axis = self.file.createIfcDirection((0.0, 1.0, 0.0))
+        z_axis = self.file.createIfcDirection((0.0, 0.0, 1.0))
+
+        mapping_target = self.file.createIfcCartesianTransformationOperator3D(x_axis, y_axis, zero, 1, z_axis)
+        mapped_item = self.file.createIfcMappedItem(mapping_source, mapping_target)
         return self.file.create_entity(
             "IfcShapeRepresentation",
             **{
@@ -32,12 +30,6 @@ class Usecase:
         )
 
     def get_mapping_source(self):
-        if self.settings["representation"].RepresentationMap:
-            return self.settings["representation"].RepresentationMap[0]
-        return self.file.create_entity(
-            "IfcRepresentationMap",
-            **{
-                "MappingOrigin": self.file.createIfcAxis2Placement3D(self.zero, self.z_axis, self.x_axis),
-                "MappedRepresentation": self.settings["representation"],
-            }
-        )
+        for inverse in self.file.get_inverse(self.settings["representation"]):
+            if inverse.is_a("IfcRepresentationMap"):
+                return inverse
diff --git a/src/ifcblenderexport/blenderbim/bim/module/geometry/operator.py b/src/ifcblenderexport/blenderbim/bim/module/geometry/operator.py
index 28f64cf1ec..5f400f53b6 100644
--- a/src/ifcblenderexport/blenderbim/bim/module/geometry/operator.py
+++ b/src/ifcblenderexport/blenderbim/bim/module/geometry/operator.py
@@ -243,13 +243,7 @@ class MapRepresentation(bpy.types.Operator):
                 old_representation = None
             target_representation = self.file.by_id(obj_data.BIMMeshProperties.ifc_definition_id)
             obj.data = obj_data
-            result = map_representation.Usecase(
-                self.file,
-                {
-                    "product": product,
-                    "representation": target_representation,
-                },
-            ).execute()
+            result = map_representation.Usecase(self.file, {"representation": target_representation}).execute()
             assign_representation.Usecase(self.file, {"product": product, "representation": result}).execute()
             if old_representation:
                 bpy.ops.bim.remove_representation(ifc_definition_id=old_representation.id())