Let context_ids coexist with curves and solid settings.

src/ifcgeom/IfcGeomIteratorImplementation.h

@@ -253,6 +253,26 @@ namespace IfcGeom {
 				Logger::Error(e);
 			}
 
+			representations = IfcSchema::IfcRepresentation::list::ptr(new IfcSchema::IfcRepresentation::list);
+			ok_mapped_representations = IfcSchema::IfcRepresentation::list::ptr(new IfcSchema::IfcRepresentation::list);
+			double lowest_precision_encountered = std::numeric_limits<double>::infinity();
+			bool any_precision_encountered = false;
+
+			if (settings.context_ids().size() != 0) {
+				for (auto context_id : settings.context_ids()) {
+					IfcSchema::IfcGeometricRepresentationContext* context = ifc_file->instance_by_id(context_id)->as<IfcSchema::IfcGeometricRepresentationContext>();
+					representations->push(context->RepresentationsInContext());
+
+					try {
+						if (context->Precision() && *context->Precision() < lowest_precision_encountered) {
+							lowest_precision_encountered = *context->Precision();
+							any_precision_encountered = true;
+						}
+					} catch (const std::exception& e) {
+						Logger::Error(e);
+					}
+				}
+			} else {
 				std::set<std::string> allowed_context_types;
 				allowed_context_types.insert("model");
 				allowed_context_types.insert("plan");
@@ -273,12 +293,6 @@ namespace IfcGeom {
 					context_types.insert("plan");
 				}
 
-			double lowest_precision_encountered = std::numeric_limits<double>::infinity();
-			bool any_precision_encountered = false;
-
-			representations = IfcSchema::IfcRepresentation::list::ptr(new IfcSchema::IfcRepresentation::list);
-            ok_mapped_representations = IfcSchema::IfcRepresentation::list::ptr(new IfcSchema::IfcRepresentation::list);
-
 				IfcSchema::IfcGeometricRepresentationContext::list::it it;
 				IfcSchema::IfcGeometricRepresentationSubContext::list::it jt;
 				IfcSchema::IfcGeometricRepresentationContext::list::ptr contexts =
@@ -342,9 +356,10 @@ namespace IfcGeom {
 					// WR31: The parent context shall not be another geometric representation sub context.
 				}
 
-			for (auto context_id : settings.context_ids()) {
+				if (representations->size() == 0) {
-				IfcSchema::IfcGeometricRepresentationContext* context = ifc_file->instance_by_id(context_id)->as<IfcSchema::IfcGeometricRepresentationContext>();
+					Logger::Warning("No representations encountered in relevant contexts, using all");
-				representations->push(context->RepresentationsInContext());
+					representations = ifc_file->instances_by_type<IfcSchema::IfcRepresentation>();
+				}
 			}
 
 			if (any_precision_encountered) {
@@ -362,11 +377,6 @@ namespace IfcGeom {
 				kernel.setValue(IfcGeom::Kernel::GV_PRECISION, 1.e-5);
 			}
 
-            if (representations->size() == 0) {
-                Logger::Warning("No representations encountered in relevant contexts, using all");
-				representations = ifc_file->instances_by_type<IfcSchema::IfcRepresentation>();
-            }
-
 			if (representations->size() == 0) {
 				Logger::Warning("No representations encountered, aborting");
 				initialization_outcome_ = false;

src/ifcgeom/IfcGeomShapes.cpp

@@ -887,6 +887,8 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcGeometricSet* l, IfcRepresenta
 	// @nb the selection is partly duplicated from convert_curves() but it's needed as a
 	// geometric set by it's static class definition does not inform us of the type of elements.
 	// @todo handle this better so that this doesn't log an error.
+	const bool include_curves = getValue(GV_DIMENSIONALITY) != +1;
+	const bool include_solids_and_surfaces = getValue(GV_DIMENSIONALITY) != -1;
 
 	aggregate_of_instance::ptr elements = l->Elements();
 	if ( !elements->size() ) return false;
@@ -900,11 +902,11 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcGeometricSet* l, IfcRepresenta
 			if (!(convert_shapes(element, items) && flatten_shape_list(items, s, false))) {
 				continue;
 			}
-		} else if (shape_type(element) == ST_SHAPE) {
+		} else if (shape_type(element) == ST_SHAPE && include_solids_and_surfaces) {
 			if (!convert_shape(element, s)) {
 				continue;
 			}
-		} else if (shape_type(element) == ST_WIRE) {
+		} else if (shape_type(element) == ST_WIRE && include_curves) {
 			TopoDS_Wire w;
 			if (!convert_wire(element, w)) {
 				continue;

src/ifcgeom/IfcRegister.cpp

@@ -54,30 +54,34 @@ bool IfcGeom::Kernel::convert_shape(const IfcBaseInterface* l, TopoDS_Shape& r)
 	const unsigned int id = l->data().id();
 	bool success = false;
 	bool processed = false;
+	bool ignored = false;
 
 #ifndef NO_CACHE
 	std::map<int,TopoDS_Shape>::const_iterator it = cache.Shape.find(id);
 	if ( it != cache.Shape.end() ) { r = it->second; return true; }
 #endif
+	const bool include_curves = getValue(GV_DIMENSIONALITY) != +1;
+	const bool include_solids_and_surfaces = getValue(GV_DIMENSIONALITY) != -1;
 
 	IfcGeom::ShapeType st = shape_type(l);
+	ignored = (!include_solids_and_surfaces && (st == ST_SHAPE || st == ST_FACE)) || (!include_curves && (st == ST_WIRE || st == ST_CURVE));
 	if (st == ST_SHAPELIST) {
 		processed = true;
 		IfcRepresentationShapeItems items;
 		success = convert_shapes(l, items) && flatten_shape_list(items, r, false);
-	} else if (st == ST_SHAPE) {
+	} else if (st == ST_SHAPE && include_solids_and_surfaces) {
 #include "IfcRegisterConvertShape.h"
-	} else if (st == ST_FACE) {
+	} else if (st == ST_FACE && include_solids_and_surfaces) {
 		processed = true;
 		success = convert_face(l, r);
-	} else if (st == ST_WIRE) {
+	} else if (st == ST_WIRE && include_curves) {
 		processed = true;
 		TopoDS_Wire w;
 		success = convert_wire(l, w);
 		if (success) {
 			r = w;
 		}
-	} else if (st == ST_CURVE) {
+	} else if (st == ST_CURVE && include_curves) {
 		processed = true;
 		Handle(Geom_Curve) crv;
 		TopoDS_Wire w;
@@ -98,7 +102,7 @@ bool IfcGeom::Kernel::convert_shape(const IfcBaseInterface* l, TopoDS_Shape& r)
 			BRepCheck_Analyzer ana(r);
 			Logger::Notice("Valid: " + std::to_string(ana.IsValid()), l);
 		}
-	} else {
+	} else if (!ignored) {
 		const char* const msg = processed
 			? "Failed to convert:"
 			: "No operation defined for:";