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

[generator:regions] Fix commutative property of CompareAffiliation() for zero area comparison

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-08-12 11:48:45 +03:00 • committed by LaGrunge
parent e488e583b3
commit 390d80f81e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
generator/regions/regions_builder.cpp
View file

@ -246,14 +246,16 @@ int RegionsBuilder::CompareAffiliation(LevelRegion const & l, LevelRegion const
auto const lArea = l.GetArea();
auto const rArea = r.GetArea();
if (0.5 * lArea >= rArea)
if (0.5 * lArea > rArea)
{
ASSERT_GREATER(0.5 * lArea, 0, ());
LOG(LDEBUG, ("Region", l.GetId(), GetRegionNotation(l), "contains partly", r.GetId(),
GetRegionNotation(r)));
return 1;
}
if (0.5 * rArea >= lArea)
if (0.5 * rArea > lArea)
{
ASSERT_GREATER(0.5 * rArea, 0, ());
LOG(LDEBUG, ("Region", r.GetId(), GetRegionNotation(r), "contains partly", l.GetId(),
GetRegionNotation(l)));
return -1;