From f6645b19ef4e7faed94bbbd6d22fff236fbde30a Mon Sep 17 00:00:00 2001
From: elmir <elmir@brab>
Date: Wed, 30 Aug 2017 14:09:07 +0200
Subject: [PATCH] don't assign ID to Simple types

When adding entities, don't assign ID to Simple types.
Otherwise that type will be serialized incorrectly.

This fixes the issue with IFCPLANEANGLEMEASURE being serilzed
incorrectly when used as attribute to IFCMEASUREWITHUNIT.

With ID assigned, it will look like this:

  #10=IFCMEASUREWITHUNIT(#9=IFCPLANEANGLEMEASURE(0.017453293),#8);

The correct way to serialze is:

  #10=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#8);
---
 src/ifcparse/IfcParse.cpp | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
index 1d46a4ab8f..45be9d1219 100644
--- a/src/ifcparse/IfcParse.cpp
+++ b/src/ifcparse/IfcParse.cpp
@@ -1603,24 +1603,26 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity) {
 		}
 	}
 
-	int new_id = -1;
-	if (!new_entity->entity->file) {
-		// For newly created entities ensure a valid ENTITY_INSTANCE_NAME is set
-		new_entity->entity->file = this;
-		new_id = new_entity->entity->set_id();
-	} else {
-		new_id = new_entity->entity->id();
-	}
+	if (!IfcSchema::Type::IsSimple(new_entity->entity->type())) {
+		int new_id = -1;
+		if (!new_entity->entity->file) {
+			// For newly created entities ensure a valid ENTITY_INSTANCE_NAME is set
+			new_entity->entity->file = this;
+			new_id = new_entity->entity->set_id();
+		} else {
+			new_id = new_entity->entity->id();
+		}
 
-	if (byid.find(new_id) != byid.end()) {
-		// This should not happen
-		std::stringstream ss;
-		ss << "Overwriting entity with id " << new_id;
-		Logger::Message(Logger::LOG_WARNING, ss.str());
-	}
+		if (byid.find(new_id) != byid.end()) {
+			// This should not happen
+			std::stringstream ss;
+			ss << "Overwriting entity with id " << new_id;
+			Logger::Message(Logger::LOG_WARNING, ss.str());
+		}
 
-	// The mapping by entity instance name is updated.
-	byid[new_id] = new_entity;
+		// The mapping by entity instance name is updated.
+		byid[new_id] = new_entity;
+	}
 
 	// The mapping by reference is updated.
 	IfcEntityList::ptr entity_attributes(new IfcEntityList);