MIR-643 HEALPix orderingConvention=nested unit tests fixes

Author: pmaciel

src/mir/key/grid/HEALPixPattern.cc

@@ -14,11 +14,12 @@
 
 #include <ostream>
 
+#include "eckit/utils/StringTools.h"
 #include "eckit/utils/Translator.h"
+
 #include "mir/key/grid/NamedHEALPix.h"
 #include "mir/util/Exceptions.h"
 
-
 namespace mir::key::grid {
 
 
@@ -34,7 +35,13 @@ void HEALPixPattern::print(std::ostream& out) const {
 
 
 const Grid* HEALPixPattern::make(const std::string& name) const {
-    return new NamedHEALPix(name, eckit::Translator<std::string, size_t>()(name.substr(1)));
+    auto nested = eckit::StringTools::endsWith(name, "_nested");
+    ASSERT(!nested || name.size() > 8);
+
+    auto Nside = eckit::Translator<std::string, size_t>()(nested ? name.substr(1, name.size() - 8) : name.substr(1));
+
+    return new NamedHEALPix(name, Nside,
+                            nested ? NamedHEALPix::Ordering::healpix_nested : NamedHEALPix::Ordering::healpix_ring);
 }
 
 
@@ -45,6 +52,7 @@ std::string HEALPixPattern::canonical(const std::string& name, const param::MIRP
 
 
 static const HEALPixPattern __pattern1("^[hH][1-9][0-9]*$");
+static const HEALPixPattern __pattern2("^[hH][1-9][0-9]*_nested$");
 
 
 }  // namespace mir::key::grid

src/mir/key/grid/HEALPixPattern.h

@@ -26,8 +26,10 @@ class HEALPixPattern : public GridPattern {
 
     // -- Constructors
 
-    HEALPixPattern(const std::string& name);
+    explicit HEALPixPattern(const std::string& name);
+
     HEALPixPattern(const HEALPixPattern&) = delete;
+    HEALPixPattern(HEALPixPattern&&)      = delete;
 
     // -- Destructor
 
@@ -39,6 +41,7 @@ class HEALPixPattern : public GridPattern {
     // -- Operators
 
     HEALPixPattern& operator=(const HEALPixPattern&) = delete;
+    HEALPixPattern& operator=(HEALPixPattern&&)      = delete;
 
     // -- Methods
     // None

src/mir/key/grid/NamedHEALPix.cc

@@ -14,14 +14,15 @@
 
 #include <ostream>
 
-#include "mir/repres/proxy/HEALPix.h"
+#include "mir/repres/unsupported/HEALPixNested.h"
 #include "mir/util/Exceptions.h"
 
 
 namespace mir::key::grid {
 
 
-NamedHEALPix::NamedHEALPix(const std::string& name, size_t Nside) : NamedGrid(name), Nside_(Nside) {}
+NamedHEALPix::NamedHEALPix(const std::string& name, size_t Nside, Ordering ordering) :
+    NamedGrid(name), Nside_(Nside), ordering_(ordering) {}
 
 
 void NamedHEALPix::print(std::ostream& out) const {
@@ -30,6 +31,10 @@ void NamedHEALPix::print(std::ostream& out) const {
 
 
 const repres::Representation* NamedHEALPix::representation() const {
+    if (ordering_ == Ordering::healpix_nested) {
+        return new repres::unsupported::HEALPixNested(Nside_);
+    }
+
     return new repres::proxy::HEALPix(Nside_);
 }
 

src/mir/key/grid/NamedHEALPix.h

@@ -14,20 +14,27 @@
 
 
 #include "mir/key/grid/NamedGrid.h"
+#include "mir/repres/proxy/HEALPix.h"
 
 
 namespace mir::key::grid {
 
 
 class NamedHEALPix : public NamedGrid {
 public:
+    // -- Types
+
+    using Ordering = repres::proxy::HEALPix::Ordering;
+
     // -- Exceptions
     // None
 
     // -- Constructors
 
-    NamedHEALPix(const std::string& name, size_t Nside);
+    NamedHEALPix(const std::string& name, size_t Nside, Ordering);
+
     NamedHEALPix(const NamedHEALPix&) = delete;
+    NamedHEALPix(NamedHEALPix&&)      = delete;
 
     // -- Destructor
     // None
@@ -38,6 +45,7 @@ class NamedHEALPix : public NamedGrid {
     // -- Operators
 
     NamedHEALPix& operator=(const NamedHEALPix&) = delete;
+    NamedHEALPix& operator=(NamedHEALPix&&)      = delete;
 
     // -- Methods
     // None
@@ -73,9 +81,9 @@ class NamedHEALPix : public NamedGrid {
 
 private:
     // -- Members
-    // None
 
-    size_t Nside_;
+    const size_t Nside_;
+    const Ordering ordering_;
 
     // -- Methods
     // None

src/mir/repres/proxy/HEALPix.h

@@ -31,6 +31,12 @@ class HEALPix final : public ProxyGrid {
 public:
     // -- Types
 
+    enum Ordering
+    {
+        healpix_ring,
+        healpix_nested,
+    };
+
     class Reorder {
     public:
         explicit Reorder(int Nside);