Merge pull request #179 from OpenVicProject/bookmark-position

Load bookmark position as fvec2_t with height flipped

2 files changed, 8 insertions, 0 deletions

diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp
index 2058ce5..77d0baa 100644
--- a/src/openvic-simulation/dataloader/Dataloader.cpp
+++ b/src/openvic-simulation/dataloader/Dataloader.cpp
@@ -1007,6 +1007,7 @@ bool Dataloader::load_defines(DefinitionManager& definition_manager) {
 		ret = false;
 	}
 	if (!definition_manager.get_history_manager().get_bookmark_manager().load_bookmark_file(
+		definition_manager.get_map_definition().get_height(),
 		parse_defines(lookup_file(bookmark_file)).get_file_node()
 	)) {
 		Logger::error("Failed to load bookmarks!");
diff --git a/src/openvic-simulation/dataloader/NodeTools.hpp b/src/openvic-simulation/dataloader/NodeTools.hpp
index d019cce..945e5e8 100644
--- a/src/openvic-simulation/dataloader/NodeTools.hpp
+++ b/src/openvic-simulation/dataloader/NodeTools.hpp
@@ -589,6 +589,13 @@ namespace OpenVic {
 				return callback(val);
 			};
 		}
+
+		template<typename T>
+		constexpr Callback<T> auto flip_height_callback(Callback<T> auto&& callback, T height) {
+			return [callback, height](T val) -> bool {
+				return callback(height - val);
+			};
+		}
 	}
 }