diff --git a/base/bidirectional_map.hpp b/base/bidirectional_map.hpp index b572f45f6e..926dd16e0a 100644 --- a/base/bidirectional_map.hpp +++ b/base/bidirectional_map.hpp @@ -22,7 +22,7 @@ public: bool Add(K const & k, V const & v) { - if (m_kToV.find(k) != m_kToV.end() || m_vToK.find(v) != m_vToK.end()) + if (m_kToV.find(k) != m_kToV.cend() || m_vToK.find(v) != m_vToK.cend()) return false; m_kToV.emplace(k, v); @@ -40,7 +40,7 @@ public: bool GetValue(K const & key, V & value) const { auto const it = m_kToV.find(key); - if (it == m_kToV.end()) + if (it == m_kToV.cend()) return false; value = it->second; return true; @@ -49,7 +49,7 @@ public: bool GetKey(V const & value, K & key) const { auto const it = m_vToK.find(value); - if (it == m_vToK.end()) + if (it == m_vToK.cend()) return false; key = it->second; return true; diff --git a/generator/cities_ids_builder.cpp b/generator/cities_ids_builder.cpp index dc6352d58c..d17a5241a7 100644 --- a/generator/cities_ids_builder.cpp +++ b/generator/cities_ids_builder.cpp @@ -3,6 +3,7 @@ #include "generator/utils.hpp" #include "indexer/classificator_loader.hpp" +#include "indexer/feature_to_osm.hpp" #include "search/categories_cache.hpp" #include "search/cbv.hpp" @@ -14,6 +15,7 @@ #include "base/cancellable.hpp" #include "base/checked_cast.hpp" +#include "base/geo_object_id.hpp" #include "base/logging.hpp" #include @@ -35,22 +37,22 @@ bool BuildCitiesIds(std::string const & dataPath, std::string const & osmToFeatu return false; } - indexer::FeatureIdToGeoObjectIdBimapBuilder builder; + indexer::FeatureIdToGeoObjectIdBimapMem map; auto const localities = GetLocalities(dataPath); localities.ForEach([&](uint64_t fid64) { auto const fid = base::checked_cast(fid64); - auto it = mapping.find(fid); + auto const it = mapping.find(fid); if (it == mapping.end()) return; auto const osmId = it->second; - if (!builder.Add(fid, osmId)) + if (!map.Add(fid, osmId)) { uint32_t oldFid; base::GeoObjectId oldOsmId; - auto const hasOldOsmId = builder.GetValue(fid, oldOsmId); - auto const hasOldFid = builder.GetKey(osmId, oldFid); + auto const hasOldOsmId = map.GetValue(fid, oldOsmId); + auto const hasOldFid = map.GetKey(osmId, oldFid); LOG(LWARNING, ("Could not add the pair (", fid, osmId, @@ -62,11 +64,11 @@ bool BuildCitiesIds(std::string const & dataPath, std::string const & osmToFeatu FilesContainerW container(dataPath, FileWriter::OP_WRITE_EXISTING); FileWriter sink = container.GetWriter(CITIES_IDS_FILE_TAG); auto const pos0 = sink.Pos(); - indexer::FeatureIdToGeoObjectIdSerDes::Serialize(sink, builder); + indexer::FeatureIdToGeoObjectIdSerDes::Serialize(sink, map); auto const pos1 = sink.Pos(); LOG(LINFO, - ("Serialized cities ids. Number of entries:", builder.Size(), "Size in bytes:", pos1 - pos0)); + ("Serialized cities ids. Number of entries:", map.Size(), "Size in bytes:", pos1 - pos0)); return true; } diff --git a/generator/cities_ids_builder.hpp b/generator/cities_ids_builder.hpp index 739867266a..aa635b3fb3 100644 --- a/generator/cities_ids_builder.hpp +++ b/generator/cities_ids_builder.hpp @@ -1,7 +1,5 @@ #pragma once -#include "indexer/feature_to_osm.hpp" - #include namespace generator diff --git a/indexer/feature_to_osm.cpp b/indexer/feature_to_osm.cpp index 35bd571937..7a9cb3168d 100644 --- a/indexer/feature_to_osm.cpp +++ b/indexer/feature_to_osm.cpp @@ -41,7 +41,7 @@ bool FeatureIdToGeoObjectIdBimap::Load() { auto reader = cont.GetReader(CITIES_IDS_FILE_TAG); ReaderSource> source(reader); - FeatureIdToGeoObjectIdSerDes::Deserialize(source, *this); + FeatureIdToGeoObjectIdSerDes::Deserialize(source, m_map); } catch (Reader::Exception const & e) { diff --git a/indexer/feature_to_osm.hpp b/indexer/feature_to_osm.hpp index 97baf356db..d6b50e4128 100644 --- a/indexer/feature_to_osm.hpp +++ b/indexer/feature_to_osm.hpp @@ -16,14 +16,15 @@ class DataSource; namespace indexer { +// An in-memory implementation of the data structure behind the FeatureIdToGeoObjectIdBimap. +using FeatureIdToGeoObjectIdBimapMem = base::BidirectionalMap; + // A serializable bidirectional read-only map of FeatureIds from a single // mwm of a fixed version to GeoObjectIds. // Currently, only World.mwm of the latest version is supported. class FeatureIdToGeoObjectIdBimap { public: - friend class FeatureIdToGeoObjectIdSerDes; - explicit FeatureIdToGeoObjectIdBimap(DataSource const & dataSource); bool Load(); @@ -45,16 +46,14 @@ private: DataSource const & m_dataSource; MwmSet::MwmId m_mwmId; - base::BidirectionalMap m_map; + FeatureIdToGeoObjectIdBimapMem m_map; }; -using FeatureIdToGeoObjectIdBimapBuilder = base::BidirectionalMap; - class FeatureIdToGeoObjectIdSerDes { public: template - static void Serialize(Sink & sink, FeatureIdToGeoObjectIdBimapBuilder const & map) + static void Serialize(Sink & sink, FeatureIdToGeoObjectIdBimapMem const & map) { WriteToSink(sink, base::checked_cast(map.Size())); map.ForEachEntry([&sink](uint32_t const fid, base::GeoObjectId gid) { @@ -64,15 +63,15 @@ public: } template - static void Deserialize(Source & src, FeatureIdToGeoObjectIdBimap & map) + static void Deserialize(Source & src, FeatureIdToGeoObjectIdBimapMem & map) { - map.m_map.Clear(); + map.Clear(); auto const numEntries = ReadPrimitiveFromSource(src); for (size_t i = 0; i < numEntries; ++i) { auto const fid = ReadVarUint(src); auto const gid = ReadVarUint(src); - map.m_map.Add(fid, base::GeoObjectId(gid)); + map.Add(fid, base::GeoObjectId(gid)); } } }; diff --git a/indexer/indexer_tests/feature_to_osm_tests.cpp b/indexer/indexer_tests/feature_to_osm_tests.cpp index f22dc28cc8..ed8efeec20 100644 --- a/indexer/indexer_tests/feature_to_osm_tests.cpp +++ b/indexer/indexer_tests/feature_to_osm_tests.cpp @@ -41,7 +41,7 @@ UNIT_TEST(FeatureIdToGeoObjectIdBimap_Smoke) { FrozenDataSource dataSource; - FeatureIdToGeoObjectIdBimapBuilder origM; + FeatureIdToGeoObjectIdBimapMem origM; origM.Add(0, base::MakeOsmWay(123)); vector buf; @@ -50,7 +50,7 @@ UNIT_TEST(FeatureIdToGeoObjectIdBimap_Smoke) FeatureIdToGeoObjectIdSerDes::Serialize(writer, origM); } - FeatureIdToGeoObjectIdBimap deserM(dataSource); + FeatureIdToGeoObjectIdBimapMem deserM; { MemReader reader(buf.data(), buf.size()); ReaderSource src(reader);