kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Add MercatorBounds::FullRect().

Browse source
This commit is contained in:
vng 2012-09-21 02:22:22 +03:00 • committed by Alex Zolotarev
parent 52ef202674
commit 94fa7d216c
6 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
generator/polygonizer.hpp
View file

@ -70,9 +70,7 @@ namespace feature
{
// Insert fake country polygon equal to whole world to
// create only one output file which contains all features
m_countries.Add(borders::CountryPolygons(),
m2::RectD(MercatorBounds::minX, MercatorBounds::minY,
MercatorBounds::maxX, MercatorBounds::maxY));
m_countries.Add(borders::CountryPolygons(), MercatorBounds::FullRect());
}
}
~Polygonizer()

2
indexer/mercator.hpp
View file

@ -12,6 +12,8 @@ struct MercatorBounds
static double minY;
static double maxY;
inline static m2::RectD FullRect() { return m2::RectD(minX, minY, maxX, maxY); }
inline static bool ValidLon(double d)
{
return my::between_s(-180.0, 180.0, d);

5
map/feature_vec_model.cpp
View file

@ -107,10 +107,7 @@ m2::RectD FeaturesFetcher::GetWorldRect() const
{
// rect is empty when now countries are loaded
// return max global rect
return m2::RectD(MercatorBounds::minX,
MercatorBounds::minY,
MercatorBounds::maxX,
MercatorBounds::maxY);
return MercatorBounds::FullRect();
}
return m_rect;
}

3
map/framework.cpp
View file

@ -437,8 +437,7 @@ void Framework::SetNeedRedraw(bool flag)
void Framework::Invalidate(bool doForceUpdate)
{
InvalidateRect(m2::RectD(MercatorBounds::minX, MercatorBounds::minY,
MercatorBounds::maxX, MercatorBounds::maxY), doForceUpdate);
InvalidateRect(MercatorBounds::FullRect(), doForceUpdate);
}
void Framework::InvalidateRect(m2::RectD const & rect, bool doForceUpdate)

3
map/map_tests/multithread_map_test.cpp
View file

@ -66,8 +66,7 @@ namespace
m2::RectD const r = src.GetWorldRect();
TEST ( r.IsValid(), () );
m2::RectD world(MercatorBounds::minX, MercatorBounds::minY,
MercatorBounds::maxX, MercatorBounds::maxY);
m2::RectD world(MercatorBounds::FullRect());
world.Inflate(-10.0, -10.0);
TEST ( world.IsRectInside(r), () );

8
map/navigator.cpp
View file

@ -27,14 +27,14 @@ namespace
}
Navigator::Navigator()
: m_worldRect(MercatorBounds::minX, MercatorBounds::minY, MercatorBounds::maxX, MercatorBounds::maxY),
: m_worldRect(MercatorBounds::FullRect()),
m_InAction(false),
m_DoSupportRotation(false)
{
}
Navigator::Navigator(ScreenBase const & screen)
: m_worldRect(MercatorBounds::minX, MercatorBounds::minY, MercatorBounds::maxX, MercatorBounds::maxY),
: m_worldRect(MercatorBounds::FullRect()),
m_StartScreen(screen),
m_Screen(screen),
m_InAction(false),
@ -99,9 +99,7 @@ bool Navigator::LoadState()
return false;
// additional check for valid rect
m2::RectD const r = rect.GetGlobalRect();
if (r.minX() < MercatorBounds::minX || r.minY() < MercatorBounds::minY
|| r.maxX() > MercatorBounds::maxX || r.maxY() > MercatorBounds::maxY)
if (!MercatorBounds::FullRect().IsRectInside(rect.GetGlobalRect()))
return false;
SetFromRect(rect);