Skip to content

Use line break when outputting status to non-TTY #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use line break when outputting status to non-TTY #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/read_pbf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ bool PbfReader::ReadBlock(std::istream &infile, OsmLuaProcessing &output, std::p
nodeKeyPositions.insert(findStringPosition(pb, it.c_str()));
}

bool is_terminal = isatty(1);
for (int i=0; i<pb.primitivegroup_size(); i++) {
PrimitiveGroup pg;
pg = pb.primitivegroup(i);
Expand All @@ -234,7 +235,11 @@ bool PbfReader::ReadBlock(std::istream &infile, OsmLuaProcessing &output, std::p
{
std::ostringstream str;
osmStore.reportStoreSize(str);
str << "Block " << progress.first << "/" << progress.second << " ways " << pg.ways_size() << " relations " << pg.relations_size() << " \r";
str << "Block " << progress.first << "/" << progress.second << " ways " << pg.ways_size() << " relations " << pg.relations_size();
if (is_terminal)
str << " \r";
else
str << std::endl;
std::cout << str.str();
std::cout.flush();
};
Expand All @@ -251,8 +256,12 @@ bool PbfReader::ReadBlock(std::istream &infile, OsmLuaProcessing &output, std::p
if(phase == ReadPhase::RelationScan || phase == ReadPhase::All) {
osmStore.ensure_used_ways_inited();
bool done = ScanRelations(output, pg, pb);
if(done) {
std::cout << "(Scanning for ways used in relations: " << (100*progress.first/progress.second) << "%)\r";
if(done) {
std::cout << "(Scanning for ways used in relations: " << (100*progress.first/progress.second) << "%)";
if (isatty(1))
std::cout << "\r";
else
std::cout << std::endl;
std::cout.flush();
continue;
}
Expand Down
10 changes: 9 additions & 1 deletion src/tilemaker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,13 +457,16 @@ int main(int argc, char* argv[]) {
}
}

bool is_terminal = isatty(1);
std::size_t interval = 1;
std::size_t zoomDisplay = 0;
for(std::size_t start_index = 0; start_index < tile_coordinates.size(); start_index += interval) {
unsigned int zoom = tile_coordinates[start_index].first;
if (zoom > 10) interval = 10;
if (zoom > 11) interval = 100;
if (zoom > 12) interval = 1000;
if (zoom > 13) interval = 5000;
if (zoom > 14) interval = 10000;

boost::asio::post(pool, [=, &tile_coordinates, &pool, &sharedData, &osmStore, &io_mutex, &tc, &zoomDisplay]() {
std::size_t end_index = std::min(tile_coordinates.size(), start_index + interval);
Expand All @@ -478,7 +481,12 @@ int main(int argc, char* argv[]) {

unsigned int zoom = tile_coordinates[end_index-1].first;
if (zoom>zoomDisplay) zoomDisplay = zoom;
cout << "Zoom level " << zoomDisplay << ", writing tile " << tc << " of " << tile_coordinates.size() << " \r" << std::flush;
cout << "Zoom level " << zoomDisplay << ", writing tile " << tc << " of " << tile_coordinates.size();
if (is_terminal)
cout << " \r";
else
cout << std::endl;
cout << std::flush;
});
}

Expand Down