Merge lp:~thomas-voss/location-service/iterate-on-galileo-handling into lp:location-service

[Thomas Voß]

Enable support for GALILEO talker id.

Enable support for GALILEO talker id.

[Simon Fels (morphis)]

LGTM

review: Approve

=== modified file 'src/location/providers/ubx/_8/nmea/generator.h'
--- src/location/providers/ubx/_8/nmea/generator.h	2016-10-10 09:15:40 +0000
+++ src/location/providers/ubx/_8/nmea/generator.h	2017-03-09 09:45:55 +0000
@@ -58,6 +58,7 @@
     field_separator %= ',';
     checksum %= boost::spirit::karma::hex;
     talker.add
+        (Talker::ga, "GA")
         (Talker::gl, "GL")
         (Talker::gn, "GN")
         (Talker::gp, "GP");
@@ -165,7 +166,7 @@
                   << boost::spirit::karma::maxwidth(1)[-boost::spirit::karma::uint_generator<std::uint8_t, 10>()]           << field_separator
                   << boost::spirit::karma::maxwidth(1)[-boost::spirit::karma::uint_generator<std::uint8_t, 10>()]           << field_separator
                   << boost::spirit::karma::right_align(2, '0')[-boost::spirit::karma::uint_generator<std::uint16_t, 10>()]
-                  << +(gsv_info);
+                  << *(gsv_info);
 
     rmc %= talker << "RMC"                                                                              << field_separator
                   << -utc                                                                               << field_separator
 
=== modified file 'src/location/providers/ubx/_8/nmea/grammar.h'
--- src/location/providers/ubx/_8/nmea/grammar.h	2016-10-10 09:15:40 +0000
+++ src/location/providers/ubx/_8/nmea/grammar.h	2017-03-09 09:45:55 +0000
@@ -60,6 +60,7 @@
     field_separator %= ',';
     checksum %= boost::spirit::qi::hex;
     talker.add
+        ("GA", Talker::ga)
         ("GL", Talker::gl)
         ("GN", Talker::gn)
         ("GP", Talker::gp);
@@ -164,7 +165,7 @@
                   >> -boost::spirit::qi::uint_parser<std::uint8_t, 10, 1, 1>()  >> field_separator
                   >> -boost::spirit::qi::uint_parser<std::uint8_t, 10, 1, 1>()  >> field_separator
                   >> -boost::spirit::qi::uint_parser<std::uint16_t, 10, 2, 2>()
-                  >> +(gsv_info);
+                  >> *(gsv_info);
 
     rmc %= talker >> "RMC"                                                                                        >> field_separator
                   >> -utc                                                                                         >> field_separator
 
=== modified file 'src/location/providers/ubx/_8/nmea/talker.h'
--- src/location/providers/ubx/_8/nmea/talker.h	2016-10-10 09:15:40 +0000
+++ src/location/providers/ubx/_8/nmea/talker.h	2017-03-09 09:45:55 +0000
@@ -28,6 +28,7 @@
 /// @brief Talker enumerates well-known participants on an NMEA bus.
 enum class Talker
 {
+    ga, ///< GALILEO receiver
     gl, ///< GLONASS receiver
     gn, ///< Global Navigation Satellite System (GNSS)
     gp  ///< Global Positioning System (GPS)