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

Format all C++ and Java code via clang-format

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-08-17 14:32:37 +07:00
parent 9f0290c0ec
commit bfffa1fff4
2169 changed files with 56441 additions and 64188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
libs/storage/country_tree.cpp
View File

@@ -12,7 +12,6 @@
#include <algorithm>
namespace storage
{
using namespace std;
@@ -28,17 +27,13 @@ class StoreInterface
{
public:
virtual ~StoreInterface() = default;
virtual Country * InsertToCountryTree(CountryId const & id, MwmSize mapSize,
string const & mapSha1, size_t depth,
virtual Country * InsertToCountryTree(CountryId const & id, MwmSize mapSize, string const & mapSha1, size_t depth,
CountryId const & parent) = 0;
virtual void InsertOldMwmMapping(CountryId const & newId, CountryId const & oldId) = 0;
virtual void InsertAffiliation(CountryId const & countryId, string const & affilation) = 0;
virtual void InsertCountryNameSynonym(CountryId const & countryId, string const & synonym) = 0;
virtual void InsertMwmTopCityGeoId(CountryId const & countryId, uint64_t const & geoObjectId) {}
virtual void InsertTopCountryGeoIds(CountryId const & countryId,
vector<uint64_t> const & geoObjectIds)
{
}
virtual void InsertTopCountryGeoIds(CountryId const & countryId, vector<uint64_t> const & geoObjectIds) {}
virtual OldMwmMapping GetMapping() const = 0;
};
@@ -52,16 +47,14 @@ class StoreCountries : public StoreInterface
OldMwmMapping m_idsMapping;
public:
StoreCountries(CountryTree & countries, Affiliations & affiliations,
CountryNameSynonyms & countryNameSynonyms, MwmTopCityGeoIds & mwmTopCityGeoIds,
MwmTopCountryGeoIds & mwmTopCountryGeoIds)
StoreCountries(CountryTree & countries, Affiliations & affiliations, CountryNameSynonyms & countryNameSynonyms,
MwmTopCityGeoIds & mwmTopCityGeoIds, MwmTopCountryGeoIds & mwmTopCountryGeoIds)
: m_countries(countries)
, m_affiliations(affiliations)
, m_countryNameSynonyms(countryNameSynonyms)
, m_mwmTopCityGeoIds(mwmTopCityGeoIds)
, m_mwmTopCountryGeoIds(mwmTopCountryGeoIds)
{
}
{}
~StoreCountries()
{
for (auto & entry : m_affiliations)
@@ -69,8 +62,8 @@ public:
}
// StoreInterface overrides:
Country * InsertToCountryTree(CountryId const & id, MwmSize mapSize, string const & mapSha1,
size_t depth, CountryId const & parent) override
Country * InsertToCountryTree(CountryId const & id, MwmSize mapSize, string const & mapSha1, size_t depth,
CountryId const & parent) override
{
Country country(id, parent);
if (mapSize)
@@ -110,8 +103,7 @@ public:
m_mwmTopCityGeoIds.emplace(countryId, std::move(id));
}
void InsertTopCountryGeoIds(CountryId const & countryId,
vector<uint64_t> const & geoObjectIds) override
void InsertTopCountryGeoIds(CountryId const & countryId, vector<uint64_t> const & geoObjectIds) override
{
ASSERT(!countryId.empty(), ());
ASSERT(!geoObjectIds.empty(), ());
@@ -128,13 +120,10 @@ class StoreFile2Info : public StoreInterface
map<string, CountryInfo> & m_file2info;
public:
explicit StoreFile2Info(map<string, CountryInfo> & file2info) : m_file2info(file2info)
{
}
explicit StoreFile2Info(map<string, CountryInfo> & file2info) : m_file2info(file2info) {}
// StoreInterface overrides:
Country * InsertToCountryTree(CountryId const & id, MwmSize /* mapSize */,
string const & /* mapSha1 */, size_t /* depth */,
CountryId const & /* parent */) override
Country * InsertToCountryTree(CountryId const & id, MwmSize /* mapSize */, string const & /* mapSha1 */,
size_t /* depth */, CountryId const & /* parent */) override
{
CountryInfo info(id);
m_file2info[id] = std::move(info);
@@ -143,15 +132,9 @@ public:
void InsertOldMwmMapping(CountryId const & /* newId */, CountryId const & /* oldId */) override {}
void InsertAffiliation(CountryId const & /* countryId */,
string const & /* affilation */) override
{
}
void InsertAffiliation(CountryId const & /* countryId */, string const & /* affilation */) override {}
void InsertCountryNameSynonym(CountryId const & /* countryId */,
string const & /* synonym */) override
{
}
void InsertCountryNameSynonym(CountryId const & /* countryId */, string const & /* synonym */) override {}
OldMwmMapping GetMapping() const override
{
@@ -236,8 +219,7 @@ void CountryTree::Node::ForEachAncestorExceptForTheRoot(CountryTree::Node::NodeC
m_parent->ForEachAncestorExceptForTheRoot(f);
}
void CountryTree::Node::ForEachAncestorExceptForTheRoot(
CountryTree::Node::NodeCallback const & f) const
void CountryTree::Node::ForEachAncestorExceptForTheRoot(CountryTree::Node::NodeCallback const & f) const
{
if (m_parent == nullptr || m_parent->m_parent == nullptr)
return;
@@ -325,15 +307,12 @@ CountryTree::Node const * CountryTree::FindFirstLeaf(CountryId const & key) cons
Find(key, found);
for (auto node : found)
{
if (node->ChildrenCount() == 0)
return node;
}
return nullptr;
}
MwmSubtreeAttrs LoadGroupImpl(size_t depth, json_t * node, CountryId const & parent,
StoreInterface & store)
MwmSubtreeAttrs LoadGroupImpl(size_t depth, json_t * node, CountryId const & parent, StoreInterface & store)
{
CountryId id;
FromJSONObject(node, "id", id);
@@ -408,10 +387,8 @@ bool LoadCountriesImpl(string const & jsonBuffer, StoreInterface & store)
}
}
int64_t LoadCountriesFromBuffer(string const & jsonBuffer, CountryTree & countries,
Affiliations & affiliations,
CountryNameSynonyms & countryNameSynonyms,
MwmTopCityGeoIds & mwmTopCityGeoIds,
int64_t LoadCountriesFromBuffer(string const & jsonBuffer, CountryTree & countries, Affiliations & affiliations,
CountryNameSynonyms & countryNameSynonyms, MwmTopCityGeoIds & mwmTopCityGeoIds,
MwmTopCountryGeoIds & mwmTopCountryGeoIds)
{
countries.Clear();
@@ -423,8 +400,7 @@ int64_t LoadCountriesFromBuffer(string const & jsonBuffer, CountryTree & countri
base::Json root(jsonBuffer.c_str());
FromJSONObject(root.get(), "v", version);
StoreCountries store(countries, affiliations, countryNameSynonyms, mwmTopCityGeoIds,
mwmTopCountryGeoIds);
StoreCountries store(countries, affiliations, countryNameSynonyms, mwmTopCityGeoIds, mwmTopCountryGeoIds);
if (!LoadCountriesImpl(jsonBuffer, store))
return -1;
}
@@ -444,16 +420,13 @@ unique_ptr<Reader> GetReaderImpl(Platform & pl, string const & file, string cons
return pl.GetReader(file, scope);
}
catch (RootException const &)
{
}
{}
return nullptr;
}
} // namespace
} // namespace
int64_t LoadCountriesFromFile(string const & path, CountryTree & countries,
Affiliations & affiliations,
CountryNameSynonyms & countryNameSynonyms,
MwmTopCityGeoIds & mwmTopCityGeoIds,
int64_t LoadCountriesFromFile(string const & path, CountryTree & countries, Affiliations & affiliations,
CountryNameSynonyms & countryNameSynonyms, MwmTopCityGeoIds & mwmTopCityGeoIds,
MwmTopCountryGeoIds & mwmTopCountryGeoIds)
{
string json;
@@ -468,8 +441,8 @@ int64_t LoadCountriesFromFile(string const & path, CountryTree & countries,
if (reader)
{
reader->ReadAsString(json);
version = LoadCountriesFromBuffer(json, countries, affiliations, countryNameSynonyms,
mwmTopCityGeoIds, mwmTopCountryGeoIds);
version = LoadCountriesFromBuffer(json, countries, affiliations, countryNameSynonyms, mwmTopCityGeoIds,
mwmTopCountryGeoIds);
}
reader = GetReaderImpl(pl, path, "w");
@@ -482,8 +455,7 @@ int64_t LoadCountriesFromFile(string const & path, CountryTree & countries,
MwmTopCountryGeoIds newCountryIds;
reader->ReadAsString(json);
int64_t const newVersion = LoadCountriesFromBuffer(json, newCountries, newAffs, newSyms,
newCityIds, newCountryIds);
int64_t const newVersion = LoadCountriesFromBuffer(json, newCountries, newAffs, newSyms, newCityIds, newCountryIds);
if (newVersion > version)
{