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

[generator] Fixed bug with place GeoObjectId for boundaries.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-04-06 14:54:18 +03:00
parent 288659e956
commit 62bee0549b
3 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
generator/cities_boundaries_builder.cpp
View file

@ -86,15 +86,21 @@ bool BuildCitiesBoundariesForTesting(string const & dataPath, TestIdToBoundaries
void SerializeBoundariesTable(std::string const & path, OsmIdToBoundariesTable & table)
{
vector<vector<base::GeoObjectId>> allIds;
vector<vector<CityBoundary>> allBoundaries;
table.ForEachCluster(
[&](vector<base::GeoObjectId> const & ids, vector<CityBoundary> const & boundaries) {
allIds.push_back(ids);
allBoundaries.push_back(boundaries);
});
using GeoIDsT = vector<base::GeoObjectId>;
using BoundariesT = vector<CityBoundary>;
vector<GeoIDsT> allIds;
vector<BoundariesT> allBoundaries;
CHECK_EQUAL(allIds.size(), allBoundaries.size(), ());
table.ForEachCluster([&](GeoIDsT & ids, BoundariesT const & boundaries)
{
CHECK(!ids.empty(), ());
CHECK(!boundaries.empty(), ());
allIds.push_back(std::move(ids));
allBoundaries.push_back(boundaries);
});
LOG(LINFO, ("Saved boundary clusters count =", allIds.size()));
FileWriter sink(path);
indexer::CitiesBoundariesSerDes::Serialize(sink, allBoundaries);
@ -111,6 +117,7 @@ bool DeserializeBoundariesTable(std::string const & path, OsmIdToBoundariesTable
vector<vector<base::GeoObjectId>> allIds;
vector<vector<CityBoundary>> allBoundaries;
size_t count = 0;
try
{
FileReader reader(path);
@ -119,8 +126,8 @@ bool DeserializeBoundariesTable(std::string const & path, OsmIdToBoundariesTable
double precision;
indexer::CitiesBoundariesSerDes::Deserialize(source, allBoundaries, precision);
auto const n = allBoundaries.size();
allIds.resize(n);
count = allBoundaries.size();
allIds.resize(count);
for (auto & ids : allIds)
{
@ -141,16 +148,15 @@ bool DeserializeBoundariesTable(std::string const & path, OsmIdToBoundariesTable
return false;
}
CHECK_EQUAL(allBoundaries.size(), allIds.size(), ());
table.Clear();
for (size_t i = 0; i < allBoundaries.size(); ++i)
for (size_t i = 0; i < count; ++i)
{
auto const & ids = allIds[i];
CHECK(!ids.empty(), ());
auto const & id = ids.front();
for (auto const & b : allBoundaries[i])
table.Append(id, b);
for (auto & b : allBoundaries[i])
table.Append(id, std::move(b));
for (size_t j = 1; j < ids.size(); ++j)
table.Union(id, ids[j]);

5
generator/final_processor_utils.cpp
View file

@ -94,8 +94,9 @@ bool Less(FeatureBuilder const & lhs, FeatureBuilder const & rhs)
auto const lGeomType = static_cast<int8_t>(lhs.GetGeomType());
auto const rGeomType = static_cast<int8_t>(rhs.GetGeomType());
auto const lId = lhs.HasOsmIds() ? lhs.GetMostGenericOsmId() : base::GeoObjectId();
auto const rId = rhs.HasOsmIds() ? rhs.GetMostGenericOsmId() : base::GeoObjectId();
// may be empty IDs
auto const lId = lhs.GetMostGenericOsmId();
auto const rId = rhs.GetMostGenericOsmId();
auto const lPointsCount = lhs.GetPointsCount();
auto const rPointsCount = rhs.GetPointsCount();

2
generator/place_processor.cpp
View file

@ -198,7 +198,7 @@ void PlaceProcessor::FillTable(IterT start, IterT end, IterT best) const
if (!fb.IsArea() || !isCityTownOrVillage(fb.GetTypes()))
continue;
auto const id = fb.GetLastOsmId();
auto const id = fb.GetMostGenericOsmId();
m_boundariesTable->Append(id, indexer::CityBoundary(fb.GetOuterGeometry()));
if (lastId != base::GeoObjectId())
m_boundariesTable->Union(id, lastId);