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

[search] Fix result viewport for features with no any texts.

Browse source
This commit is contained in:
vng 2012-02-09 00:23:06 +03:00 • committed by Alex Zolotarev
parent c7913216d2
commit fc21bc03b5
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
indexer/feature_utils.cpp
View file

@ -80,6 +80,10 @@ public:
{
// get minimal draw text scale for feature type, that not mentioned in GetScaleForType
scale = feature::DrawableScaleRangeForText(types).first;
// if no texts at all - show at maximum zoom
if (scale == -1)
scale = upperScale;
}
return scales::GetRectForLevel(scale, center, 1.0);

4
indexer/feature_visibility.hpp
View file

@ -28,8 +28,12 @@ namespace feature
int MinDrawableScaleForFeature(FeatureBase const & f);
/// @name Get scale range when feature's text is visible.
/// @return [-1, -1] if no any text exists
//@{
pair<int, int> DrawableScaleRangeForText(TypesHolder const & types);
pair<int, int> DrawableScaleRangeForText(FeatureBase const & f);
//@}
/// @return (geometry type, is coastline)
pair<int, bool> GetDrawRule(FeatureBase const & f, int level,