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

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-09-08 16:29:32 +03:00
parent ce4eb4025a
commit 2da3d96b27
7 changed files with 62 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
map/chart_generator.cpp
View file

@ -47,6 +47,38 @@ struct BlendAdaptor
}
}
};
agg::rgba8 GetLineColor(MapStyle mapStyle)
{
switch (mapStyle)
{
case MapStyleCount:
LOG(LERROR, ("Wrong map style param."));
// No need break or return here.
case MapStyleDark:
return agg::rgba8(255, 230, 140, 255);
case MapStyleLight:
case MapStyleClear:
case MapStyleMerged:
return agg::rgba8(30, 150, 240, 255);
}
}
agg::rgba8 GetCurveColor(MapStyle mapStyle)
{
switch (mapStyle)
{
case MapStyleCount:
LOG(LERROR, ("Wrong map style param."));
// No need break or return here.
case MapStyleDark:
return agg::rgba8(255, 230, 140, 20);
case MapStyleLight:
case MapStyleClear:
case MapStyleMerged:
return agg::rgba8(30, 150, 240, 20);
}
}
} // namespace
namespace maps
@ -82,13 +114,8 @@ bool NormalizeChartData(vector<double> const & distanceDataM,
return static_cast<double>(altitudeDataM.back());
auto const lowerIt = lower_bound(distanceDataM.cbegin(), distanceDataM.cend(), distFormStartM);
if (lowerIt == distanceDataM.cbegin())
return static_cast<double>(altitudeDataM.front());
if (lowerIt == distanceDataM.cend())
return static_cast<double>(altitudeDataM.back());
size_t const nextPointIdx = distance(distanceDataM.cbegin(), lowerIt);
CHECK_LESS(0, nextPointIdx, ("distFormStartM is greater than 0 but nextPointIdx == 0."));
ASSERT_LESS(0, nextPointIdx, ("distFormStartM is greater than 0 but nextPointIdx == 0."));
size_t const prevPointIdx = nextPointIdx - 1;
if (my::AlmostEqualAbs(distanceDataM[prevPointIdx], distanceDataM[nextPointIdx], kEpsilon))
@ -102,13 +129,8 @@ bool NormalizeChartData(vector<double> const & distanceDataM,
double const routeLenM = distanceDataM.back();
uniformAltitudeDataM.resize(resultPointCount);
if (resultPointCount == 1)
{
uniformAltitudeDataM[0] = calculateAltitude(routeLenM / 2.0);
return true;
}
double const stepLenM = resultPointCount <= 1 ? 0.0 : routeLenM / (resultPointCount - 1);
double const stepLenM = routeLenM / static_cast<double>(resultPointCount - 1);
for (size_t i = 0; i < resultPointCount; ++i)
uniformAltitudeDataM[i] = calculateAltitude(static_cast<double>(i) * stepLenM);
@ -123,44 +145,43 @@ bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
return true;
uint32_t constexpr kHeightIndentPxl = 2;
uint32_t heightIndent = kHeightIndentPxl;
uint32_t heightIndentPxl = kHeightIndentPxl;
if (height <= 2 * kHeightIndentPxl)
{
LOG(LERROR, ("Chart height is less or equal than 2 * kHeightIndentPxl (", 2 * kHeightIndentPxl, ")"));
heightIndent = 0;
heightIndentPxl = 0;
}
auto const minMaxAltitudeIt = minmax_element(altitudeDataM.begin(), altitudeDataM.end());
double const minAltM = *minMaxAltitudeIt.first;
double const maxAltM = *minMaxAltitudeIt.second;
double const deltaAltM = maxAltM - minAltM;
uint32_t const drawHeightPxl = height - 2 * heightIndent;
double const meterPerPxl = max(minMetersPerPxl, deltaAltM / static_cast<double>(drawHeightPxl));
if (meterPerPxl == 0.0)
uint32_t const drawHeightPxl = height - 2 * heightIndentPxl;
double const metersPerPxl = max(minMetersPerPxl, deltaAltM / static_cast<double>(drawHeightPxl));
if (metersPerPxl == 0.0)
{
LOG(LERROR, ("meterPerPxl == 0.0"));
LOG(LERROR, ("metersPerPxl == 0.0"));
return false;
}
size_t const altitudeDataSz = altitudeDataM.size();
yAxisDataPxl.resize(altitudeDataSz);
for (size_t i = 0; i < altitudeDataSz; ++i)
yAxisDataPxl[i] = height - heightIndent - (altitudeDataM[i] - minAltM) / meterPerPxl;
yAxisDataPxl[i] = height - heightIndentPxl - (altitudeDataM[i] - minAltM) / metersPerPxl;
return true;
}
void GenerateChartByPoints(uint32_t width, uint32_t height, vector<m2::PointD> const & geometry,
bool lightTheme, vector<uint8_t> & frameBuffer)
MapStyle mapStyle, vector<uint8_t> & frameBuffer)
{
frameBuffer.clear();
if (width == 0 || height == 0)
return;
agg::rgba8 const kBackgroundColor = agg::rgba8(255, 255, 255, 0);
agg::rgba8 const kLineColor =
lightTheme ? agg::rgba8(30, 150, 240, 255) : agg::rgba8(255, 230, 140, 255);
agg::rgba8 const kCurveColor = lightTheme ? agg::rgba8(30, 150, 240, 20) : agg::rgba8(255, 230, 140, 20);
agg::rgba8 const kLineColor = GetLineColor(mapStyle);
agg::rgba8 const kCurveColor = GetCurveColor(mapStyle);
double constexpr kLineWidthPxl = 2.0;
uint32_t constexpr kBPP = 4;
@ -218,7 +239,7 @@ void GenerateChartByPoints(uint32_t width, uint32_t height, vector<m2::PointD> c
}
bool GenerateChart(uint32_t width, uint32_t height, vector<double> const & distanceDataM,
feature::TAltitudes const & altitudeDataM, bool lightTheme,
feature::TAltitudes const & altitudeDataM, MapStyle mapStyle,
vector<uint8_t> & frameBuffer)
{
if (distanceDataM.size() != altitudeDataM.size())
@ -248,7 +269,7 @@ bool GenerateChart(uint32_t width, uint32_t height, vector<double> const & dista
}
frameBuffer.clear();
GenerateChartByPoints(width, height, geometry, lightTheme, frameBuffer);
GenerateChartByPoints(width, height, geometry, mapStyle, frameBuffer);
return true;
}
} // namespace maps

8
map/chart_generator.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include "indexer/feature_altitude.hpp"
#include "indexer/map_style.hpp"
#include "geometry/point2d.hpp"
@ -30,14 +31,13 @@ bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
/// \param width is result image width in pixels.
/// \param height is result image height in pixels.
/// \param geometry is points which is used to draw a curve of the chart.
/// \param lightTheme is true for light theme image colors
/// and false for night image colors.
/// \param mapStyle is a current map style.
/// \param frameBuffer is a vector for a result image. It's resized in this method.
/// It's filled with RGBA(8888) image date.
void GenerateChartByPoints(uint32_t width, uint32_t height, vector<m2::PointD> const & geometry,
bool lightTheme, vector<uint8_t> & frameBuffer);
MapStyle mapStyle, vector<uint8_t> & frameBuffer);
bool GenerateChart(uint32_t width, uint32_t height, vector<double> const & distanceDataM,
feature::TAltitudes const & altitudeDataM, bool lightTheme,
feature::TAltitudes const & altitudeDataM, MapStyle mapStyle,
vector<uint8_t> & frameBuffer);
} // namespace maps

9
map/framework.cpp
View file

@ -1694,11 +1694,6 @@ MapStyle Framework::GetMapStyle() const
return GetStyleReader().GetCurrentStyle();
}
bool Framework::IsLightMapTheme() const
{
return GetMapStyle() != MapStyleDark;
}
void Framework::SetupMeasurementSystem()
{
GetPlatform().SetupMeasurementSystem();
@ -2997,10 +2992,10 @@ bool Framework::GenerateRouteAltitudeChart(uint32_t width, uint32_t height,
if (!m_routingSession.GetRouteAltitudes(altitudes))
return false;
vector<double> segDistanceM;
if (!m_routingSession.GetSegDistanceM(segDistanceM) && segDistanceM.empty())
if (!m_routingSession.GetSegDistanceM(segDistanceM))
return false;
segDistanceM.insert(segDistanceM.begin(), 0.0);
return maps::GenerateChart(width, height, segDistanceM, altitudes,
IsLightMapTheme(), imageRGBAData);
GetMapStyle(), imageRGBAData);
}

1
map/framework.hpp
View file

@ -416,7 +416,6 @@ public:
void SetMapStyle(MapStyle mapStyle);
void MarkMapStyle(MapStyle mapStyle);
MapStyle GetMapStyle() const;
bool IsLightMapTheme() const;
void SetupMeasurementSystem();

16
map/map_tests/chart_generator_tests.cpp
View file

@ -116,7 +116,7 @@ UNIT_TEST(GenerateYAxisChartData_EmptyAltitudeDataTest)
TEST(yAxisDataPxl.empty(), ());
}
UNIT_TEST(GenerateYAxisChartDataTest)
UNIT_TEST(GenerateYAxisChartData_Test)
{
vector<double> const altitudeDataM = {0.0, 2.0, 0.0, -2.0, 1.0};
vector<double> yAxisDataPxl;
@ -133,7 +133,7 @@ UNIT_TEST(GenerateChartByPoints_NoGeometryTest)
size_t constexpr height = 40;
vector<uint8_t> frameBuffer;
maps::GenerateChartByPoints(width, height, geometry, true /* lightTheme */, frameBuffer);
maps::GenerateChartByPoints(width, height, geometry, MapStyleLight /* mapStyle */, frameBuffer);
TestAngleColors(width, height, frameBuffer, 255 /* expectedR */, 255 /* expectedG */,
255 /* expectedB */, 0 /* expectedA */);
}
@ -145,7 +145,7 @@ UNIT_TEST(GenerateChartByPoints_OnePointTest)
size_t constexpr height = 40;
vector<uint8_t> frameBuffer;
maps::GenerateChartByPoints(width, height, geometry, true /* lightTheme */, frameBuffer);
maps::GenerateChartByPoints(width, height, geometry, MapStyleLight /* mapStyle */, frameBuffer);
TestAngleColors(width, height, frameBuffer, 255 /* expectedR */, 255 /* expectedG */,
255 /* expectedB */, 0 /* expectedA */);
}
@ -158,7 +158,7 @@ UNIT_TEST(GenerateChartByPoints_Test)
size_t constexpr height = 40;
vector<uint8_t> frameBuffer;
maps::GenerateChartByPoints(width, height, geometry, true /* lightTheme */, frameBuffer);
maps::GenerateChartByPoints(width, height, geometry, MapStyleLight /* mapStyle */, frameBuffer);
TEST_EQUAL(frameBuffer.size(), width * height * kBPP, ());
TEST(IsColor(frameBuffer, 0 /* startColorIdx */, 30 /* expectedR */, 150 /* expectedG */,
@ -176,7 +176,7 @@ UNIT_TEST(GenerateChart_NoPointsTest)
feature::TAltitudes const & altitudeDataM = {};
vector<uint8_t> frameBuffer;
TEST(maps::GenerateChart(width, 50 /* height */, distanceDataM, altitudeDataM, false /* lightTheme */,
TEST(maps::GenerateChart(width, 50 /* height */, distanceDataM, altitudeDataM, MapStyleDark /* mapStyle */,
frameBuffer),
());
TestAngleColors(width, 50 /* height */, frameBuffer, 255 /* expectedR */, 255 /* expectedG */,
@ -191,7 +191,7 @@ UNIT_TEST(GenerateChart_OnePointTest)
feature::TAltitudes const & altitudeDataM = {0};
vector<uint8_t> frameBuffer;
TEST(maps::GenerateChart(width, height, distanceDataM, altitudeDataM, false /* lightTheme */,
TEST(maps::GenerateChart(width, height, distanceDataM, altitudeDataM, MapStyleDark /* mapStyle */,
frameBuffer),
());
TEST_EQUAL(frameBuffer.size(), width * height * kBPP, ());
@ -208,7 +208,7 @@ UNIT_TEST(GenerateChart_EmptyRectTest)
feature::TAltitudes const & altitudeDataM = {};
vector<uint8_t> frameBuffer;
TEST(maps::GenerateChart(width, 50 /* height */, distanceDataM, altitudeDataM, false /* lightTheme */,
TEST(maps::GenerateChart(width, 50 /* height */, distanceDataM, altitudeDataM, MapStyleDark /* mapStyle */,
frameBuffer),
());
TEST(frameBuffer.empty(), ());
@ -221,7 +221,7 @@ UNIT_TEST(GenerateChart_Test)
feature::TAltitudes const & altitudeDataM = {0, 1000};
vector<uint8_t> frameBuffer;
TEST(maps::GenerateChart(width, 50 /* height */, distanceDataM, altitudeDataM, false /* lightTheme */,
TEST(maps::GenerateChart(width, 50 /* height */, distanceDataM, altitudeDataM, MapStyleDark /* mapStyle */,
frameBuffer),
());
TEST(IsColor(frameBuffer, 0 /* startColorIdx */, 255 /* expectedR */, 255 /* expectedG */,

2
routing/route.hpp
View file

@ -55,7 +55,7 @@ public:
Update();
}
inline void SetTurnInstructions(TTurns &&v) { m_turns = move(v); }
inline void SetTurnInstructions(TTurns && v) { m_turns = move(v); }
inline void SetSectionTimes(TTimes && v) { m_times = move(v); }
inline void SetStreetNames(TStreets && v) { m_streets = move(v); }
inline void SetAltitudes(feature::TAltitudes && v) { m_altitudes = move(v); }

3
routing/routing_session.cpp
View file

@ -525,8 +525,7 @@ void RoutingSession::EmitCloseRoutingEvent() const
bool RoutingSession::HasRouteAltitudeImpl() const
{
return !m_route.GetAltitudes().empty()
&& m_route.GetAltitudes().size() == m_route.GetSegDistanceM().size() + 1;
return m_route.GetAltitudes().size() == m_route.GetSegDistanceM().size() + 1;
}
bool RoutingSession::HasRouteAltitude() const