2 files changed, 15 insertions, 0 deletions
diff --git a/src/openvic-simulation/dataloader/NodeTools.cpp b/src/openvic-simulation/dataloader/NodeTools.cpp
index 1339dd3..d6b57ca 100644
--- a/src/openvic-simulation/dataloader/NodeTools.cpp
+++ b/src/openvic-simulation/dataloader/NodeTools.cpp
@@ -13,6 +13,7 @@
 #include <range/v3/view/enumerate.hpp>
 
 #include "openvic-simulation/types/Colour.hpp"
+#include "openvic-simulation/types/TextFormat.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
 using namespace OpenVic;
@@ -264,6 +265,17 @@ NodeCallback auto _expect_vec2(Callback<vec2_t<T>> auto&& callback) {
 	};
 }
 
+node_callback_t NodeTools::_expect_text_format_t(callback_t<text_format_t> callback){
+	static const string_map_t<text_format_t> format_map = {
+		{ "left",  text_format_t::left },
+		{ "right", text_format_t::right },
+		{ "centre", text_format_t::centre },
+		{ "center", text_format_t::centre },
+		{ "justified", text_format_t::justified }
+	};
+	return expect_identifier(expect_mapped_string(format_map, callback));
+}
+
 static node_callback_t _expect_int(callback_t<ivec2_t::type> callback) {
 	return expect_int(callback);
 }
diff --git a/src/openvic-simulation/dataloader/NodeTools.hpp b/src/openvic-simulation/dataloader/NodeTools.hpp
index 6464e72..8265c94 100644
--- a/src/openvic-simulation/dataloader/NodeTools.hpp
+++ b/src/openvic-simulation/dataloader/NodeTools.hpp
@@ -14,6 +14,7 @@
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/IndexedMap.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
+#include "openvic-simulation/types/TextFormat.hpp"
 #include "openvic-simulation/types/unlabelledVec.hpp"
 #include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
@@ -151,6 +152,8 @@ namespace OpenVic {
 		/* Expect a hexadecimal value representing a colour in ARGB format. */
 		node_callback_t expect_colour_hex(callback_t<colour_argb_t> callback);
 
+		node_callback_t _expect_text_format_t(callback_t<text_format_t> callback);
+
 		callback_t<std::string_view> expect_date_str(callback_t<Date> callback);
 		node_callback_t expect_date(callback_t<Date> callback);
 		node_callback_t expect_date_string(callback_t<Date> callback);