[osmium-tool] 02/97: BBox rename in libosmium

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.0.0
in repository osmium-tool.

commit 5eaadf5e68a58aa0981003f4a7b572128472e927
Author: Jochen Topf <jochen at topf.org>
Date:   Mon Dec 9 15:39:27 2013 +0100

    BBox rename in libosmium
---
 src/command_fileinfo.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp
index 4093a02..8693a32 100644
--- a/src/command_fileinfo.cpp
+++ b/src/command_fileinfo.cpp
@@ -91,7 +91,7 @@ bool CommandFileinfo::setup(const std::vector<std::string>& arguments) {
 
 struct InfoHandler : public osmium::handler::Handler {
 
-    osmium::BBox bbox;
+    osmium::Box bounds;
     uint64_t nodes = 0;
     uint64_t ways = 0;
     uint64_t relations = 0;
@@ -99,7 +99,7 @@ struct InfoHandler : public osmium::handler::Handler {
 
     void node(const osmium::Node& node) {
         hash.Update(node.data(), node.byte_size());
-        bbox.extend(node.location());
+        bounds.extend(node.location());
         ++nodes;
     }
 
@@ -141,8 +141,8 @@ bool CommandFileinfo::run() {
         std::cout << "Header:\n";
 
         std::cout << "  Bounding boxes:\n";
-        for (auto& bbox : header.bboxes()) {
-            std::cout << "    " << bbox << "\n";
+        for (auto& box : header.boxes()) {
+            std::cout << "    " << box << "\n";
         }
         std::cout << "  With history: " << (header.has_multiple_object_versions() ? "yes" : "no") << "\n";
 
@@ -155,7 +155,7 @@ bool CommandFileinfo::run() {
             InfoHandler info_handler;
             osmium::apply(reader, info_handler);
             std::cout << "Data: " << "\n";
-            std::cout << "  Bounding box: " << info_handler.bbox << "\n";
+            std::cout << "  Bounding box: " << info_handler.bounds << "\n";
 
             unsigned char digest[CryptoPP::SHA::DIGESTSIZE];
             info_handler.hash.Final(digest);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git