X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Ffix.hxx;h=d6ee8da17ee83af3d220d22284e7b0b2bf93c0a6;hb=1d4aaa2f0d84a5278689913563ca742c9d291a73;hp=666966a82e1c49b362dd8b5a05dfc8173d813e78;hpb=eccddb3dfd662ec6ac2af44f614439dfb8ab70c3;p=flightgear.git

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index 666966a82..d6ee8da17 100644
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -24,63 +24,21 @@
 #ifndef _FG_FIX_HXX
 #define _FG_FIX_HXX
 
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
-#include <simgear/misc/sgstream.hxx>
-
-#  include <istream>
-
-#include STL_STRING
-
-// SG_USING_STD(cout);
-// SG_USING_STD(endl);
 
+#include <string>
 
-class FGFix {
-
-    std::string ident;
-    double lon, lat;
+#include "positioned.hxx"
 
+class FGFix : public FGPositioned
+{
 public:
+  FGFix(const std::string& aIdent, const SGGeod& aPos);
+  inline ~FGFix(void) {}
 
-    inline FGFix(void);
-    inline ~FGFix(void) {}
-
-    inline const std::string& get_ident() const { return ident; }
-    inline double get_lon() const { return lon; }
-    inline double get_lat() const { return lat; }
-
-    friend std::istream& operator>> ( std::istream&, FGFix& );
+  inline const std::string& get_ident() const { return ident(); }
+  inline double get_lon() const { return longitude(); }
+  inline double get_lat() const { return latitude(); }
 };
 
-
-inline
-FGFix::FGFix()
-  : ident(""),
-    lon(0.0),
-    lat(0.0)
-{
-}
-
-
-inline std::istream&
-operator >> ( std::istream& in, FGFix& f )
-{
-    in >> f.lat;
-
-    if ( f.lat > 95.0 ) {
-        return in >> skipeol;
-    }
-    in >> f.lon >> f.ident;
-
-    // cout << "id = " << f.ident << endl;
-
-    return in >> skipeol;
-}
-
-
 #endif // _FG_FIX_HXX