fetch_elapsed( 9999.0 ),
proxy_host( fgGetNode("/sim/presets/proxy/host", true) ),
proxy_port( fgGetNode("/sim/presets/proxy/port", true) ),
- proxy_auth( fgGetNode("/sim/presets/proxy/authentication", true) )
+ proxy_auth( fgGetNode("/sim/presets/proxy/authentication", true) ),
+ metar_max_age( fgGetNode("/environment/params/metar-max-age-min", true) ),
+ _error_count( 0 ),
+ _error_dt( 0.0 )
{
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
thread = new MetarThread(this);
- thread->start();
+ thread->start( 1 );
#endif // ENABLE_THREADS
}
FGMetarEnvironmentCtrl::~FGMetarEnvironmentCtrl ()
{
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
thread->cancel();
thread->join();
#endif // ENABLE_THREADS
= fgGetNode( "/position/latitude-deg", true );
bool found_metar = false;
- while ( !found_metar ) {
+
+ while ( !found_metar && (_error_count < 3) ) {
FGAirport a = globals->get_airports()
->search( longitude->getDoubleValue(),
latitude->getDoubleValue(),
true );
- FGMetarResult result = fetch_data( a.id );
+ FGMetarResult result = fetch_data( a.getId() );
if ( result.m != NULL ) {
- SG_LOG( SG_GENERAL, SG_INFO, "closest station w/ metar = " << a.id);
+ SG_LOG( SG_GENERAL, SG_INFO, "closest station w/ metar = " << a.getId());
last_apt = a;
- _icao = a.id;
+ _icao = a.getId();
search_elapsed = 0.0;
fetch_elapsed = 0.0;
update_metar_properties( result.m );
} else {
// mark as no metar so it doesn't show up in subsequent
// searches.
- SG_LOG( SG_GENERAL, SG_INFO, "no metar at metar = " << a.id );
- globals->get_airports()->no_metar( a.id );
+ SG_LOG( SG_GENERAL, SG_INFO, "no metar at metar = " << a.getId() );
+ globals->get_airports()->no_metar( a.getId() );
}
}
}
void
FGMetarEnvironmentCtrl::reinit ()
{
+ _error_count = 0;
+ _error_dt = 0.0;
+
#if 0
update_env_config();
#endif
void
FGMetarEnvironmentCtrl::update(double delta_time_sec)
{
+
+ _dt += delta_time_sec;
+ if (_error_count >= 3)
+ return;
+
FGMetarResult result;
static const SGPropertyNode *longitude
->search( longitude->getDoubleValue(),
latitude->getDoubleValue(),
true );
- if ( last_apt.id != a.id
+ if ( last_apt.getId() != a.getId()
|| fetch_elapsed > same_station_interval_sec )
{
- SG_LOG( SG_GENERAL, SG_INFO, "closest station w/ metar = " << a.id);
- request_queue.push( a.id );
+ SG_LOG( SG_GENERAL, SG_INFO, "closest station w/ metar = " << a.getId());
+ request_queue.push( a.getId() );
last_apt = a;
- _icao = a.id;
+ _icao = a.getId();
search_elapsed = 0.0;
fetch_elapsed = 0.0;
} else {
}
}
-#ifndef ENABLE_THREADS
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
// No loader thread running so manually fetch the data
string id = "";
while ( !request_queue.empty() ) {
id = request_queue.front();
request_queue.pop();
}
+
if ( !id.empty() ) {
SG_LOG( SG_GENERAL, SG_INFO, "inline fetching = " << id );
result = fetch_data( id );
result_queue.pop();
if ( result.m != NULL ) {
update_metar_properties( result.m );
+ fgSetString("/environment/metar/last-metar", result.m->getData());
delete result.m;
update_env_config();
env->reinit();
FGMetarResult result;
result.icao = icao;
+ // if the last error was more than three seconds ago,
+ // then pretent nothing happened.
+ if (_error_dt < 3) {
+ _error_dt += _dt;
+
+ } else {
+ _error_dt = 0.0;
+ _error_count = 0;
+ }
+
// fetch station elevation if exists
FGAirport a = globals->get_airports()->search( icao );
- station_elevation_ft = a.elevation;
+ station_elevation_ft = a.getElevation();
// fetch current metar data
try {
string host = proxy_host->getStringValue();
string auth = proxy_auth->getStringValue();
string port = proxy_port->getStringValue();
- result.m = new SGMetar( icao, host, port, auth);
+ result.m = new FGMetar( icao, host, port, auth);
+
+ long max_age = metar_max_age->getLongValue();
+ if (max_age && result.m->getAge_min() > max_age) {
+ SG_LOG( SG_GENERAL, SG_WARN, "METAR data too old");
+ delete result.m;
+ result.m = NULL;
+ }
+
} catch (const sg_io_exception& e) {
SG_LOG( SG_GENERAL, SG_WARN, "Error fetching live weather data: "
<< e.getFormattedMessage().c_str() );
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
+ if (_error_count++ >= 3) {
+ SG_LOG( SG_GENERAL, SG_WARN, "Stop fetching data permanently.");
+ thread->cancel();
+ thread->join();
+ }
+#endif
+
result.m = NULL;
}
+ _dt = 0;
+
return result;
}
void
-FGMetarEnvironmentCtrl::update_metar_properties( SGMetar *m )
+FGMetarEnvironmentCtrl::update_metar_properties( FGMetar *m )
{
int i;
- double d, dt;
+ double d;
char s[128];
- d = m->getMinVisibility().getVisibility_m();
- d = (d != SGMetarNaN) ? d : 10000;
- fgSetDouble("/environment/metar/min-visibility-m", d);
-
- dt = m->getMaxVisibility().getVisibility_m();
- d = (dt != SGMetarNaN) ? dt : d;
- fgSetDouble("/environment/metar/max-visibility-m", d);
+ fgSetString("/environment/metar/station-id", m->getId());
+ fgSetDouble("/environment/metar/min-visibility-m",
+ m->getMinVisibility().getVisibility_m() );
+ fgSetDouble("/environment/metar/max-visibility-m",
+ m->getMaxVisibility().getVisibility_m() );
SGMetarVisibility *dirvis = m->getDirVisibility();
for (i = 0; i < 8; i++, dirvis++) {
const char *min = "/environment/metar/visibility[%d]/min-m";
const char *max = "/environment/metar/visibility[%d]/max-m";
- char s[128];
d = dirvis->getVisibility_m();
- d = (d != SGMetarNaN) ? d : 10000;
snprintf(s, 128, min, i);
fgSetDouble(s, d);
fgSetDouble(s, d);
}
- i = m->getWindDir();
- if ( i == -1 ) {
- fgSetInt("/environment/metar/base-wind-range-from",
- m->getWindRangeFrom() );
- fgSetInt("/environment/metar/base-wind-range-to",
- m->getWindRangeTo() );
- } else {
- fgSetInt("/environment/metar/base-wind-range-from", i);
- fgSetInt("/environment/metar/base-wind-range-to", i);
- }
+ fgSetInt("/environment/metar/base-wind-range-from",
+ m->getWindRangeFrom() );
+ fgSetInt("/environment/metar/base-wind-range-to",
+ m->getWindRangeTo() );
fgSetDouble("/environment/metar/base-wind-speed-kt",
m->getWindSpeed_kt() );
-
- d = m->getGustSpeed_kt();
- d = (d != SGMetarNaN) ? d : 0.0;
- fgSetDouble("/environment/metar/gust-wind-speed-kt", d);
-
- d = m->getTemperature_C();
- if (d != SGMetarNaN) {
- dt = m->getDewpoint_C();
- dt = (dt != SGMetarNaN) ? dt : 0.0;
- fgSetDouble("/environment/metar/dewpoint-degc", dt);
- fgSetDouble("/environment/metar/rel-humidity-norm",
- m->getRelHumidity() );
- }
- d = (d != SGMetarNaN) ? d : 15.0;
- fgSetDouble("/environment/metar/temperature-degc", d);
-
- d = m->getPressure_inHg();
- d = (d != SGMetarNaN) ? d : 30.0;
- fgSetDouble("/environment/metar/pressure-inhg", d);
+ fgSetDouble("/environment/metar/gust-wind-speed-kt",
+ m->getGustSpeed_kt() );
+ fgSetDouble("/environment/metar/temperature-degc",
+ m->getTemperature_C() );
+ fgSetDouble("/environment/metar/dewpoint-degc",
+ m->getDewpoint_C() );
+ fgSetDouble("/environment/metar/rel-humidity-norm",
+ m->getRelHumidity() );
+ fgSetDouble("/environment/metar/pressure-inhg",
+ m->getPressure_inHg() );
vector<SGMetarCloud> cv = m->getClouds();
vector<SGMetarCloud>::iterator cloud;
snprintf(s, 128, cl, i);
strncat(s, "/coverage", 128);
q = cloud->getCoverage();
- q = (q != -1 ) ? q : 0;
fgSetString(s, coverage_string[q] );
snprintf(s, 128, cl, i);
strncat(s, "/elevation-ft", 128);
- d = cloud->getAltitude_ft();
- d = (d != SGMetarNaN) ? d : -9999;
- fgSetDouble(s, d + station_elevation_ft);
+ fgSetDouble(s, cloud->getAltitude_ft() + station_elevation_ft);
snprintf(s, 128, cl, i);
strncat(s, "/thickness-ft", 128);
strncat(s, "/span-m", 128);
fgSetDouble(s, 40000.0);
}
+
+ fgSetDouble("/environment/metar/rain-norm", m->getRain());
+ fgSetDouble("/environment/metar/hail-norm", m->getHail());
+ fgSetDouble("/environment/metar/snow-norm", m->getSnow());
+ fgSetBool("/environment/metar/snow-cover", m->getSnowCover());
}
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
/**
*
*/
void
FGMetarEnvironmentCtrl::MetarThread::run()
{
- // pthread_cleanup_push( metar_cleanup_handler, fetcher );
+ pthread_cleanup_push( metar_cleanup_handler, fetcher );
while ( true )
{
set_cancel( SGThread::CANCEL_DISABLE );
fetcher->result_queue.push( result );
}
- // pthread_cleanup_pop(1);
+ pthread_cleanup_pop(1);
}
/**
projects / flightgear.git / blobdiff