Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Environment / realwx_ctrl.cxx

diff --git a/src/Environment/realwx_ctrl.cxx b/src/Environment/realwx_ctrl.cxx
index 08b3e348d1e52ee1ed54a814b45abbda2a3beb69..0e38d9355d3d6fcf8c5b7cbf295bcc8b897bf49b 100644 (file)
--- a/src/Environment/realwx_ctrl.cxx
+++ b/src/Environment/realwx_ctrl.cxx
@@ -25,42 +25,25 @@
 #endif
 
 #include "realwx_ctrl.hxx"
-#include "metarproperties.hxx"
-#include "metarairportfilter.hxx"
-#include "fgmetar.hxx"
-
-#include <Main/fg_props.hxx>
 
+#include <algorithm>
 #include <boost/foreach.hpp>
 
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/strutils.hxx>
 #include <simgear/props/tiedpropertylist.hxx>
-#include <simgear/io/HTTPClient.hxx>
 #include <simgear/io/HTTPRequest.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/structure/event_mgr.hxx>
 
-#include <algorithm>
+#include "metarproperties.hxx"
+#include "metarairportfilter.hxx"
+#include "fgmetar.hxx"
+#include <Network/HTTPClient.hxx>
+#include <Main/fg_props.hxx>
 
 namespace Environment {
-/* -------------------------------------------------------------------------------- */
 
-class FGHTTPClient : public simgear::HTTP::Client {
-public:
-    FGHTTPClient();
-};
-
-FGHTTPClient::FGHTTPClient()
-{
-    string proxyHost(fgGetString("/sim/presets/proxy/host"));
-    int proxyPort(fgGetInt("/sim/presets/proxy/port"));
-    string proxyAuth(fgGetString("/sim/presets/proxy/auth"));
-    
-    if (!proxyHost.empty()) {
-        setProxy(proxyHost, proxyPort, proxyAuth);
-    }
-}
 
 /* -------------------------------------------------------------------------------- */
 
@@ -295,14 +278,12 @@ void BasicRealWxController::checkNearbyMetar()
 class NoaaMetarRealWxController : public BasicRealWxController, MetarRequester {
 public:
     NoaaMetarRealWxController( SGPropertyNode_ptr rootNode );
-    virtual ~NoaaMetarRealWxController();
-    virtual void update( double dt );
 
     // implementation of MetarRequester
     virtual void requestMetar( MetarDataHandler * metarDataHandler, const std::string & id );
 
 private:
-    FGHTTPClient _http;
+    
 };
 
 NoaaMetarRealWxController::NoaaMetarRealWxController( SGPropertyNode_ptr rootNode ) :
@@ -310,16 +291,6 @@ NoaaMetarRealWxController::NoaaMetarRealWxController( SGPropertyNode_ptr rootNod
 {
 }
 
-NoaaMetarRealWxController::~NoaaMetarRealWxController()
-{
-}
-
-void NoaaMetarRealWxController::update( double dt )
-{
-    _http.update();
-    BasicRealWxController::update( dt );
-}
-
 void NoaaMetarRealWxController::requestMetar( MetarDataHandler * metarDataHandler, const std::string & id )
 {
     class NoaaMetarGetRequest : public simgear::HTTP::Request
@@ -373,8 +344,8 @@ void NoaaMetarRealWxController::requestMetar( MetarDataHandler * metarDataHandle
               }
           }
 
-          bool fromMetarProxy() const
-          { return _fromProxy; }
+//          bool fromMetarProxy() const
+//          { return _fromProxy; }
     private:  
         string _metar;
         bool _fromProxy;
@@ -384,7 +355,7 @@ void NoaaMetarRealWxController::requestMetar( MetarDataHandler * metarDataHandle
 
     SG_LOG(SG_ENVIRONMENT, SG_INFO, 
         "NoaaMetarRealWxController::update(): spawning load request for station-id '" << id << "'" );
-    _http.makeRequest(new NoaaMetarGetRequest(metarDataHandler, id));
+    FGHTTPClient::instance()->makeRequest(new NoaaMetarGetRequest(metarDataHandler, id));
 }
 
 /* -------------------------------------------------------------------------------- */