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

[generator:regions] Fix jsonl dref

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-07-08 17:44:39 +03:00 • committed by Tatiana Yan
parent b5872ebe5f
commit 90c18e1246
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
generator/regions/regions.cpp
View file

@ -104,7 +104,6 @@ private:
auto properties = base::NewJSONObject();
Localizator localizator(*properties);
boost::optional<std::string> dref;
for (auto const & p : path)
{
@ -123,18 +122,21 @@ private:
},
"address");
}
if (!dref && region.GetId() != main.GetId())
dref = KeyValueStorage::SerializeDref(region.GetId().GetEncodedId());
}
localizator.AddLocale("name", main);
ToJSONObject(*properties, "rank", main.GetRank());
if (dref)
ToJSONObject(*properties, "dref", *dref);
if (path.size() > 1)
{
auto const & parent = (*(path.rbegin() + 1))->GetData();
auto const parentId = parent.GetId().GetEncodedId();
ToJSONObject(*properties, "dref", KeyValueStorage::SerializeDref(parentId));
}
else
{
ToJSONObject(*properties, "dref", base::NewJSONNull());
}
auto const & country = path.front()->GetData();
if (auto && isoCode = country.GetIsoCode())