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

[elevation info] invalid difficulty is added.

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-03-25 15:33:34 +03:00 • committed by Vladimir Byko-Ianko
parent 7b0f3c5cf2
commit 3aef0b8814
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java
View file

@ -17,6 +17,7 @@ import java.util.Objects;
public class ElevationProfileViewRenderer implements PlacePageViewRenderer<PlacePageData>
{
// Must be correspond to map/elevation_info.hpp constants.
private static final int MAX_DIFFICULTY_LEVEL = 3;
@SuppressWarnings("NullableProblems")
@ -92,6 +93,9 @@ public class ElevationProfileViewRenderer implements PlacePageViewRenderer<Place
for (View levelView : mDifficultyLevels)
levelView.setEnabled(false);
if (level > MAX_DIFFICULTY_LEVEL)
return;
for (int i = 0; i < level; i++)
mDifficultyLevels[i].setEnabled(true);
}

2
map/elevation_info.cpp
View file

@ -49,7 +49,7 @@ ElevationInfo::ElevationInfo(Track const & track)
if (m_difficulty > kMaxDifficulty)
{
LOG(LWARNING, ("Invalid difficulty value", m_difficulty, "in track", track.GetName()));
m_difficulty = kMaxDifficulty;
m_difficulty = kInvalidDifficulty;
}
FillProperty(properties, kDurationKey, m_duration);

4
map/elevation_info.hpp
View file

@ -40,6 +40,7 @@ public:
private:
static uint8_t constexpr kMaxDifficulty = 3;
static uint8_t constexpr kInvalidDifficulty = kMaxDifficulty + 1;
kml::TrackId m_id = kml::kInvalidTrackId;
std::string m_name;
@ -54,7 +55,8 @@ private:
// Altitude in meters.
uint16_t m_maxAltitude = 0;
// Some digital difficulty level with value in range [0-kMaxDifficulty]
uint8_t m_difficulty = 0;
// or kInvalidDifficulty when difficulty is not found or incorrect.
uint8_t m_difficulty = kInvalidDifficulty;
// Duration in seconds.
uint32_t m_duration = 0;
};