Fixed bug that sometimes scrambled the string table when writing out …

…PBF files
Melaskia · Apr 23, 2012 · e84e8f2 · e84e8f2
1 parent 1b8cd44
commit e84e8f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/include/osmium/output/pbf.hpp b/include/osmium/output/pbf.hpp
@@ -527,6 +527,11 @@ namespace Osmium {
                     std::cerr << "storing primitive block with " << primitive_block_contents << " items" << std::endl;
                 }
 
+                // add empty StringTable entry at index 0
+                // StringTable index 0 is reserved as delimiter in the densenodes key/value list
+                // this line also ensures that there's always a valid StringTable
+                pbf_primitive_block.mutable_stringtable()->add_s("");
+
                 // store the interim StringTable into the protobuf object
                 string_table.store_stringtable(pbf_primitive_block.mutable_stringtable());
 
@@ -539,11 +544,6 @@ namespace Osmium {
                 // clear the PrimitiveBlock struct
                 pbf_primitive_block.Clear();
 
-                // add empty StringTable entry at index 0
-                // StringTable index 0 is rserved as delimiter in the densenodes key/value list
-                // this line also ensures that there's always a valid StringTable
-                pbf_primitive_block.mutable_stringtable()->add_s("");
-
                 // set the granularity
                 pbf_primitive_block.set_granularity(location_granularity());
                 pbf_primitive_block.set_date_granularity(date_granularity());

diff --git a/include/osmium/utils/stringtable.hpp b/include/osmium/utils/stringtable.hpp
@@ -157,6 +157,7 @@ namespace Osmium {
          */
         void clear() {
             m_strings.clear();
+            m_id2id_map.clear();
             m_size = 0;
         }