MapWidget: make use of the new POI system and display cities on the map.

[flightgear.git] / src / Main / fg_props.hxx

diff --git a/src/Main/fg_props.hxx b/src/Main/fg_props.hxx
index 756ac763b349d48dddd01441f64c5b6137927e1a..81f4baffb571b2febebff1b0bc32525a9238ba4e 100644 (file)
--- a/src/Main/fg_props.hxx
+++ b/src/Main/fg_props.hxx
@@ -9,7 +9,7 @@
 #include <iosfwd>
 
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/math/SGMath.hxx>
+#include <simgear/props/tiedpropertylist.hxx>
 
 #include <Main/globals.hxx>
 
@@ -27,6 +27,18 @@ public:
     void bind ();
     void unbind ();
     void update (double dt);
+
+private:
+    simgear::TiedPropertyList _tiedProperties;
+
+    static const char* getLatitudeString ();
+    static const char* getLongitudeString ();
+
+    static SGConstPropertyNode_ptr _longDeg, _latDeg, _lonLatformat;
+
+    SGPropertyNode_ptr _offset;
+    SGPropertyNode_ptr _uyear, _umonth, _uday, _uhour, _umin, _usec, _uwday, _udsec;
+    SGPropertyNode_ptr _ryear, _rmonth, _rday, _rhour, _rmin, _rsec, _rwday, _rdsec;
 };
 
 
@@ -296,7 +308,7 @@ inline int fgGetInt (const std::string & name, int defaultValue = 0)
  *        does not exist.
  * @return The property's value as a long, or the default value provided.
  */
-extern int fgGetLong (const char * name, long defaultValue = 0L);
+extern long fgGetLong (const char * name, long defaultValue = 0L);
 
 /**
  * Get a long value for a property.
@@ -312,7 +324,7 @@ extern int fgGetLong (const char * name, long defaultValue = 0L);
  *        does not exist.
  * @return The property's value as a long, or the default value provided.
  */
-inline int fgGetLong (const std::string & name, long defaultValue = 0L)
+inline long fgGetLong (const std::string & name, long defaultValue = 0L)
 {
     return fgGetLong( name.c_str(), defaultValue );
 }