From b9c234457d51dc5ad981cdd7b10738acbe29cc13 Mon Sep 17 00:00:00 2001
From: Richard Brice <37087370+RickBrice@users.noreply.github.com>
Date: Wed, 4 Oct 2023 13:25:58 -0700
Subject: [PATCH] Fixes minor issues with mapping code

---
 src/ifcgeom/mapping/IfcGradientCurve.cpp | 6 +++---
 src/ifcgeom/mapping/mapping.i            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ifcgeom/mapping/IfcGradientCurve.cpp b/src/ifcgeom/mapping/IfcGradientCurve.cpp
index 9901c829bb..6794c1731d 100644
--- a/src/ifcgeom/mapping/IfcGradientCurve.cpp
+++ b/src/ifcgeom/mapping/IfcGradientCurve.cpp
@@ -47,11 +47,11 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcGradientCurve* inst) {
 	}
 
 	// @todo does this really make sense?
-	auto composition = [horizontal, vertical](double u) {
+	auto composition = [horizontal, vertical](double u)->Eigen::VectorXd {
 		auto xy = horizontal->evaluate(u);
 		auto z = vertical->evaluate(u);
 		Eigen::VectorXd vec(3);
-		vec << xy(0), xy(1), z(0);
+		vec << xy(0), xy(1), z(2);
 		return vec;
 	};
 
@@ -69,7 +69,7 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcGradientCurve* inst) {
 	}
 
 	auto pwf = taxonomy::make<taxonomy::piecewise_function>();
-	pwf->spans.push_back({ min_length, composition });
+	pwf->spans.emplace_back( min_length, composition );
 	return pwf;
 }
 
diff --git a/src/ifcgeom/mapping/mapping.i b/src/ifcgeom/mapping/mapping.i
index 57de49a16d..5a1dc62572 100644
--- a/src/ifcgeom/mapping/mapping.i
+++ b/src/ifcgeom/mapping/mapping.i
@@ -113,10 +113,10 @@ BIND(IfcEdge);
 BIND(IfcEdgeLoop);
 BIND(IfcPolyline);
 BIND(IfcPolyLoop);
+BIND(IfcCompositeCurve);
 #ifdef SCHEMA_HAS_IfcGradientCurve
 BIND(IfcGradientCurve);
 #endif
-BIND(IfcCompositeCurve);
 BIND(IfcTrimmedCurve);
 BIND(IfcArbitraryOpenProfileDef);
 #ifdef SCHEMA_HAS_IfcIndexedPolyCurve