← Back to branch summary

~thomas-voss/location-service/next

« back to all changes in this revision

Viewing changes to src/location/providers/gps/provider.cpp

Merge lp:~thomas-voss/location-service/refactor-location-position.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/location/providers/gps/provider.cpp
45
45
        updates.position(Update<Position>(pos));
46
46
    });
47
47
 
48
 
    hal->heading_updates().connect([this](const location::Heading& heading)
 
48
    hal->heading_updates().connect([this](const units::Degrees& heading)
49
49
    {
50
 
        updates.heading(Update<Heading>(heading));
 
50
        updates.heading(Update<units::Degrees>(heading));
51
51
    });
52
52
 
53
 
    hal->velocity_updates().connect([this](const location::Velocity& velocity)
 
53
    hal->velocity_updates().connect([this](const units::MetersPerSecond& velocity)
54
54
    {
55
 
        updates.velocity(Update<Velocity>(velocity));
 
55
        updates.velocity(Update<units::MetersPerSecond>(velocity));
56
56
    });
57
57
 
58
58
    hal->space_vehicle_updates().connect([this](const std::set<location::SpaceVehicle>& svs)
102
102
    return updates.position;
103
103
}
104
104
 
105
 
const core::Signal<location::Update<location::Heading>>& location::providers::gps::Provider::heading_updates() const
 
105
const core::Signal<location::Update<location::units::Degrees>>& location::providers::gps::Provider::heading_updates() const
106
106
{
107
107
    return updates.heading;
108
108
}
109
109
 
110
 
const core::Signal<location::Update<location::Velocity>>& location::providers::gps::Provider::velocity_updates() const
 
110
const core::Signal<location::Update<location::units::MetersPerSecond>>& location::providers::gps::Provider::velocity_updates() const
111
111
{
112
112
    return updates.velocity;
113
113
}