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

[generator] Fixed bug with point drawing types for area objects.

Browse source
This commit is contained in:
vng 2013-12-23 18:39:49 +03:00 • committed by Alex Zolotarev
parent ccc114b8df
commit 2ed05b3b48
3 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
generator/generator_tests/feature_builder_test.cpp
View file

@ -2,6 +2,7 @@
#include "../feature_builder.hpp"
#include "../../indexer/feature_visibility.hpp"
#include "../../indexer/classificator_loader.hpp"
#include "../../indexer/classificator.hpp"
@ -66,3 +67,17 @@ UNIT_TEST(FBuilder_ManyTypes)
TEST(fb2.CheckValid(), ());
TEST_EQUAL(fb1, fb2, ());
}
UNIT_TEST(FVisibility_RemoveNoDrawableTypes)
{
classificator::Load();
Classificator const & c = classif();
vector<uint32_t> types;
types.push_back(c.GetTypeByPath(vector<string>(1, "building")));
char const * arr[] = { "amenity", "theatre" };
types.push_back(c.GetTypeByPath(vector<string>(arr, arr + 2)));
TEST(feature::RemoveNoDrawableTypes(types, feature::FEATURE_TYPE_AREA), ());
TEST_EQUAL(types.size(), 2, ());
}

15
indexer/feature_visibility.cpp
View file

@ -288,8 +288,19 @@ namespace
bool operator() (uint32_t t)
{
IsDrawableLikeChecker doCheck(m_type);
// return true if need to delete
return !m_c.ProcessObjects(t, doCheck);
if (m_c.ProcessObjects(t, doCheck))
return false;
// IsDrawableLikeChecker checks only unique area styles,
// so we need to take into account point styles too.
if (m_type == FEATURE_TYPE_AREA)
{
IsDrawableLikeChecker doCheck(FEATURE_TYPE_POINT);
if (m_c.ProcessObjects(t, doCheck))
return false;
}
return true;
}
};
}

5
indexer/feature_visibility.hpp
View file

@ -28,10 +28,9 @@ namespace feature
bool IsDrawableAny(uint32_t type);
bool IsDrawableForIndex(FeatureBase const & f, int level);
/// @name Be carefull with FEATURE_TYPE_AREA.
/// It's check only unique area styles, be it also can draw symbol or caption.
//@{
/// For FEATURE_TYPE_AREA need to have at least one area-filling type.
bool IsDrawableLike(vector<uint32_t> const & types, FeatureGeoType ft);
/// For FEATURE_TYPE_AREA removes line-drawing only types.
bool RemoveNoDrawableTypes(vector<uint32_t> & types, FeatureGeoType ft);
//@}