From 07746de667f66e47c0c216b34917ffacbe29b455 Mon Sep 17 00:00:00 2001
From: Siarhei Fedartsou <siarhei.fedartsou@gmail.com>
Date: Sun, 29 Sep 2024 09:12:35 +0200
Subject: [PATCH] Try to get rid of std::variant in json_container.hpp

---
 include/util/json_container.hpp | 4 ++++
 src/engine/api/json_factory.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/util/json_container.hpp b/include/util/json_container.hpp
index 071e9cd7c..3fd70055b 100644
--- a/include/util/json_container.hpp
+++ b/include/util/json_container.hpp
@@ -141,6 +141,10 @@ struct Value
     Value(const True &) noexcept : type(Type::True) {}
     Value(const False &) noexcept : type(Type::False) {}
     Value(String &&string_) noexcept : string(std::move(string_)), type(Type::String) {}
+    Value(Number &&number_) noexcept : number(number_), type(Type::Number) {}
+    Value(Object &&object_) noexcept : object(std::move(object_)), type(Type::Object) {}
+    Value(Array &&array_) noexcept : array(std::move(array_)), type(Type::Array) {}
+    Value(const String &string_) noexcept : string(string_), type(Type::String) {}
     Value(const Number &number_) noexcept : number(number_), type(Type::Number) {}
     Value(const Object &object_) noexcept : object(object_), type(Type::Object) {}
     Value(const Array &array_) noexcept : array(array_), type(Type::Array) {}
diff --git a/src/engine/api/json_factory.cpp b/src/engine/api/json_factory.cpp
index a17ea7799..b71a9d199 100644
--- a/src/engine/api/json_factory.cpp
+++ b/src/engine/api/json_factory.cpp
@@ -143,8 +143,8 @@ util::json::Object makeIntersection(const guidance::IntermediateIntersection &in
                    });
 
     result.values.emplace("location", detail::coordinateToLonLat(intersection.location));
-    result.values.emplace("bearings", bearings);
-    result.values.emplace("entry", entry);
+    result.values.emplace("bearings", std::move(bearings));
+    result.values.emplace("entry", std::move(entry));
     if (intersection.in != guidance::IntermediateIntersection::NO_INDEX)
         result.values.emplace("in", intersection.in);
     if (intersection.out != guidance::IntermediateIntersection::NO_INDEX)