improved behavior (preserve numerical type if gathering native levelist) + tests

Author: danovaro

src/metkit/codes/GRIBDecoder.cc

@@ -57,22 +57,23 @@ void GRIBDecoder::getMetadata(const eckit::message::Message& msg, eckit::message
             continue;
         }
 
-        if (k.name() == "levelist") {
-            eckit::Translator<double, std::string> t;
-            gather.setValue(name, t(k.getDouble()));
-            continue;
-        }
-
         switch (options.valueRepresentation) {
             case eckit::message::ValueRepresentation::String: {
-                gather.setValue(name, k.getString());
+                if (k.name() == "levelist") {
+                    eckit::Translator<double, std::string> t;
+                    gather.setValue(name, t(k.getDouble()));
+                }
+                else { gather.setValue(name, k.getString()); }
                 break;
             }
             case eckit::message::ValueRepresentation::Native: {
                 std::visit(
                     [&](auto&& v) {
                         using Type = std::decay_t<decltype(v)>;
-                        if constexpr (std::is_same_v<Type, std::string> || std::is_arithmetic_v<Type>) {
+                        if (k.name() == "levelist") {
+                            gather.setValue(name, k.getDouble());
+                        }
+                        else if constexpr (std::is_same_v<Type, std::string> || std::is_arithmetic_v<Type>) {
                             gather.setValue(name, std::forward<decltype(v)>(v));
                         }
                         else if constexpr (std::is_same_v<Type, std::vector<uint8_t>>) {

tests/CMakeLists.txt

@@ -25,6 +25,9 @@ ecbuild_get_test_multidata( TARGET metkit_get_odb_data
                                   multiodb2.odb
                             NOCHECK )
 
+configure_file(pl.grib pl.grib COPYONLY)
+configure_file(sol.grib sol.grib COPYONLY)
+
 add_custom_target(soft_link_expand_test_data ALL
                   COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/expand" "${CMAKE_CURRENT_BINARY_DIR}/expand")
 

tests/pl.grib

@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "eckit/config/LocalConfiguration.h"
+#include "eckit/io/FileHandle.h"
 #include "eckit/io/MemoryHandle.h"
 #include "eckit/message/Message.h"
 #include "eckit/message/Reader.h"
@@ -454,6 +455,93 @@ CASE("test codessplitter unstr_latlot.tmpl String") {
     }
 }
 
+CASE("test levelist String") {
+    eckit::FileHandle f("pl.grib");
+
+    eckit::message::Reader reader(f);
+    eckit::message::Message msg;
+
+    std::vector<std::string> expect{"0", "0.02", "0.2", "2", "20", "200"};
+    for (size_t i = 0; i < expect.size(); ++i) {
+        msg = reader.next();
+        EXPECT(msg);
+
+        MetadataSetter md;
+        eckit::message::TypedSetter<MetadataSetter> gatherer{md};
+        eckit::message::GetMetadataOptions mdOpts{};
+        mdOpts.valueRepresentation = eckit::message::ValueRepresentation::String;
+        msg.getMetadata(gatherer, mdOpts);
+        { MD_EXPECT_STRING(md, "levelist", expect[i]); }
+    }
+    msg = reader.next();
+    EXPECT(!msg);
+}
+
+CASE("test levelist Native") {
+    eckit::FileHandle f("pl.grib");
+
+    eckit::message::Reader reader(f);
+    eckit::message::Message msg;
+
+    std::vector<double> expect{0, 0.02, 0.2, 2, 20, 200};
+    for (size_t i = 0; i < expect.size(); ++i) {
+        msg = reader.next();
+        EXPECT(msg);
+
+        MetadataSetter md;
+        eckit::message::TypedSetter<MetadataSetter> gatherer{md};
+        eckit::message::GetMetadataOptions mdOpts{};
+        mdOpts.valueRepresentation = eckit::message::ValueRepresentation::Native;
+        msg.getMetadata(gatherer, mdOpts);
+        { MD_EXPECT_DOUBLE(md, "levelist", expect[i]); }
+    }
+    msg = reader.next();
+    EXPECT(!msg);
+}
+
+CASE("test levelist String") {
+    eckit::FileHandle f("sol.grib");
+
+    eckit::message::Reader reader(f);
+    eckit::message::Message msg;
+
+    std::vector<std::string> expect{"0.02", "0.2", "2", "20"};
+    for (size_t i = 0; i < expect.size(); ++i) {
+        msg = reader.next();
+        EXPECT(msg);
+
+        MetadataSetter md;
+        eckit::message::TypedSetter<MetadataSetter> gatherer{md};
+        eckit::message::GetMetadataOptions mdOpts{};
+        mdOpts.valueRepresentation = eckit::message::ValueRepresentation::String;
+        msg.getMetadata(gatherer, mdOpts);
+        { MD_EXPECT_STRING(md, "levelist", expect[i]); }
+    }
+    msg = reader.next();
+    EXPECT(!msg);
+}
+
+CASE("test levelist Native") {
+    eckit::FileHandle f("sol.grib");
+
+    eckit::message::Reader reader(f);
+    eckit::message::Message msg;
+
+    std::vector<double> expect{0.02, 0.2, 2, 20};
+    for (size_t i = 0; i < expect.size(); ++i) {
+        msg = reader.next();
+        EXPECT(msg);
+
+        MetadataSetter md;
+        eckit::message::TypedSetter<MetadataSetter> gatherer{md};
+        eckit::message::GetMetadataOptions mdOpts{};
+        mdOpts.valueRepresentation = eckit::message::ValueRepresentation::Native;
+        msg.getMetadata(gatherer, mdOpts);
+        { MD_EXPECT_DOUBLE(md, "levelist", expect[i]); }
+    }
+    msg = reader.next();
+    EXPECT(!msg);
+}
 
 //----------------------------------------------------------------------------------------------------------------------