Progress towards testing

[flightgear.git] / src / Main / metar_main.cxx

diff --git a/src/Main/metar_main.cxx b/src/Main/metar_main.cxx
index 40784732ee6bee625fab001febf37dd8f42f0901..977ebf4c1f6f05889d2b59b4548d81363e2e3a6e 100644 (file)
--- a/src/Main/metar_main.cxx
+++ b/src/Main/metar_main.cxx
@@ -22,17 +22,27 @@
 
 #include <iomanip>
 #include <sstream>
+#include <iostream>
 #include <string.h>
+#include <time.h>
+#include <cstdlib>
+#include <cstdio>
+
+#include <boost/algorithm/string.hpp>
 
-#include <simgear/debug/logstream.hxx>
 #include <simgear/environment/metar.hxx>
 #include <simgear/structure/exception.hxx>
 
+#include <simgear/io/HTTPClient.hxx>
+#include <simgear/io/HTTPMemoryRequest.hxx>
+#include <simgear/io/raw_socket.hxx>
+#include <simgear/timing/timestamp.hxx>
+
 using namespace std;
+using namespace simgear;
 
 // text color
-#if defined(__linux__) || defined(__sun) || defined(__CYGWIN__) \
-    || defined( __FreeBSD__ ) || defined ( sgi )
+#if defined(__linux__) || defined(__sun) || defined(__CYGWIN__) || defined( __FreeBSD__ ) || defined ( sgi )
 #      define R "\033[31;1m"           // red
 #      define G "\033[32;1m"           // green
 #      define Y "\033[33;1m"           // yellow
@@ -75,7 +85,7 @@ const char *azimuthName(double d)
 double rnd(double r, int g = 0)
 {
        double f = pow(10.0, g);
-       return f * rint(r / f);
+       return f * floor(r / f + 0.5);
 }
 
 
@@ -177,7 +187,7 @@ void printReport(SGMetar *m)
                if ((i = m->getWindDir()) == -1)
                        cout << "from variable directions";
                else
-                       cout << "from the " << azimuthName(i) << " (" << i << "°)";
+                       cout << "from the " << azimuthName(i) << " (" << i << "°)";
                cout << " at " << rnd(d, -1) << " km/h";
 
                cout << "\t\t" << rnd(m->getWindSpeed_kt(), -1) << " kt";
@@ -198,19 +208,19 @@ void printReport(SGMetar *m)
                if (from != to) {
                        cout << "\t\t\tvariable from " << azimuthName(from);
                        cout << " to " << azimuthName(to);
-                       cout << " (" << from << "°--" << to << "°)" << endl;
+                       cout << " (" << from << "°--" << to << "°)" << endl;
                }
        }
 
 
        // temperature/humidity/air pressure
        if ((d = m->getTemperature_C()) != NaN) {
-               cout << "Temperature:\t\t" << d << "°C\t\t\t\t\t";
-               cout << rnd(m->getTemperature_F(), -1) << "°F" << endl;
+               cout << "Temperature:\t\t" << d << "°C\t\t\t\t\t";
+               cout << rnd(m->getTemperature_F(), -1) << "°F" << endl;
 
                if ((d = m->getDewpoint_C()) != NaN) {
-                       cout << "Dewpoint:\t\t" << d << "°C\t\t\t\t\t";
-                       cout << rnd(m->getDewpoint_F(), -1) << "°F"  << endl;
+                       cout << "Dewpoint:\t\t" << d << "°C\t\t\t\t\t";
+                       cout << rnd(m->getDewpoint_F(), -1) << "°F"  << endl;
                        cout << "Rel. Humidity:\t\t" << rnd(m->getRelHumidity()) << "%" << endl;
                }
        }
@@ -279,7 +289,7 @@ void printReport(SGMetar *m)
                        surface.push_back(buf);
                }
 
-               if (surface.size()) {
+               if (! surface.empty()) {
                        vector<string>::iterator rwysurf = surface.begin();
                        for (i = 0; rwysurf != surface.end(); rwysurf++, i++) {
                                if (i)
@@ -413,7 +423,7 @@ void printArgs(SGMetar *m, double airport_elevation)
                        sprintf(&buf[strlen(buf)], ":%.0lf", gust_speed);
                args.push_back(buf);
        }
-       
+
 
        // output everything
        //cout << "fgfs" << endl;
@@ -498,6 +508,11 @@ int main(int argc, char *argv[])
        string proxy_host, proxy_port;
        getproxy(proxy_host, proxy_port);
 
+  Socket::initSockets();
+
+    HTTP::Client http;
+    http.setProxy(proxy_host, atoi(proxy_port.c_str()));
+
        for (int i = 1; i < argc; i++) {
                if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
                        usage();
@@ -521,16 +536,49 @@ int main(int argc, char *argv[])
                                shown = true;
                        }
 
-                       try {
-                               SGMetar *m = new SGMetar(argv[i], proxy_host, proxy_port, "", time(0));
+                       try
+                       {
+              static const std::string NOAA_BASE_URL =
+                "http://weather.noaa.gov/pub/data/observations/metar/stations/";
+                HTTP::MemoryRequest* mr = new HTTP::MemoryRequest
+                (
+                    NOAA_BASE_URL
+                  + boost::to_upper_copy<std::string>(argv[i]) + ".TXT"
+                );
+                HTTP::Request_ptr own(mr);
+                http.makeRequest(mr);
+
+            // spin until the request completes, fails or times out
+                SGTimeStamp start(SGTimeStamp::now());
+                while (start.elapsedMSec() <  8000) {
+                    http.update();
+                    if( mr->isComplete() )
+                        break;
+                    SGTimeStamp::sleepForMSec(1);
+                }
+
+                if( !mr->isComplete() )
+                  throw sg_io_exception("metar download timed out");
+                if( mr->responseCode() != 200 )
+                {
+                  std::cerr << "metar download failed: "
+                            << mr->url()
+                            << " (" << mr->responseCode()
+                            << " " << mr->responseReason() << ")"
+                            << std::endl;
+                  throw sg_io_exception("metar download failed");
+                }
+
+                               SGMetar *m = new SGMetar(mr->responseBody());
+
                                //SGMetar *m = new SGMetar("2004/01/11 01:20\nLOWG 110120Z AUTO VRB01KT 0050 1600N R35/0600 FG M06/M06 Q1019 88//////\n");
 
                                if (verbose) {
-                                       cerr << G"INPUT: " << m->getData() << ""N << endl;
+                                       cerr << G "INPUT: " << m->getData() << "" N << endl;
 
                                        const char *unused = m->getUnusedData();
                                        if (*unused)
-                                               cerr << R"UNUSED: " << unused << ""N << endl;
+                                               cerr << R "UNUSED: " << unused << "" N << endl;
                                }
 
                                if (report)
@@ -540,7 +588,7 @@ int main(int argc, char *argv[])
 
                                delete m;
                        } catch (const sg_io_exception& e) {
-                               cerr << R"ERROR: " << e.getFormattedMessage().c_str() << ""N << endl << endl;
+                               cerr << R "ERROR: " << e.getFormattedMessage().c_str() << "" N << endl << endl;
                        }
                }
        }