Merge branch 'hotfix/2.1.11'

dsarmany · dsarmany · commit 23ddfc3ea820 · 2024-12-04T12:02:55.000+01:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.0
+2.2.1
diff --git a/src/multio/action/encode/GribEncoder.cc b/src/multio/action/encode/GribEncoder.cc
@@ -715,7 +715,7 @@ void setDateAndStatisticalFields(GribEncoder& g, const message::Metadata& in,
                                       / 3600);
         }
 
-        if (operation) {
+        if (operation && (*operation != "instant")) {
             static const std::map<const std::string, const std::int64_t> TYPE_OF_STATISTICAL_PROCESSING{
                 {"average", 0}, {"accumulate", 1}, {"maximum", 2}, {"minimum", 3}, {"stddev", 6}};
             if (auto searchStat = TYPE_OF_STATISTICAL_PROCESSING.find(*operation);

Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ void setDateAndStatisticalFields(GribEncoder& g, const message::Metadata& in,`
`715`	`715`	`/ 3600);`
`716`	`716`	`}`
`717`	`717`
`718`		`- if (operation) {`
	`718`	`+ if (operation && (*operation != "instant")) {`
`719`	`719`	`static const std::map<const std::string, const std::int64_t> TYPE_OF_STATISTICAL_PROCESSING{`
`720`	`720`	`{"average", 0}, {"accumulate", 1}, {"maximum", 2}, {"minimum", 3}, {"stddev", 6}};`
`721`	`721`	`if (auto searchStat = TYPE_OF_STATISTICAL_PROCESSING.find(*operation);`