Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/locationd:fix-grammar-geoid into ~snappy-hwe-team/snappy-hwe-snaps/+git/locationd:master

[Alfonso Sanchez-Beato]

Height of geoid above WGS84 can be negative. Additional fix for lp: #1715724.

[Roberto Mier Escandon (rmescandon)]

a question inline

review: Needs Information

[Simon Fels (morphis)]

review: Needs Fixing

[Roberto Mier Escandon (rmescandon)]

review: Approve

[Simon Fels (morphis)]

LGTM

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 9ac6a73ec477ec9576517b60b7d743840e7eb54d

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/882/

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:9ac6a73ec477ec9576517b60b7d743840e7eb54d
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/37/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/87
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/87
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/87
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/87
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/882
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/630
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/650/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/37/rebuild

review: Approve (continuous-integration)

diff --git a/src/location/nmea/grammar.h b/src/location/nmea/grammar.h
index 2223727..a9f86f5 100644
--- a/src/location/nmea/grammar.h
+++ b/src/location/nmea/grammar.h
@@ -99,7 +99,7 @@ public:
     hdop %= boost::spirit::qi::real_parser<float>();
     vdop %= boost::spirit::qi::real_parser<float>();
 
-    latitude %= boost::spirit::qi::uint_parser<std::uint32_t, 10, 2, 2>() >>                                                                             
+    latitude %= boost::spirit::qi::uint_parser<std::uint32_t, 10, 2, 2>() >>
                 boost::spirit::qi::real_parser<double, FixedPrecisionRealPolicy<2, double>>();
 
     longitude %= boost::spirit::qi::uint_parser<std::uint32_t, 10, 3, 3>() >>
@@ -131,7 +131,7 @@ public:
                   >> -hdop                                                                                        >> field_separator
                   >> -(boost::spirit::qi::real_parser<float, boost::spirit::qi::strict_ureal_policies<float>>())  >> field_separator
                   >> -boost::spirit::qi::lit('M')                                                                 >> field_separator
-                  >> -(boost::spirit::qi::real_parser<float, boost::spirit::qi::strict_ureal_policies<float>>())  >> field_separator
+                  >> -(boost::spirit::qi::real_parser<float, boost::spirit::qi::real_policies<float>>())          >> field_separator
                   >> -boost::spirit::qi::lit('M')                                                                 >> field_separator
                   >> -boost::spirit::qi::real_parser<float, boost::spirit::qi::strict_ureal_policies<float>>()    >> field_separator
                   >> -boost::spirit::qi::uint_parser<std::uint32_t, 10, 2, 2>();
diff --git a/src/location/providers/ubx/_8/receiver.cpp b/src/location/providers/ubx/_8/receiver.cpp
index dce4abd..2b52af7 100644
--- a/src/location/providers/ubx/_8/receiver.cpp
+++ b/src/location/providers/ubx/_8/receiver.cpp
@@ -1,6 +1,7 @@
 #include <location/providers/ubx/_8/receiver.h>
 
 #include <location/nmea/sentence.h>
+#include <location/logging.h>
 
 #include <iostream>
 
@@ -70,12 +71,17 @@ void ubx::_8::Receiver::process_chunk(Buffer::iterator it, Buffer::iterator itE)
                 {
                     monitor->on_new_nmea_sentence(nmea::parse_sentence(nmea_scanner.finalize()));
                 }
+                catch (const std::exception &e)
+                {
+                    LOG(ERROR) << "Exception while processing: " << e.what();
+                }
                 catch (...)
                 {
                     // Dropping the exception as there is hardly any reasonable measure
                     // we can take. Both scanners are designed to recover from issues, and we
                     // we just trap the exception here to guarantee that we keep on consuming the
                     // entire buffer.
+                    LOG(ERROR) << "Unknown exception while processing" << std::endl;
                 }
             }
         }