mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 21:13:35 +00:00
Format all C++ and Java code via clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
@@ -9,7 +9,8 @@
|
||||
#if defined(OMIM_OS_MAC)
|
||||
std::unique_ptr<location::LocationService> CreateAppleLocationService(location::LocationObserver &);
|
||||
#elif defined(QT_LOCATION_SERVICE)
|
||||
std::unique_ptr<location::LocationService> CreateQtLocationService(location::LocationObserver &, std::string const & sourceName);
|
||||
std::unique_ptr<location::LocationService> CreateQtLocationService(location::LocationObserver &,
|
||||
std::string const & sourceName);
|
||||
#endif
|
||||
|
||||
namespace location
|
||||
@@ -25,6 +26,7 @@ static double ApproxDistanceSquareInMeters(double lat1, double lon1, double lat2
|
||||
class PositionFilter
|
||||
{
|
||||
std::optional<location::GpsInfo> m_prevLocation;
|
||||
|
||||
public:
|
||||
/// @return true if location should be sent to observers
|
||||
bool Passes(location::GpsInfo const & newLocation)
|
||||
@@ -37,13 +39,11 @@ public:
|
||||
{
|
||||
if (newLocation.m_timestamp < m_prevLocation->m_timestamp)
|
||||
passes = false;
|
||||
else if (newLocation.m_source != m_prevLocation->m_source
|
||||
&& newLocation.m_horizontalAccuracy > m_prevLocation->m_horizontalAccuracy
|
||||
&& ApproxDistanceSquareInMeters(newLocation.m_latitude,
|
||||
newLocation.m_longitude,
|
||||
m_prevLocation->m_latitude,
|
||||
m_prevLocation->m_longitude)
|
||||
> newLocation.m_horizontalAccuracy * newLocation.m_horizontalAccuracy)
|
||||
else if (newLocation.m_source != m_prevLocation->m_source &&
|
||||
newLocation.m_horizontalAccuracy > m_prevLocation->m_horizontalAccuracy &&
|
||||
ApproxDistanceSquareInMeters(newLocation.m_latitude, newLocation.m_longitude, m_prevLocation->m_latitude,
|
||||
m_prevLocation->m_longitude) >
|
||||
newLocation.m_horizontalAccuracy * newLocation.m_horizontalAccuracy)
|
||||
passes = false;
|
||||
}
|
||||
else
|
||||
@@ -52,49 +52,47 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
class DesktopLocationService : public LocationService, public LocationObserver
|
||||
class DesktopLocationService
|
||||
: public LocationService
|
||||
, public LocationObserver
|
||||
{
|
||||
std::vector<std::unique_ptr<LocationService>> m_services;
|
||||
PositionFilter m_filter;
|
||||
bool m_reportFirstEvent;
|
||||
|
||||
virtual void OnLocationError(location::TLocationError errorCode) { m_observer.OnLocationError(errorCode); }
|
||||
|
||||
virtual void OnLocationUpdated(GpsInfo const & info)
|
||||
{
|
||||
std::vector<std::unique_ptr<LocationService>> m_services;
|
||||
PositionFilter m_filter;
|
||||
bool m_reportFirstEvent;
|
||||
if (m_filter.Passes(info))
|
||||
m_observer.OnLocationUpdated(info);
|
||||
}
|
||||
|
||||
virtual void OnLocationError(location::TLocationError errorCode)
|
||||
{
|
||||
m_observer.OnLocationError(errorCode);
|
||||
}
|
||||
|
||||
virtual void OnLocationUpdated(GpsInfo const & info)
|
||||
{
|
||||
if (m_filter.Passes(info))
|
||||
m_observer.OnLocationUpdated(info);
|
||||
}
|
||||
|
||||
public:
|
||||
explicit DesktopLocationService(LocationObserver & observer)
|
||||
: LocationService(observer), m_reportFirstEvent(true)
|
||||
{
|
||||
public:
|
||||
explicit DesktopLocationService(LocationObserver & observer) : LocationService(observer), m_reportFirstEvent(true)
|
||||
{
|
||||
#if defined(QT_LOCATION_SERVICE)
|
||||
#if defined(OMIM_OS_LINUX)
|
||||
m_services.push_back(CreateQtLocationService(*this, "geoclue2"));
|
||||
#endif // OMIM_OS_LINUX
|
||||
#elif defined(APPLE_LOCATION_SERVICE) // No QT_LOCATION_SERVICE
|
||||
m_services.push_back(CreateAppleLocationService(*this));
|
||||
#endif // QT_LOCATION_SERVICE
|
||||
}
|
||||
m_services.push_back(CreateQtLocationService(*this, "geoclue2"));
|
||||
#endif // OMIM_OS_LINUX
|
||||
#elif defined(APPLE_LOCATION_SERVICE) // No QT_LOCATION_SERVICE
|
||||
m_services.push_back(CreateAppleLocationService(*this));
|
||||
#endif // QT_LOCATION_SERVICE
|
||||
}
|
||||
|
||||
virtual void Start()
|
||||
{
|
||||
for (auto & service : m_services)
|
||||
service->Start();
|
||||
}
|
||||
virtual void Start()
|
||||
{
|
||||
for (auto & service : m_services)
|
||||
service->Start();
|
||||
}
|
||||
|
||||
virtual void Stop()
|
||||
{
|
||||
for (auto & service : m_services)
|
||||
service->Stop();
|
||||
m_reportFirstEvent = true;
|
||||
}
|
||||
};
|
||||
virtual void Stop()
|
||||
{
|
||||
for (auto & service : m_services)
|
||||
service->Stop();
|
||||
m_reportFirstEvent = true;
|
||||
}
|
||||
};
|
||||
} // namespace location
|
||||
|
||||
std::unique_ptr<location::LocationService> CreateDesktopLocationService(location::LocationObserver & observer)
|
||||
|
||||
Reference in New Issue
Block a user