fly/flightgear
1
0
Fork 0
Code Activity

Make command "request-metar" also work

Browse source 
same problem as previous commit :-/
This commit is contained in:
Torsten Dreyer 2015-03-30 17:11:47 +02:00
parent 8baf72aabd
commit a56694f962
1 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/Environment/realwx_ctrl.cxx
View file

@ -172,6 +172,9 @@ public:
void addMetarAtPath(const string& propPath, const string& icao); void addMetarAtPath(const string& propPath, const string& icao);
void removeMetarAtPath(const string& propPath); void removeMetarAtPath(const string& propPath);
typedef std::vector<LiveMetarProperties_ptr> MetarPropertiesList;
MetarPropertiesList::iterator findMetarAtPath(const string &propPath);
protected: protected:
void bind(); void bind();
void unbind(); void unbind();
@ -188,7 +191,6 @@ protected:
bool _enabled; bool _enabled;
bool _wasEnabled; bool _wasEnabled;
simgear::TiedPropertyList _tiedProperties; simgear::TiedPropertyList _tiedProperties;
typedef std::vector<LiveMetarProperties_ptr> MetarPropertiesList;
MetarPropertiesList _metarProperties; MetarPropertiesList _metarProperties;
MetarRequester* _requester; MetarRequester* _requester;
@ -321,20 +323,19 @@ void BasicRealWxController::update( double dt )
void BasicRealWxController::addMetarAtPath(const string& propPath, const string& icao) void BasicRealWxController::addMetarAtPath(const string& propPath, const string& icao)
{ {
// check for duplicate entries // check for duplicate entries
BOOST_FOREACH( LiveMetarProperties_ptr p, _metarProperties ) { MetarPropertiesList::iterator it = findMetarAtPath(propPath);
if( p->get_root_node()->getPath() == propPath ) { if( it != _metarProperties.end() ) {
SG_LOG( SG_ENVIRONMENT, SG_INFO, "Reusing metar properties at " << propPath << " for " << icao);
// already exists // already exists
if (p->getStationId() != icao) { if ((*it)->getStationId() != icao) {
p->setStationId(icao); (*it)->setStationId(icao);
p->resetTimeToLive(); (*it)->resetTimeToLive();
} }
return; return;
} }
} // of exitsing metar properties iteration
SGPropertyNode_ptr metarNode = fgGetNode(propPath, true); SGPropertyNode_ptr metarNode = fgGetNode(propPath, true);
SG_LOG( SG_ENVIRONMENT, SG_INFO, "Adding metar properties at " << propPath ); SG_LOG( SG_ENVIRONMENT, SG_INFO, "Adding metar properties at " << propPath << " for " << icao);
LiveMetarProperties_ptr p(new LiveMetarProperties( metarNode, _requester, getMetarMaxAgeMin() )); LiveMetarProperties_ptr p(new LiveMetarProperties( metarNode, _requester, getMetarMaxAgeMin() ));
_metarProperties.push_back(p); _metarProperties.push_back(p);
p->setStationId(icao); p->setStationId(icao);
@ -342,20 +343,31 @@ void BasicRealWxController::addMetarAtPath(const string& propPath, const string&
void BasicRealWxController::removeMetarAtPath(const string &propPath) void BasicRealWxController::removeMetarAtPath(const string &propPath)
{ {
SGPropertyNode_ptr n = fgGetNode(propPath,false); MetarPropertiesList::iterator it = findMetarAtPath( propPath );
MetarPropertiesList::iterator it = _metarProperties.begin(); if( it != _metarProperties.end() ) {
for (; it != _metarProperties.end(); ++it) { SG_LOG(SG_ENVIRONMENT, SG_INFO, "removing metar properties at " << propPath);
LiveMetarProperties_ptr p(*it); LiveMetarProperties_ptr p(*it);
// don not compare unprocessed property path
// /foo/bar[0]/baz equals /foo/bar/baz
if( p->get_root_node()->getPath() == n->getPath() ) {
_metarProperties.erase(it); _metarProperties.erase(it);
// final ref will drop, and delete the MetarProperties, when we return // final ref will drop, and delete the MetarProperties, when we return
return; } else {
SG_LOG(SG_ENVIRONMENT, SG_WARN, "no metar properties at " << propPath);
} }
} }
SG_LOG(SG_ENVIRONMENT, SG_WARN, "no metar properties at " << propPath); BasicRealWxController::MetarPropertiesList::iterator BasicRealWxController::findMetarAtPath(const string &propPath)
{
// don not compare unprocessed property path
// /foo/bar[0]/baz equals /foo/bar/baz
SGPropertyNode_ptr n = fgGetNode(propPath,false);
if( false == n.valid() ) // trivial: node does not exist
return _metarProperties.end();
MetarPropertiesList::iterator it = _metarProperties.begin();
while( it != _metarProperties.end() &&
(*it)->get_root_node()->getPath() != n->getPath() )
++it;
return it;
} }
void BasicRealWxController::checkNearbyMetar() void BasicRealWxController::checkNearbyMetar()