pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes

Browse source
This commit is contained in:
Maksim Andrianov 2019-08-15 18:45:58 +03:00 • committed by LaGrunge
parent 13bdbed7d7
commit 24f8b74e76
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/filter_world.cpp
View file

@ -59,7 +59,7 @@ bool FilterWorld::IsPopularAttraction(feature::FeatureBuilder const & fb, std::s
return false;
}
auto static const & m_popularPlaces = GetOrLoadPopularPlacesLoader(popularityFilename);
auto static const & m_popularPlaces = GetOrLoadPopularPlaces(popularityFilename);
auto const it = m_popularPlaces.find(fb.GetMostGenericOsmId());
if (it == m_popularPlaces.end())
return false;

11
generator/popular_places_section_builder.cpp
View file

@ -16,6 +16,7 @@
#include <cstdint>
#include <limits>
#include <mutex>
#include <utility>
#include <vector>
@ -111,19 +112,19 @@ bool BuildPopularPlacesMwmSection(std::string const & srcFilename, std::string c
}
PopularPlaces const & GetOrLoadPopularPlacesLoader(std::string const & filename)
PopularPlaces const & GetOrLoadPopularPlaces(std::string const & filename)
{
static std::mutex m;
static std::unordered_map<std::string, PopularPlaces> plases;
static std::unordered_map<std::string, PopularPlaces> plaсes;
std::lock_guard<std::mutex> lock(m);
auto const it = plases.find(filename);
if (it != plases.cend())
auto const it = plaсes.find(filename);
if (it != plaсes.cend())
return it->second;
PopularPlaces places;
LoadPopularPlaces(filename, places);
auto const eIt = plases.emplace(filename, places);
auto const eIt = plaсes.emplace(filename, places);
return eIt.first->second;
}
} // namespace generator

3
generator/popular_places_section_builder.hpp
View file

@ -3,7 +3,6 @@
#include "base/geo_object_id.hpp"
#include <string>
#include <mutex>
#include <unordered_map>
namespace generator
@ -16,5 +15,5 @@ void LoadPopularPlaces(std::string const & srcFilename, PopularPlaces & places);
bool BuildPopularPlacesMwmSection(std::string const & srcFilename, std::string const & mwmFile,
std::string const & osmToFeatureFilename);
PopularPlaces const & GetOrLoadPopularPlacesLoader(std::string const & filename);
PopularPlaces const & GetOrLoadPopularPlaces(std::string const & filename);
} // namespace generator