#include <vector>
#include <simgear/structure/SGSharedPtr.hxx>
-#include <simgear/bucket/newbucket.hxx>
+#include <simgear/math/SGMath.hxx>
class FGPositioned;
SEAPORT,
RUNWAY,
TAXIWAY,
+ PAVEMENT,
PARK_STAND,
+ WAYPOINT,
FIX,
VOR,
NDB,
DME,
TACAN,
OBSTACLE,
- WAYPOINT, // user-defined waypoint
FREQ_GND,
FREQ_TWR,
FREQ_ATIS,
{ return mPosition; }
/**
- * Compute the cartesian position associated with this object
+ * The cartesian position associated with this object
*/
- SGVec3d cart() const;
+ const SGVec3d& cart() const;
- SGBucket bucket() const;
-
double latitude() const
{ return mPosition.getLatitudeDeg(); }
static FGPositionedRef findNextWithPartialId(FGPositionedRef aCur, const std::string& aId, Filter* aFilter = NULL);
/**
- * Find all items with the specified ident, and return then sorted by
- * distance from a position
- *
+ * Find all items with the specified ident
* @param aFilter - optional filter on items
*/
- static List findAllWithIdentSortedByRange(const std::string& aIdent, const SGGeod& aPos, Filter* aFilter = NULL);
+ static List findAllWithIdent(const std::string& aIdent, Filter* aFilter = NULL, bool aExact = true);
+
+ /**
+ * As above, but searches names instead of idents
+ */
+ static List findAllWithName(const std::string& aName, Filter* aFilter = NULL, bool aExact = true);
+
+ /**
+ * Sort an FGPositionedList by distance from a position
+ */
+ static void sortByRange(List&, const SGGeod& aPos);
/**
* Find the closest item to a position, which pass the specified filter
* Very large cutoff values will make this slow.
*
* @result The matches (possibly less than N, depending on the filter and cutoff),
- * sorted by distance from the search pos
+ * sorted by distance from the search pos
* @param aN - number of matches to find
* @param aCutoffNm - maximum distance to search within, in nautical miles
*/
static List findClosestN(const SGGeod& aPos, unsigned int aN, double aCutoffNm, Filter* aFilter = NULL);
-
+ /**
+ * Map a candidate type string to a real type. Returns INVALID if the string
+ * does not correspond to a defined type.
+ */
+ static Type typeFromName(const std::string& aName);
/**
- * Debug helper, map a type to a human-readable string
+ * Map a type to a human-readable string
*/
static const char* nameForType(Type aTy);
+
+ static FGPositioned* createUserWaypoint(const std::string& aIdent, const SGGeod& aPos);
protected:
- FGPositioned(Type ty, const std::string& aIdent, const SGGeod& aPos, bool aIndex = true);
+ FGPositioned(Type ty, const std::string& aIdent, const SGGeod& aPos);
+
+ void init(bool aIndexed);
// can't be const right now, navrecord at least needs to fix up the position
// after navaids are parsed
SGGeod mPosition;
+ SGVec3d mCart; // once mPosition is const, this can be const too
const Type mType;
const std::string mIdent;
};