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

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index b4f9817ff..d6ee8da17 100644
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -24,72 +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>
-
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <istream>
-#elif defined( __BORLANDC__ ) || (__APPLE__)
-#  include <iostream>
-#else
-#  include <istream.h>
-#endif
-
-SG_USING_STD(istream);
-
-#include STL_STRING
-SG_USING_STD(string);
 
-// SG_USING_STD(cout);
-// SG_USING_STD(endl);
+#include <string>
 
+#include "positioned.hxx"
 
-class FGFix {
-
-    string ident;
-    double lon, lat;
-
+class FGFix : public FGPositioned
+{
 public:
+  FGFix(const std::string& aIdent, const SGGeod& aPos);
+  inline ~FGFix(void) {}
 
-    inline FGFix(void);
-    inline ~FGFix(void) {}
-
-    inline string get_ident() const { return ident; }
-    inline double get_lon() const { return lon; }
-    inline double get_lat() const { return lat; }
-
-    friend istream& operator>> ( 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 istream&
-operator >> ( 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