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

Some minor fixes.

Browse source
This commit is contained in:
vng 2011-03-24 22:03:23 +02:00 • committed by Alex Zolotarev
parent cf0c478f23
commit 3d208531a7
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
indexer/geometry_coding.cpp
View file

@ -14,8 +14,9 @@ namespace
template <typename T>
inline m2::PointU ClampPoint(m2::PointU const & maxPoint, m2::Point<T> const & point)
{
return m2::PointU(my::clamp(static_cast<m2::PointU::value_type>(point.x), static_cast<m2::PointU::value_type>(0), maxPoint.x),
my::clamp(static_cast<m2::PointU::value_type>(point.y), static_cast<m2::PointU::value_type>(0), maxPoint.y));
typedef m2::PointU::value_type uvalue_t;
return m2::PointU(my::clamp(static_cast<uvalue_t>(point.x), static_cast<uvalue_t>(0), maxPoint.x),
my::clamp(static_cast<uvalue_t>(point.y), static_cast<uvalue_t>(0), maxPoint.y));
}
}

2
indexer/geometry_serialization.cpp
View file

@ -24,6 +24,8 @@ namespace serial
inline m2::PointD U2D(m2::PointU const & p)
{
CoordPointT const pt = PointU2PointD(p);
ASSERT ( MercatorBounds::minX <= pt.first && pt.first <= MercatorBounds::maxX, (pt.first) );
ASSERT ( MercatorBounds::minY <= pt.second && pt.second <= MercatorBounds::maxY, (pt.second) );
return m2::PointD(pt.first, pt.second);
}

9
indexer/index.hpp
View file

@ -134,7 +134,7 @@ public:
m_eActiveForEachIndexAction = ACTIVE_FOR_EACH_INDEX_DO_NOTHING;
}
if (IndexT * pIndex = m_pActiveForEachIndex->GetIndex(scale, occlusionRect))
if (IndexT * pIndex = m_pActiveForEachIndex->GetIndex(static_cast<int>(scale), occlusionRect))
pIndex->ForEachInIntervalAndScale(f, beg, end, scale, query);
}
@ -225,11 +225,10 @@ private:
}
// TODO: GetIndex(), Open() and Close() make Index single-threaded!
IndexT * GetIndex(uint32_t scale, m2::RectD const & occlusionRect)
IndexT * GetIndex(int scale, m2::RectD const & occlusionRect)
{
if ((m_scaleRange.first <= static_cast<int>(scale)
&& static_cast<int>(scale) <= m_scaleRange.second)
&& m_Rect.IsIntersect(occlusionRect))
if ((m_scaleRange.first <= scale && scale <= m_scaleRange.second) &&
m_Rect.IsIntersect(occlusionRect))
{
Open();
m_QueriesSkipped = 0;

6
indexer/point_to_int64.cpp
View file

@ -14,10 +14,8 @@
m2::PointU PointD2PointU(CoordT x, CoordT y)
{
if (x < MercatorBounds::minX) x = MercatorBounds::minX;
if (y < MercatorBounds::minY) y = MercatorBounds::minY;
if (x > MercatorBounds::maxX) x = MercatorBounds::maxX;
if (y > MercatorBounds::maxY) y = MercatorBounds::maxY;
x = my::clamp(x, MercatorBounds::minX, MercatorBounds::maxX);
y = my::clamp(y, MercatorBounds::minY, MercatorBounds::maxY);
uint32_t const ix = static_cast<uint32_t>(0.5 + (x - MercatorBounds::minX)
/ (MercatorBounds::maxX - MercatorBounds::minX) * (1 << POINT_COORD_BITS));

2
map/framework.hpp
View file

@ -508,7 +508,7 @@ public:
Invalidate();
}
/// Show all model by it's worl rect.
/// Show all model by it's world rect.
void ShowAll()
{
SetMaxWorldRect();