Fixed bug where translation of the model would not be stored if no georeferencing data was present in ifc, changed projected roofoutline surface type

Author: jaspervdv

GUI_code/Ext_GUI.py

@@ -889,8 +889,8 @@ def makeUnitWindow(frame_location, unit_variable):
 Tooltip(toggle_make_obj, "If active output is copied to wavefront .OBJ file(s)")
 Tooltip(toggle_make_step, "If active output is copied to .STEP (ISO 10303) file(s)")
 
-Tooltip(toggle_makefootprint, "If active a footprint will be created at the footprint elevation (lod0.0 0.2, 0.3 and 0.4 only)")
-Tooltip(toggle_makeroofprint, "If active a roof outline will be created (lod0.0 0.2, 0.3 and 0.4 only)")
+Tooltip(toggle_makefootprint, "If active a footprint will be created at the footprint elevation (lod0.0, 0.2, 0.3 and 0.4 only)")
+Tooltip(toggle_makeroofprint, "If active a roof outline will be created (lod0.0, 0.2, 0.3 and 0.4 only)")
 Tooltip(toggle_footprint_based, "If active the footprint will be used to restrict the output (LoD1.2, 1.3 & 2.2)")
 Tooltip(toggle_makeexterior, "If active exterior shells will be stored")
 Tooltip(toggle_makeinterior, "If active spaces will be stored (Lod0.2, 1.2, 2.2, 3.2 & voxels) and storey "

inc/DataManager.cpp

@@ -1165,25 +1165,26 @@ void DataManager::getProjectionData(CJT::ObjectTransformation* transformation, C
 	IfcParse::IfcFile* fileObject = datacollection_[0]->getFilePtr();
 #if defined(USE_IFC4) || defined(USE_IFC4x3)
 	IfcSchema::IfcMapConversion::list::ptr mapList = fileObject->instances_by_type<IfcSchema::IfcMapConversion>();
-	if (mapList->size() == 0) { return; }
-	if (mapList->size() > 1) { 
-		ErrorCollection::getInstance().addError(ErrorID::warningIfcMultipleProjections);
-		std::cout << errorWarningStringEnum::getString(ErrorID::warningIfcMultipleProjections) << std::endl;
-	}
-	
-	IfcSchema::IfcMapConversion* mapConversion = *(mapList->begin());
-	metaData->setReferenceSystem(mapConversion->TargetCRS()->Name());
+	if (mapList->size() != 0) {
+		if (mapList->size() > 1) {
+			ErrorCollection::getInstance().addError(ErrorID::warningIfcMultipleProjections);
+			std::cout << errorWarningStringEnum::getString(ErrorID::warningIfcMultipleProjections) << std::endl;
+		}
 
-	if (mapConversion->Scale().has_value())
-	{
-		std::array<double, 3> scaleCity = transformation->getScale();
-		double scaleIfc = mapConversion->Scale().get();
+		IfcSchema::IfcMapConversion* mapConversion = *(mapList->begin());
+		metaData->setReferenceSystem(mapConversion->TargetCRS()->Name());
 
-		for (size_t i = 0; i < scaleCity.size(); i++)
+		if (mapConversion->Scale().has_value())
 		{
-			scaleCity[i] = scaleCity[i] * scaleIfc;
+			std::array<double, 3> scaleCity = transformation->getScale();
+			double scaleIfc = mapConversion->Scale().get();
+
+			for (size_t i = 0; i < scaleCity.size(); i++)
+			{
+				scaleCity[i] = scaleCity[i] * scaleIfc;
+			}
+			transformation->setScale(scaleCity);
 		}
-		transformation->setScale(scaleCity);
 	}
 	gp_XYZ invertedObjectTrsf = objectIfcTranslation_.TranslationPart();
 

inc/cjCreator.cpp

@@ -2438,16 +2438,18 @@ std::vector< CJT::GeoObject> CJGeoCreator::makeLoD00(DataManager* h, CJT::Kernel
 	if (settingsCollection.makeRoofPrint())
 	{
 		double roofOutlineHeight = footprintHeight;
+		std::string surfaceType = CJObjectEnum::getString(CJObjectID::CJTTypeProjectedRoofOutline);
 		if (settingsCollection.makeFootPrint())
 		{
 			roofOutlineHeight = urr.Z();
+			surfaceType = CJObjectEnum::getString(CJObjectID::CJTypeRoofSurface);
 		}
 		TopoDS_Shape roofShape = helperFunctions::createHorizontalFace(lll, urr, -rotationAngle, roofOutlineHeight);
 		faceCopyCollection.emplace_back(roofShape);
 
 		CJT::GeoObject geoObject = kernel->convertToJSON(roofShape, "0.0");
 		std::map<std::string, std::string> semanticData;
-		semanticData.emplace(CJObjectEnum::getString(CJObjectID::CJType), CJObjectEnum::getString(CJObjectID::CJTypeRoofSurface));
+		semanticData.emplace(CJObjectEnum::getString(CJObjectID::CJType), surfaceType);
 		geoObject.appendSurfaceData(semanticData);
 		geoObject.appendSurfaceTypeValue(0);
 		geoObjectCollection.emplace_back(geoObject);
@@ -2521,12 +2523,12 @@ std::vector< CJT::GeoObject> CJGeoCreator::makeLoD02(DataManager* h, CJT::Kernel
 
 	std::vector< CJT::GeoObject> geoObjectCollection;
 
-	std::map<std::string, std::string> semanticRoofData;
-	semanticRoofData.emplace(CJObjectEnum::getString(CJObjectID::CJType), CJObjectEnum::getString(CJObjectID::CJTypeRoofSurface));
+
 	std::map<std::string, std::string> semanticFootData;
 	semanticFootData.emplace(CJObjectEnum::getString(CJObjectID::CJType), CJObjectEnum::getString(CJObjectID::CJTypeGroundSurface));
 
 	gp_Pnt urr = h->getUrrPoint();
+	double footprintHeight = settingCollection.footprintElevation() + h->getObjectTranslation().TranslationPart().Z();
 
 	std::vector<TopoDS_Shape> faceCopyCollection;
 	if (settingCollection.makeRoofPrint())
@@ -2538,10 +2540,22 @@ std::vector< CJT::GeoObject> CJGeoCreator::makeLoD02(DataManager* h, CJT::Kernel
 
 			gp_Trsf trsf;
 			trsf.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Vec(0, 0, 1)),  -settingCollection.gridRotation());
-			if (hasFootprints_) { trsf.SetTranslationPart(gp_Vec(0, 0, urr.Z())); }
+
+			std::map<std::string, std::string> semanticRoofData;
+			
+			std::string surfaceType = CJObjectEnum::getString(CJObjectID::CJTTypeProjectedRoofOutline);
+			if (hasFootprints_) { 
+				surfaceType = CJObjectEnum::getString(CJObjectID::CJTypeRoofSurface);
+				trsf.SetTranslationPart(gp_Vec(0, 0, urr.Z()));
+			}
+			else
+			{
+				trsf.SetTranslationPart(gp_Vec(0, 0, footprintHeight));
+			}
 			roofOutline.Move(trsf);
 			faceCopyCollection.emplace_back(roofOutline);
 
+			semanticRoofData.emplace(CJObjectEnum::getString(CJObjectID::CJType), surfaceType);
 			CJT::GeoObject geoObject = kernel->convertToJSON(roofOutline, "0.2");
 			geoObject.appendSurfaceData(semanticRoofData);
 			geoObject.appendSurfaceTypeValue(0);

inc/helper.h

@@ -1,4 +1,4 @@
-#define USE_IFC4x3
+#define USE_IFC2x3
 #define iterationVersion "0.2.6"
 
 #ifdef USE_IFC2x3

inc/stringManager.cpp

@@ -666,7 +666,9 @@ std::string CJObjectEnum::getString(CJObjectID id)
 	case CJObjectID::CJTTypeCeilingSurface:
 		return "CeilingSurface";
 	case CJObjectID::CJTTypeOuterCeilingSurface:
-		return "OuterCeilingSurface";
+		return "OuterCeilingSurface";	
+	case CJObjectID::CJTTypeProjectedRoofOutline:
+		return "+projectedRoofOutline";
 	case CJObjectID::CJAttHasWindow:
 		return "+hasWindows";
 

inc/stringManager.h

@@ -268,6 +268,8 @@ enum class CJObjectID {
 	CJTTypeCeilingSurface, 
 	CJTTypeOuterCeilingSurface,
 
+	CJTTypeProjectedRoofOutline,
+
 	CJAttHasWindow,
 
 	True,