~thomas-voss/location-service/add-snapcraft-setup-next

« back to all changes in this revision

Viewing changes to src/location/criteria.cpp

Committer: Thomas Voß
Date: 2016-08-25 12:37:50 UTC
mfrom: (261.1.2 simplify-provider-interface)
Revision ID: thomas.voss@canonical.com-20160825123750-v2a0vin4fnw915rp

Merge lp:~thomas-voss/location-service/simplify-provider-interface.

files added:
include/location/event.h

include/location/events

include/location/events/reference_position_updated.h

include/location/events/wifi_and_cell_id_reporting_state_changed.h

include/location/features.h

src/location/bus.h

src/location/event.cpp

src/location/events

src/location/events/all.h

src/location/events/reference_position_updated.cpp

src/location/events/registry.cpp

src/location/events/registry.h

src/location/events/wifi_and_cell_id_reporting_state_changed.cpp

src/location/providers/fusion

src/location/providers/fusion/CMakeLists.txt

src/location/providers/proxy.cpp

src/location/providers/proxy.h

src/location/providers/state_tracking_provider.cpp

src/location/providers/state_tracking_provider.h

src/location/serializing_bus.cpp

src/location/serializing_bus.h

src/location/util/flags.h

tests/event_test.cpp

tests/reference_position_updated_test.cpp

tests/serializing_bus_test.cpp

tests/wifi_and_cell_id_reporting_state_changed_test.cpp

files removed:
src/location/criteria.cpp

src/location/default_provider_selection_policy.cpp

src/location/default_provider_selection_policy.h

src/location/dummy_service.cpp

src/location/dummy_service.h

src/location/providers/geoclue

src/location/providers/geoclue/CMakeLists.txt

src/location/providers/geoclue/geoclue.h

src/location/providers/geoclue/provider.cpp

src/location/providers/geoclue/provider.h

src/location/providers/skyhook

src/location/providers/skyhook/CMakeLists.txt

src/location/providers/skyhook/provider.cpp

src/location/providers/skyhook/provider.h

src/location/proxy_provider.cpp

src/location/proxy_provider.h

src/location/state_tracking_provider.h

tests/controller_test.cpp

tests/criteria_test.cpp

tests/provider_selection_policy_test.cpp

files renamed:
src/location/newer_or_more_accurate_update_selector.h => src/location/providers/fusion/newer_or_more_accurate_update_selector.h

src/location/newer_update_selector.h => src/location/providers/fusion/newer_update_selector.h

src/location/fusion_provider.cpp => src/location/providers/fusion/provider.cpp

src/location/fusion_provider.h => src/location/providers/fusion/provider.h

src/location/update_selector.h => src/location/providers/fusion/update_selector.h

files modified:
include/location/criteria.h

include/location/provider.h

src/location/CMakeLists.txt

src/location/cmds/provider.cpp

src/location/cmds/run.cpp

src/location/dbus/codec.h

src/location/dbus/skeleton/service.cpp

src/location/dbus/skeleton/session.cpp

src/location/dbus/skeleton/session.h

src/location/dbus/stub/service.cpp

src/location/engine.cpp

src/location/engine.h

src/location/fusion_provider_selection_policy.cpp

src/location/non_selecting_provider_selection_policy.cpp

src/location/provider.cpp

src/location/provider_selection.h

src/location/providers/CMakeLists.txt

src/location/providers/config.cpp

src/location/providers/dummy/provider.cpp

src/location/providers/dummy/provider.h

src/location/providers/gps/provider.cpp

src/location/providers/gps/provider.h

src/location/providers/remote/interface.h

src/location/providers/remote/provider.cpp

src/location/providers/remote/provider.h

src/location/providers/remote/stub.cpp

src/location/providers/remote/stub.h

src/location/runtime.h

src/location/service_with_engine.cpp

src/location/session_with_provider.cpp

tests/CMakeLists.txt

tests/acceptance_tests.cpp

tests/engine_test.cpp

tests/espoo_provider_test.cpp

tests/mock_provider.h

tests/provider_test.cpp

tests/remote_provider_test.cpp

tests/state_tracking_provider_test.cpp

Show diffs side-by-side

added added

removed removed

src/location/criteria.cpp

* This program is free software: you can redistribute it and/or modify it

* under the terms of the GNU Lesser General Public License version 3,

* as published by the Free Software Foundation.

* This program is distributed in the hope that it will be useful,

* but WITHOUT ANY WARRANTY; without even the implied warranty of

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

* GNU Lesser General Public License for more details.

* You should have received a copy of the GNU Lesser General Public License

* along with this program. If not, see <http://www.gnu.org/licenses/>.

* Authored by: Thomas Voß <thomas.voss@canonical.com>

#include <location/criteria.h>

bool location::Criteria::satisfies(const location::Criteria& rhs) const

{

bool result = false;

if (rhs.requires.position)

result &= requires.position;

if (rhs.requires.altitude)

result &= requires.altitude;

if (rhs.requires.heading)

result &= requires.heading;

if (rhs.requires.velocity)

result &= requires.velocity;

result &= accuracy.horizontal <= rhs.accuracy.horizontal;

if (rhs.accuracy.vertical)

result &= accuracy.vertical && accuracy.vertical <= rhs.accuracy.vertical;

if (rhs.accuracy.heading)

result &= accuracy.heading && accuracy.heading <= rhs.accuracy.heading;

if (rhs.accuracy.velocity)

result &= accuracy.velocity && accuracy.velocity <= rhs.accuracy.velocity;

return result;

}

location::Criteria location::operator+(

const location::Criteria& lhs,

const location::Criteria& rhs)

{

Criteria result{lhs};

result.requires.position |= rhs.requires.position;

result.requires.velocity |= rhs.requires.velocity;

result.requires.heading |= rhs.requires.heading;

result.requires.altitude |= rhs.requires.altitude;

if (rhs.accuracy.horizontal < result.accuracy.horizontal)

result.accuracy.horizontal = rhs.accuracy.horizontal;

if (result.accuracy.vertical)

{

if (rhs.accuracy.vertical && rhs.accuracy.vertical < result.accuracy.vertical)

{

result.accuracy.vertical = rhs.accuracy.vertical;

}

} else

{

result.accuracy.vertical = rhs.accuracy.vertical;

}

if (result.accuracy.velocity)

{

if (rhs.accuracy.velocity && rhs.accuracy.velocity < result.accuracy.velocity)

{

result.accuracy.velocity = rhs.accuracy.velocity;

}

} else

{

result.accuracy.velocity = rhs.accuracy.velocity;

}

if (result.accuracy.heading)

{

if (rhs.accuracy.heading && rhs.accuracy.heading < result.accuracy.heading)

{

result.accuracy.heading = rhs.accuracy.heading;

}

} else

{

result.accuracy.heading = rhs.accuracy.heading;

}

return result;

}

Older »