From 7ae8e4c5e2cd6c7363820cd76c92526959d5a3b3 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Tue, 4 Jan 2011 21:19:58 +0200
Subject: [PATCH] Fix possible error when .notsorted file already exists during
 generation. Update epsilon for lines-simplification: using Epsilon(level+1).

---
 indexer/feature.cpp                     |  2 +-
 indexer/indexer_tool/feature_sorter.cpp | 10 ++++++----
 indexer/indexer_tool/feature_sorter.hpp |  2 +-
 indexer/indexer_tool/indexer_tool.cpp   |  9 +++++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 5b156619c0..aca73c19c7 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -259,7 +259,7 @@ void FeatureBuilderGeomRef::SimplifyPoints(points_t const & in, points_t & out,
   if (in.size() >= 2)
   {
     SimplifyNearOptimal<mn::DistanceToLineSquare<m2::PointD> >(50, in.begin(), in.end()-1,
-      my::sq(scales::GetEpsilonForLevel(level)), MakeBackInsertFunctor(out));
+      my::sq(scales::GetEpsilonForLevel(level + 1)), MakeBackInsertFunctor(out));
 
     switch (out.size())
     {
diff --git a/indexer/indexer_tool/feature_sorter.cpp b/indexer/indexer_tool/feature_sorter.cpp
index c28cc89194..20b094bff6 100644
--- a/indexer/indexer_tool/feature_sorter.cpp
+++ b/indexer/indexer_tool/feature_sorter.cpp
@@ -62,18 +62,18 @@ namespace
 
 namespace feature
 {
-  void SortDatFile(string const & datFilePath, bool removeOriginalFile)
+  bool SortDatFile(string const & datFilePath, bool removeOriginalFile)
   {
     // rename input file
     Platform & platform = GetPlatform();
     string tempDatFilePath(datFilePath);
     tempDatFilePath += ".notsorted";
 
-    // file doesn't exist
+    FileWriter::DeleteFile(tempDatFilePath);
     if (!platform.RenameFileX(datFilePath, tempDatFilePath))
     {
-      LOG(LINFO, ("File ", datFilePath, " doesn't exist or sharing violation!"));
-      return;
+      LOG(LWARNING, ("File ", datFilePath, " doesn't exist or sharing violation!"));
+      return false;
     }
 
     // stores cellIds for middle points
@@ -117,5 +117,7 @@ namespace feature
       FileWriter::DeleteFile(datFilePath + GEOMETRY_FILE_TAG);
       FileWriter::DeleteFile(datFilePath + TRIANGLE_FILE_TAG);
     }
+
+    return true;
   }
 } // namespace feature
diff --git a/indexer/indexer_tool/feature_sorter.hpp b/indexer/indexer_tool/feature_sorter.hpp
index 0e8ffe1f6b..dc8dcc439b 100644
--- a/indexer/indexer_tool/feature_sorter.hpp
+++ b/indexer/indexer_tool/feature_sorter.hpp
@@ -5,5 +5,5 @@
 namespace feature
 {
   // sorts features in the given file by their mid points
-  void SortDatFile(string const & datFile, bool removeOriginalFile = true);
+  bool SortDatFile(string const & datFile, bool removeOriginalFile = true);
 }
diff --git a/indexer/indexer_tool/indexer_tool.cpp b/indexer/indexer_tool/indexer_tool.cpp
index 7b98ec19d1..f6bee64075 100644
--- a/indexer/indexer_tool/indexer_tool.cpp
+++ b/indexer/indexer_tool/indexer_tool.cpp
@@ -134,11 +134,16 @@ int main(int argc, char ** argv)
   // Enumerate over all dat files that were created.
   for (size_t i = 0; i < genInfo.bucketNames.size(); ++i)
   {
-    string const datFile = genInfo.bucketNames[i];
+    string const & datFile = genInfo.bucketNames[i];
+
     if (FLAGS_sort_features)
     {
       LOG(LINFO, ("Sorting features inside", datFile));
-      feature::SortDatFile(datFile);
+      if (!feature::SortDatFile(datFile))
+      {
+        // If error - move to next bucket without index generation
+        continue;
+      }
     }
 
     if (FLAGS_generate_index)