drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get all URLs.

Browse Source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako
2022-03-26 15:31:26 +03:00
committed by zyphlar
parent 727c0db4b0
commit e16c8f3591
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
generator/descriptions_section_builder.cpp
View File

@@ -88,9 +88,9 @@ std::string DescriptionsCollectionBuilderStat::LangStatisticsToString() const
void DescriptionsCollector::operator() (FeatureType & ft, uint32_t featureId) void DescriptionsCollector::operator() (FeatureType & ft, uint32_t featureId)
{ {
auto const & attractionsChecker = ftypes::AttractionsChecker::Instance(); // auto const & attractionsChecker = ftypes::AttractionsChecker::Instance();
if (!attractionsChecker(ft)) // if (!attractionsChecker(ft))
return; // return;
(*this)(ft.GetMetadata().GetWikiURL(), featureId); (*this)(ft.GetMetadata().GetWikiURL(), featureId);
} }

12
generator/wiki_url_dumper.cpp
View File

@@ -55,10 +55,10 @@ void WikiUrlDumper::Dump(size_t cpuCount) const
// static // static
void WikiUrlDumper::DumpOne(std::string const & path, std::ostream & stream) void WikiUrlDumper::DumpOne(std::string const & path, std::ostream & stream)
{ {
auto const & needWikiUrl = ftypes::AttractionsChecker::Instance(); //auto const & needWikiUrl = ftypes::AttractionsChecker::Instance();
feature::ForEachFeatureRawFormat(path, [&](FeatureBuilder const & feature, uint64_t /* pos */) { feature::ForEachFeatureRawFormat(path, [&](FeatureBuilder const & feature, uint64_t /* pos */) {
if (!needWikiUrl(feature.GetTypesHolder())) // if (!needWikiUrl(feature.GetTypesHolder()))
return; // return;
auto const wikiUrl = feature.GetMetadata().GetWikiURL(); auto const wikiUrl = feature.GetMetadata().GetWikiURL();
if (wikiUrl.empty()) if (wikiUrl.empty())
@@ -89,10 +89,10 @@ WikiDataFilter::WikiDataFilter(std::string const & path, std::vector<std::string
void WikiDataFilter::FilterOne(std::string const & path, std::map<base::GeoObjectId, std::string> const & idToWikiData, void WikiDataFilter::FilterOne(std::string const & path, std::map<base::GeoObjectId, std::string> const & idToWikiData,
std::ostream & stream) std::ostream & stream)
{ {
auto const & needWikiUrl = ftypes::AttractionsChecker::Instance(); //auto const & needWikiUrl = ftypes::AttractionsChecker::Instance();
feature::ForEachFeatureRawFormat(path, [&](FeatureBuilder const & feature, uint64_t /* pos */) { feature::ForEachFeatureRawFormat(path, [&](FeatureBuilder const & feature, uint64_t /* pos */) {
if (!needWikiUrl(feature.GetTypesHolder())) // if (!needWikiUrl(feature.GetTypesHolder()))
return; // return;
auto const it = idToWikiData.find(feature.GetMostGenericOsmId()); auto const it = idToWikiData.find(feature.GetMostGenericOsmId());
if (it == std::end(idToWikiData)) if (it == std::end(idToWikiData))