Call GRIB2 encoder in metkit from grib1-to-grib2 tool

Author: tweska

src/multio/tools/grib1-to-grib2.cc

@@ -30,14 +30,13 @@
 #include "eckit/option/SimpleOption.h"
 #include "metkit/codes/CodesContent.h"
 #include "metkit/codes/api/CodesAPI.h"
-#include "multio/LibMultio.h"
+#include "metkit/mars2grib/api/Grib2Encoder.h"
 #include "multio/datamod/AtlasGeo.h"
 #include "multio/datamod/core/Record.h"
 #include "multio/tools/MultioTool.h"
 
 #include "multio/datamod/ContainerInterop.h"
 #include "multio/datamod/MarsMiscGeo.h"
-#include "multio/mars2grib/api/RawAPI.h"
 #include "multio/mars2mars/Rules.h"
 #include "multio/util/Print.h"
 
@@ -1005,7 +1004,7 @@ void Grib1ToGrib2::execute(const eckit::option::CmdArgs& args) {
     // optDict.set("print-whole-error-stack", std::to_string(verbosity_ > 1 ? 1 : 0));
     // optDict.set("print-dictionaries", std::to_string(verbosity_ > 1 ? 1 : 0));
 
-    mars2grib::Mars2GribRaw mars2grib{};
+    metkit::mars2grib::Grib2Encoder encoder{};
 
     eckit::message::Message msg;
     while ((msg = reader.next())) {
@@ -1129,9 +1128,14 @@ void Grib1ToGrib2::execute(const eckit::option::CmdArgs& args) {
             datamod::applyRecordDefaults(misc);
             datamod::validateRecord(misc);
 
-            std::unique_ptr<metkit::codes::CodesHandle> preparedHandle = mars2grib.getHandle(mars, misc, geo);
-            preparedHandle->set("values", values);
+            // Convert mars/misc/geo to eckit::LocalConfiguration
+            const auto marsConfig = dm::dumpRecord<eckit::LocalConfiguration>(mars);
+            const auto miscConfig = dm::dumpRecord<eckit::LocalConfiguration>(misc);
+            const auto geomConfig
+                = std::visit([](const auto& geomRec) { return dm::dumpRecord<eckit::LocalConfiguration>(geomRec); }, geo);
 
+            // Call the GRIB2 encoder in metkit
+            auto preparedHandle = encoder.encode(marsConfig, miscConfig, geomConfig, values);
 
             // Apply more changes
             extract::postFixToolOnly(*inputHandle.get(), *preparedHandle.get());