Merge pull request riebl#234 from khevessy/socktap-gpsd

Fix my bugs in riebl#233
khevessy · Aug 23, 2024 · 234d00f · 234d00f
2 parents a63d1ae + 7b281ea
commit 234d00f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tools/socktap/cam_application.cpp b/tools/socktap/cam_application.cpp
@@ -79,7 +79,7 @@ void CamApplication::on_timer(Clock::time_point)
 
     auto position = positioning_.position_fix();
 
-    if (!std::isfinite(position.latitude.value()) || !std::isfinite(position.latitude.value())) {
+    if (!std::isfinite(position.latitude.value()) || !std::isfinite(position.longitude.value())) {
         std::cerr << "Skipping CAM, because no good position is available, yet." << std::endl;
         return;
     }

diff --git a/vanetza/facilities/cam_functions.cpp b/vanetza/facilities/cam_functions.cpp
@@ -151,10 +151,10 @@ void copy(const PositionFix& position, ReferencePosition& reference_position) {
     reference_position.longitude = round(position.longitude, microdegree) * Longitude_oneMicrodegreeEast;
     reference_position.latitude = round(position.latitude, microdegree) * Latitude_oneMicrodegreeNorth;
     if (std::isfinite(position.confidence.semi_major.value())
-        && std::isfinite(position.confidence.semi_major.value()))
+        && std::isfinite(position.confidence.semi_minor.value()))
     {
         if ((position.confidence.semi_major.value() * 100 < SemiAxisLength_outOfRange)
-            && (position.confidence.semi_major.value() * 100 < SemiAxisLength_outOfRange)
+            && (position.confidence.semi_minor.value() * 100 < SemiAxisLength_outOfRange)
             && (position.confidence.orientation.value() * 10 < HeadingValue_unavailable))
         {
             reference_position.positionConfidenceEllipse.semiMajorConfidence = position.confidence.semi_major.value() * 100;    // Value in centimeters