fly/flightgear
1
0
Fork 0
Code Activity

Improve TerraSync suggested by Alex Perry

Browse source 
Keep already scheduled tiles for later on relocation
This commit is contained in:
fredb 2009-02-08 09:43:47 +00:00 • committed by Tim Moore
parent f3ba7a3bd4
commit a9475796eb
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
utils/TerraSync/terrasync.cxx
View file

@ -377,13 +377,17 @@ static void sync_areas( int lat, int lon, int lat_dir, int lon_dir ) {
} }
void getWaitingTile() { void getWaitingTile() {
CompletedTiles::iterator ii = completedTiles.find( waitingTiles.front() ); while ( !waitingTiles.empty() ) {
time_t now = time(0); CompletedTiles::iterator ii = completedTiles.find( waitingTiles.front() );
if ( ii == completedTiles.end() || ii->second + 600 < now ) { time_t now = time(0);
sync_tree(waitingTiles.front().c_str()); if ( ii == completedTiles.end() || ii->second + 600 < now ) {
completedTiles[ waitingTiles.front() ] = now; sync_tree(waitingTiles.front().c_str());
completedTiles[ waitingTiles.front() ] = now;
waitingTiles.pop_front();
break;
}
waitingTiles.pop_front();
} }
waitingTiles.pop_front();
} }
int main( int argc, char **argv ) { int main( int argc, char **argv ) {
@ -468,7 +472,8 @@ int main( int argc, char **argv ) {
if ( recv_msg ) { if ( recv_msg ) {
if ( lat != last_lat || lon != last_lon ) { if ( lat != last_lat || lon != last_lon ) {
cout << "pos in msg = " << lat << "," << lon << endl; cout << "pos in msg = " << lat << "," << lon << endl;
waitingTiles.clear(); std::deque<std::string> oldRequests;
oldRequests.swap( waitingTiles );
int lat_dir, lon_dir, dist; int lat_dir, lon_dir, dist;
if ( last_lat == nowhere || last_lon == nowhere ) { if ( last_lat == nowhere || last_lon == nowhere ) {
lat_dir = lon_dir = 0; lat_dir = lon_dir = 0;
@ -490,6 +495,10 @@ int main( int argc, char **argv ) {
cout << "lat_dir = " << lat_dir << " " cout << "lat_dir = " << lat_dir << " "
<< "lon_dir = " << lon_dir << endl; << "lon_dir = " << lon_dir << endl;
sync_areas( lat, lon, lat_dir, lon_dir ); sync_areas( lat, lon, lat_dir, lon_dir );
while ( !oldRequests.empty() ) {
waitingTiles.push_back( oldRequests.front() );
oldRequests.pop_front();
}
} else if ( !waitingTiles.empty() ) { } else if ( !waitingTiles.empty() ) {
getWaitingTile(); getWaitingTile();
} else { } else {