From 7d9b19aefab6ab5e695fac607d0eb01c90cd7908 Mon Sep 17 00:00:00 2001
From: Philipp Geier <philipp.geier@ecmwf.int>
Date: Wed, 13 May 2026 09:16:44 +0000
Subject: [PATCH] Fix passing through misc keys in encode-mtg2

---
 src/multio/action/encode-mtg2/EncodeMtg2.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/multio/action/encode-mtg2/EncodeMtg2.cc b/src/multio/action/encode-mtg2/EncodeMtg2.cc
index a15d3a56f..1d3807d6d 100644
--- a/src/multio/action/encode-mtg2/EncodeMtg2.cc
+++ b/src/multio/action/encode-mtg2/EncodeMtg2.cc
@@ -46,7 +46,7 @@ std::unique_ptr<metkit::codes::CodesHandle> encode(metkit::mars2grib::Mars2Grib&
                                                    T* values, size_t size, const dm::FullMarsRecord& marsRec,
                                                    const dm::MiscRecord& miscRec) {
     const auto mars = dm::dumpRecord<eckit::LocalConfiguration>(marsRec);
-    const auto misc = dm::dumpRecord<eckit::LocalConfiguration>(miscRec);
+    const auto misc = dm::dumpUnscopedRecord<eckit::LocalConfiguration>(miscRec);
 
     if (!cache) {
         return encoder.encode(values, size, mars, misc);
@@ -88,10 +88,6 @@ void EncodeMtg2::executeImpl(Message msg) {
     // Apply mappings
     auto mappingResult = mars2mars::applyMappings(mars2mars::allRules(), marsRec, miscRec);
 
-    // Dump (mapped) mars and misc keys to local configurations
-    const auto mars = dm::dumpRecord<eckit::LocalConfiguration>(marsRec);
-    const auto misc = dm::dumpUnscopedRecord<eckit::LocalConfiguration>(miscRec);
-
     executeNext(dispatchPrecisionTag(msg.precision(), [&](auto pt) {
         using Precision = typename decltype(pt)::type;
         msg.payload().acquire();
@@ -123,7 +119,6 @@ void EncodeMtg2::executeImpl(Message msg) {
         eckit::Buffer buf{sample->messageSize()};
         sample->copyInto(reinterpret_cast<uint8_t*>(buf.data()), buf.size());
 
-        // TODO(pgeier) write mapped metadata
         return Message{Message::Header{Message::Tag::Field, Peer{msg.source()}, Peer{msg.destination()},
                                        dm::dumpRecord<message::Metadata>(marsRec)},
                        std::move(buf)};