Add data generation for LocalityIndexBuilder

2 files changed, 9 insertions, 11 deletions

diff --git a/indexer/locality_index_builder.cpp b/indexer/locality_index_builder.cpp
index 16dce7a3f3..784676cdef 100644
--- a/indexer/locality_index_builder.cpp
+++ b/indexer/locality_index_builder.cpp
@@ -57,19 +57,19 @@ private:
 };
 }  // namespace
 
-bool BuildLocalityIndexFromDataFile(string const & dataFile, string const & tmpFile)
+bool BuildLocalityIndexFromDataFile(string const & dataFile, string const & outFileName)
 {
   try
   {
-    string const idxFileName(tmpFile + LOCALITY_INDEX_TMP_EXT);
+    string const idxFileName(outFileName + LOCALITY_INDEX_TMP_EXT);
     {
       LocalityVectorReader localities(dataFile);
       FileWriter writer(idxFileName);
 
-      covering::BuildLocalityIndex(localities.GetVector(), writer, tmpFile);
+      covering::BuildLocalityIndex(localities.GetVector(), writer, outFileName);
     }
 
-    FilesContainerW(dataFile, FileWriter::OP_WRITE_EXISTING)
+    FilesContainerW(outFileName, FileWriter::OP_WRITE_TRUNCATE)
         .Write(idxFileName, LOCALITY_INDEX_FILE_TAG);
     FileWriter::DeleteFileX(idxFileName);
   }
diff --git a/indexer/locality_object.cpp b/indexer/locality_object.cpp
index c348d31315..3ca1d9bb30 100644
--- a/indexer/locality_object.cpp
+++ b/indexer/locality_object.cpp
@@ -22,13 +22,11 @@ void LocalityObject::Deserialize(char const * data)
   }
 
   ASSERT_EQUAL(type, feature::GEOM_AREA, ("Only supported types are GEOM_POINT and GEOM_AREA."));
-  uint8_t trgCount;
+  uint32_t trgCount;
   ReadPrimitiveFromSource(src, trgCount);
-  if (trgCount > 0)
-  {
-    trgCount += 2;
-    char const * start = static_cast<char const *>(src.PtrC());
-    serial::LoadInnerTriangles(start, trgCount, cp, m_triangles);
-  }
+  CHECK_GREATER(trgCount, 0, ());
+  trgCount += 2;
+  char const * start = static_cast<char const *>(src.PtrC());
+  serial::LoadInnerTriangles(start, trgCount, cp, m_triangles);
 }
 }  // namespace indexer