[osmium] 06/09: Imported Upstream version 0.0~20150428-7f23002

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmium.

commit 82bfe527eefaa53df6e7030b9d6af97323be218e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Apr 29 21:45:42 2015 +0200

    Imported Upstream version 0.0~20150428-7f23002
---
 CONTRIBUTING.md                              | 5 +++++
 README                                       | 9 +++++++++
 include/osmium/storage/byid/fixed_array.hpp  | 4 ++--
 include/osmium/storage/byid/sparse_table.hpp | 3 +++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..5edef4c
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,5 @@
+
+This is the "old" Osmium which is not being developed any more. Before
+contributing anything, please consider switching to the "new" Osmium
+available at http://osmcode.org/ .
+
diff --git a/README b/README
index acb2359..87673ef 100644
--- a/README
+++ b/README
@@ -2,6 +2,15 @@
 Osmium
 ======
 
+============================================================================
+
+    THIS IS THE "OLD" OSMIUM WHICH IS NOT BEING DEVELOPED ANY MORE!
+
+   You almost certainly want the "new" Osmium at http://osmcode.org/
+
+============================================================================
+
+
 http://wiki.openstreetmap.org/wiki/Osmium
 
 Osmium is a C++ framework for working with OSM data files. Osmium can read OSM
diff --git a/include/osmium/storage/byid/fixed_array.hpp b/include/osmium/storage/byid/fixed_array.hpp
index 5db4b49..f09987f 100644
--- a/include/osmium/storage/byid/fixed_array.hpp
+++ b/include/osmium/storage/byid/fixed_array.hpp
@@ -44,8 +44,8 @@ namespace Osmium {
             * There is no range checking on accessing the store.
             *
             * If you are storing node coordinates, you'll need 8 bytes for each node.
-            * At the time of writing this, the largest node ID is about 1.3 billion,
-            * so you'll need about 10 GB of memory.
+            * At the time of writing this, the largest node ID is over 3 billion,
+            * so you'll need over 24 GB of memory.
             *
             * Note that this storage class will only work on 64 bit systems if
             * used for storing node coordinates. 32 bit systems just can't address
diff --git a/include/osmium/storage/byid/sparse_table.hpp b/include/osmium/storage/byid/sparse_table.hpp
index 0718a19..308b0cf 100644
--- a/include/osmium/storage/byid/sparse_table.hpp
+++ b/include/osmium/storage/byid/sparse_table.hpp
@@ -70,6 +70,9 @@ namespace Osmium {
                 }
 
                 const TValue operator[](const uint64_t id) const {
+                    if (id >= m_items.size()) {
+                        return TValue();
+                    }
                     return m_items[id];
                 }
 

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