[generator] review fixes

base/base_tests/string_utils_test.cpp

@@ -253,6 +253,10 @@ UNIT_TEST(to_uint64)
   TEST(strings::to_uint64(s, i), ());
   TEST_EQUAL(123456789101112ULL, i, ());
 
+  s = "AF";
+  TEST(strings::to_uint64(s, i, 16), ());
+  TEST_EQUAL(175, i, ());
+
   s = "labuda";
   TEST(!strings::to_uint64(s, i), ());
 }

generator/geo_objects/geo_objects.cpp

@@ -83,7 +83,7 @@ base::JSONPtr AddAddress(FeatureBuilder const & fb, KeyValue const & regionKeyVa
   else
     ToJSONObject(*address, "building", base::NewJSONNull());
 
-  ToJSONObject(*properties, "dref", KeyValueStorage::Serialize(regionKeyValue.first));
+  ToJSONObject(*properties, "dref", KeyValueStorage::SerializeDref(regionKeyValue.first));
   // auto locales = json_object_get(result.get(), "locales");
   // auto en = json_object_get(result.get(), "en");
   // todo(maksimandrianov): Add en locales.

generator/key_value_storage.cpp

@@ -1,12 +1,15 @@
 #include "generator/key_value_storage.hpp"
-#include <boost/algorithm/string.hpp>
+
+#include "coding/reader.hpp"
+
+#include "base/exception.hpp"
+#include "base/logging.hpp"
 
 #include <algorithm>
 #include <cstring>
 #include <iomanip>
-#include "base/exception.hpp"
-#include "base/logging.hpp"
-#include "coding/reader.hpp"
+
+#include <boost/algorithm/string.hpp>
 namespace generator
 {
 KeyValueStorage::KeyValueStorage(std::string const & path, size_t cacheValuesCountLimit,
@@ -63,15 +66,13 @@ bool KeyValueStorage::ParseKeyValueLine(std::string const & line, std::streamoff
   }
 
   std::string idStr = line.substr(0, pos);
-  boost::to_lower(idStr);
-  uint64_t id = 0;
-  if (!strings::to_uint64(idStr, id, 16))
+
+  if (!strings::to_uint64(idStr, key, 16))
   {
     LOG(LWARNING, ("Cannot parse id", line.substr(0, pos), "in line", lineNumber));
     return false;
   }
 
-  key = id;
   value = line.c_str() + pos + 1;
   return true;
 }
@@ -90,7 +91,7 @@ void KeyValueStorage::Insert(uint64_t key, JsonValue && value)
   auto const & emplaceIterator = emplaceResult.first;
   auto const & result = boost::get<std::string>(emplaceIterator->second);
 
-  m_storage << Serialize(key) << " " << result << "\n";
+  m_storage << SerializeDref(key) << " " << result << "\n";
 }
 
 std::shared_ptr<JsonValue> KeyValueStorage::Find(uint64_t key) const
@@ -109,7 +110,7 @@ std::shared_ptr<JsonValue> KeyValueStorage::Find(uint64_t key) const
   return json;
 }
 
-std::string KeyValueStorage::Serialize(uint64_t number)
+std::string KeyValueStorage::SerializeDref(uint64_t number)
 {
   std::stringstream stream;
   stream << std::setw(16) << std::setfill('0') << std::hex << number;

generator/key_value_storage.hpp

@@ -62,7 +62,7 @@ public:
     return base::DumpToString(ptr, JSON_COMPACT | JSON_REAL_PRECISION(kDefaultPrecision));
   }
 
-  static std::string Serialize(uint64_t number);
+  static std::string SerializeDref(uint64_t number);
 
 private:
   using Value = boost::variant<std::shared_ptr<JsonValue>, std::string>;

generator/regions/regions.cpp

@@ -135,6 +135,7 @@ private:
     ToJSONObject(*properties, "rank", main.GetRank());
     ToJSONObject(*properties, "address", address);
     ToJSONObject(*properties, "locales", localizator.BuildLocales());
+
     if (dref)
       ToJSONObject(*properties, "dref", *dref);
     else
@@ -183,7 +184,7 @@ private:
 
         if (regionCountryEmplace.second)
         {
-          m_regionsKv << KeyValueStorage::Serialize(objectId.GetEncodedId()) << " "
+          m_regionsKv << KeyValueStorage::SerializeDref(objectId.GetEncodedId()) << " "
                       << KeyValueStorage::Serialize(BuildRegionValue(path)) << "\n";
           ++countryObjectCount;
         }

generator/streets/streets_builder.cpp

@@ -58,7 +58,7 @@ void StreetsBuilder::SaveRegionStreetsKv(std::ostream & streamStreetsKv, uint64_
     auto const & bbox = street.second.GetBbox();
     auto const & pin = street.second.GetOrChoosePin();
 
-    auto const id = KeyValueStorage::Serialize(pin.m_osmId.GetEncodedId());
+    auto const id = KeyValueStorage::SerializeDref(pin.m_osmId.GetEncodedId());
     auto const & value =
         MakeStreetValue(regionId, *regionObject, street.first, bbox, pin.m_position);
     streamStreetsKv << id << " " << KeyValueStorage::Serialize(value) << "\n";
@@ -175,7 +175,7 @@ base::JSONPtr StreetsBuilder::MakeStreetValue(uint64_t regionId, JsonValue const
   auto properties = base::NewJSONObject();
   ToJSONObject(*properties, "address", std::move(address));
   ToJSONObject(*properties, "name", streetName);
-  ToJSONObject(*properties, "dref", KeyValueStorage::Serialize(regionId));
+  ToJSONObject(*properties, "dref", KeyValueStorage::SerializeDref(regionId));
   ToJSONObject(*streetObject, "properties", std::move(properties));
 
   auto const & leftBottom = MercatorBounds::ToLatLon(bbox.LeftBottom());