feat: added flag to ignore bitmask from CPS

Author: ewasjon

dependency/generator/tokoro/data/set.cpp

@@ -1,5 +1,5 @@
-#include "constant.hpp"
 #include "set.hpp"
+#include "constant.hpp"
 #include "decode.hpp"
 
 #pragma GCC diagnostic push
@@ -42,7 +42,8 @@ LOGLET_MODULE3(tokoro, data, set);
 namespace generator {
 namespace tokoro {
 
-bool CorrectionPointSet::array_to_index(long array_index, CorrectionPointInfo* result) const NOEXCEPT {
+bool CorrectionPointSet::array_to_index(long                 array_index,
+                                        CorrectionPointInfo* result) const NOEXCEPT {
     long array_count    = 0;
     long absolute_index = 0;
     for (long y = 0; y <= number_of_steps_latitude; y++) {
@@ -52,14 +53,18 @@ bool CorrectionPointSet::array_to_index(long array_index, CorrectionPointInfo* r
             auto is_valid = (bitmask & bit) != 0;
 
             if (array_count == array_index) {
-                result->array_index = array_index;
-                result->absolute_index = absolute_index;
-                result->is_valid = is_valid;
-                result->latitude_index = y;
-                result->longitude_index = x;
-                result->position.x = reference_point_latitude - static_cast<double>(y) * step_of_latitude;
-                result->position.y = reference_point_longitude + static_cast<double>(x) * step_of_longitude;
-                result->position.z = 0;
+                if (result) {
+                    result->array_index     = array_index;
+                    result->absolute_index  = absolute_index;
+                    result->is_valid        = is_valid;
+                    result->latitude_index  = y;
+                    result->longitude_index = x;
+                    result->position.x =
+                        reference_point_latitude - static_cast<double>(y) * step_of_latitude;
+                    result->position.y =
+                        reference_point_longitude + static_cast<double>(x) * step_of_longitude;
+                    result->position.z = 0;
+                }
                 return true;
             }
 

dependency/generator/tokoro/generator.cpp

@@ -524,15 +524,18 @@ std::vector<rtcm::Message> ReferenceStation::produce() NOEXCEPT {
 //
 
 Generator::Generator() NOEXCEPT {
+    FUNCTION_SCOPE();
     mIodConsistencyCheck                         = false;
     mUseReceptionTimeForOrbitAndClockCorrections = false;
     mUseOrbitCorrectionInIteration               = false;
+    mIgnoreBitmask                               = false;
 }
 
 Generator::~Generator() NOEXCEPT = default;
 
 std::shared_ptr<ReferenceStation>
 Generator::define_reference_station(ReferenceStationConfig const& config) NOEXCEPT {
+    FUNCTION_SCOPE();
     INFOF("define reference station:");
     INFOF("  ground position (itrf): (%f, %f, %f)", config.itrf_ground_position.x,
           config.itrf_ground_position.y, config.itrf_ground_position.z);
@@ -635,7 +638,26 @@ void Generator::find_correction_point_set(ProvideAssistanceData_r9_IEs const& me
         }
         correction_point_set.bitmask = bitmask;
 
-        mCorrectionPointSet.reset(new CorrectionPointSet(correction_point_set));
+        auto cps_ptr = new CorrectionPointSet(correction_point_set);
+
+        DEBUGF("  grid_point_count: %u", grid_point_count);
+        for (long i = 0; i < 64; i++) {
+            CorrectionPointInfo cpi{};
+            if (cps_ptr->array_to_index(i, &cpi)) {
+                DEBUGF("    %2ld: %2ld/%2ld %ld/%ld %s %+18.14f %+18.14f %+18.14f", i,
+                       cpi.absolute_index, cpi.array_index, cpi.latitude_index, cpi.longitude_index,
+                       cpi.is_valid ? "ok" : "--", cpi.position.x, cpi.position.y, cpi.position.z);
+            } else {
+                DEBUGF("    %2ld: invalid", i);
+            }
+        }
+
+        if (mIgnoreBitmask) {
+            NOTICEF("ignoring correction point bitmask");
+            cps_ptr->bitmask = 0xFFFFFFFFFFFFFFFF;
+        }
+
+        mCorrectionPointSet.reset(cps_ptr);
     } else {
         // TODO(ewasjon): [low-priority] Support list of correction points
         WARNF("unsupported correction point type");

dependency/generator/tokoro/include/generator/tokoro/generator.hpp

@@ -146,6 +146,7 @@ class Generator {
     void set_iod_consistency_check(bool enabled) NOEXCEPT { mIodConsistencyCheck = enabled; }
     void set_rtoc(bool enabled) NOEXCEPT { mUseReceptionTimeForOrbitAndClockCorrections = enabled; }
     void set_ocit(bool enabled) NOEXCEPT { mUseOrbitCorrectionInIteration = enabled; }
+    void set_ignore_bitmask(bool enabled) NOEXCEPT { mIgnoreBitmask = enabled; }
     void set_antex(std::unique_ptr<format::antex::Antex> antex) NOEXCEPT {
         mAntex = std::move(antex);
     }
@@ -177,6 +178,7 @@ class Generator {
     bool mIodConsistencyCheck;
     bool mUseReceptionTimeForOrbitAndClockCorrections;
     bool mUseOrbitCorrectionInIteration;
+    bool mIgnoreBitmask;
 
     friend struct Satellite;
     friend class ReferenceStation;

examples/client/config.hpp

@@ -326,6 +326,7 @@ struct TokoroConfig {
     bool use_ionospheric_height_correction;
 
     std::string antex_file;
+    bool ignore_bitmask;
 };
 #endif
 

examples/client/config/tokoro.cpp

@@ -242,6 +242,13 @@ static args::ValueFlag<std::string> gAntexFile{
     {"tkr-antex-file"},
 };
 
+static args::Flag gIgnoreBitmask{
+    gGroup,
+    "ignore-bitmask",
+    "Ignore GNSS-SSR-CorrectionPoints bitmask",
+    {"tkr-ignore-bitmask"},
+};
+
 static void setup() {
     gVrsModeArg.HelpChoices({"fixed", "dynamic"});
     gVrsModeArg.HelpDefault("dynamic");
@@ -292,6 +299,7 @@ static void parse(Config* config) {
     tokoro.time_step           = 1.0;
 
     tokoro.antex_file = "";
+    tokoro.ignore_bitmask = false;
 
     if (gEnable) tokoro.enabled = true;
     if (gNoGPS) tokoro.generate_gps = false;
@@ -374,6 +382,7 @@ static void parse(Config* config) {
     if (gUseTroposphericModel) tokoro.use_tropospheric_model = true;
     if (gUseIonosphericHeightCorrection) tokoro.use_ionospheric_height_correction = true;
     if (gAntexFile) tokoro.antex_file = gAntexFile.Get();
+    if (gIgnoreBitmask) tokoro.ignore_bitmask = true;
 }
 
 static void dump(TokoroConfig const& config) {
@@ -434,6 +443,7 @@ static void dump(TokoroConfig const& config) {
            config.use_ionospheric_height_correction ? "true" : "false");
 
     DEBUGF("antex file: \"%s\"", config.antex_file.c_str());
+    DEBUGF("ignore bitmask: %s", config.ignore_bitmask ? "true" : "false");
 }
 
 }  // namespace tokoro

examples/client/processor/tokoro.cpp

@@ -130,6 +130,7 @@ Tokoro::Tokoro(OutputConfig const& output, TokoroConfig const& config,
     mGenerator->set_iod_consistency_check(mConfig.iod_consistency_check);
     mGenerator->set_rtoc(mConfig.rtoc);
     mGenerator->set_ocit(mConfig.ocit);
+    mGenerator->set_ignore_bitmask(mConfig.ignore_bitmask);
 
     if (!config.antex_file.empty()) {
         auto result = format::antex::Antex::from_file(config.antex_file);