From f0c3df73096e1a61566e5a79975405806efe91b9 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 23 May 2025 09:21:57 +0200
Subject: [PATCH] Fix broken selection properties (closes #3676)

And small options key cleanup
---
 include/openspace/properties/misc/optionproperty.h | 1 -
 src/properties/misc/optionproperty.cpp             | 3 ++-
 src/properties/misc/selectionproperty.cpp          | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/openspace/properties/misc/optionproperty.h b/include/openspace/properties/misc/optionproperty.h
index c1b0513c26..deeadd946d 100644
--- a/include/openspace/properties/misc/optionproperty.h
+++ b/include/openspace/properties/misc/optionproperty.h
@@ -141,7 +141,6 @@ public:
     std::string stringValue() const override final;
 
 private:
-    static const std::string OptionsKey;
     nlohmann::json generateAdditionalJsonDescription() const override final;
     int toValue(lua_State* state) const override final;
 
diff --git a/src/properties/misc/optionproperty.cpp b/src/properties/misc/optionproperty.cpp
index f1260be3ce..f652a6646f 100644
--- a/src/properties/misc/optionproperty.cpp
+++ b/src/properties/misc/optionproperty.cpp
@@ -32,6 +32,8 @@
 namespace {
     constexpr std::string_view _loggerCat = "OptionProperty";
 
+    constexpr std::string_view OptionsKey = "options";
+
     using Option = openspace::properties::OptionProperty::Option;
 
     bool addOptionInternal(int value, std::string desc, std::vector<Option>& options) {
@@ -55,7 +57,6 @@ namespace {
 
 namespace openspace::properties {
 
-const std::string OptionProperty::OptionsKey = "options";
 
 OptionProperty::OptionProperty(PropertyInfo info)
     : NumericalProperty<int>(
diff --git a/src/properties/misc/selectionproperty.cpp b/src/properties/misc/selectionproperty.cpp
index 7367f3777c..1ddcdebaa8 100644
--- a/src/properties/misc/selectionproperty.cpp
+++ b/src/properties/misc/selectionproperty.cpp
@@ -33,6 +33,8 @@
 
 namespace {
     constexpr std::string_view _loggerCat = "SelectionProperty";
+
+    constexpr std::string_view OptionsKey = "options";
 } // namespace
 
 namespace openspace::properties {
@@ -168,7 +170,7 @@ bool SelectionProperty::removeInvalidKeys(std::set<std::string>& keys) const {
 
 nlohmann::json SelectionProperty::generateAdditionalJsonDescription() const {
     const nlohmann::json optionsJson(_options);
-    return optionsJson;
+    return { { OptionsKey, optionsJson } };
 }
 
 } // namespace openspace::properties