flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 18:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T778, utility functions geo objects

Browse Source
This commit is contained in:
Klaus Basan
2020-04-07 00:07:51 +02:00
committed by Mat Sutcliffe
parent 2ace391325
commit 3ff8694718
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackmisc/geo/geoobjectlist.cpp
View File

@@ -52,6 +52,15 @@ namespace BlackMisc
}); });
} }
template <class OBJ, class CONTAINER>
CONTAINER IGeoObjectList<OBJ, CONTAINER>::findOutsideRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range) const
{
return this->container().findBy([&](const OBJ & geoObj)
{
return calculateGreatCircleDistance(geoObj, coordinate) > range;
});
}
template<class OBJ, class CONTAINER> template<class OBJ, class CONTAINER>
OBJ IGeoObjectList<OBJ, CONTAINER>::findFirstWithinRangeOrDefault(const ICoordinateGeodetic &coordinate, const CLength &range) const OBJ IGeoObjectList<OBJ, CONTAINER>::findFirstWithinRangeOrDefault(const ICoordinateGeodetic &coordinate, const CLength &range) const
{ {
@@ -147,6 +156,16 @@ namespace BlackMisc
return max; return max;
} }
template <class OBJ, class CONTAINER>
int IGeoObjectList<OBJ, CONTAINER>::removeInsideRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range)
{
const int size = this->container().size();
const CONTAINER copy = this->container().findOutsideRange(coordinate, range);
const int d = size - copy.size();
if (d > 0) { *this = copy; }
return d;
}
template <class OBJ, class CONTAINER> template <class OBJ, class CONTAINER>
int IGeoObjectList<OBJ, CONTAINER>::removeOutsideRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range) int IGeoObjectList<OBJ, CONTAINER>::removeOutsideRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range)
{ {

8
src/blackmisc/geo/geoobjectlist.h
View File

@@ -62,6 +62,11 @@ namespace BlackMisc
//! \param range within range of other position //! \param range within range of other position
CONTAINER findWithinRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range) const; CONTAINER findWithinRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range) const;
//! Find 0..n objects outside range of given coordinate
//! \param coordinate other position
//! \param range outside range of other position
CONTAINER findOutsideRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range) const;
//! Find first in range //! Find first in range
OBJ findFirstWithinRangeOrDefault(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range) const; OBJ findFirstWithinRangeOrDefault(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range) const;
@@ -86,6 +91,9 @@ namespace BlackMisc
//! Find min/max/average height //! Find min/max/average height
Aviation::CAltitude findMaxHeight() const; Aviation::CAltitude findMaxHeight() const;
//! Remove inside range
int removeInsideRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range);
//! Remove outside range //! Remove outside range
int removeOutsideRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range); int removeOutsideRange(const ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range);