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

[ios][android] Replacing altitude difference to ascent and descent (#3062)

Browse source 
* [ios][android] Replacing altitude difference to ascent and descent

The app for pedestrian and cyclists route  show altitude difference
between highest and lowest points. It's not too useful data in multiple
cases. More informative for hikers and cyclists from values of
elevation total ascent and total descent on route.
I replaced altitude difference to total ascent and total descent.

Routing:
- Removed calculation of minRouteAltitude and maxRouteAltitude. Added
  calculation of totalAscent and totalDescent (map/routing_manager.cpp)

iOS:
- Replaced altitudeDifference to 2 separate value totalAscent and
  totalDescent

android:
- Replaced altitudeDifference to 2 separate value totalAscent and
  totalDescent
- Removed unnessesary icon (ic_altitude_difference.webp)

Signed-off-by: Arseny Novikov <arseny.n@gmail.com>

* Applying style guide to map/routing_manager.cpp

Signed-off-by: Arseny Novikov <arseny.n@gmail.com>

* Fixes for route ascent/descent. Used unsigned var types and fix idents

Changes based on pull request (organicmaps/organicmaps#3062) code review.
- fixed idents
- used uint32_t instead int32_t for totalAscent and totalDescent fields
- replaced 2 guard variable initialization to one if

Signed-off-by: Arseny Novikov <arseny.n@gmail.com>

* Route ascent/descent. Fixed field description, final to java constant.

Signed-off-by: Arseny Novikov <arseny.n@gmail.com>

* Explicit cast from uint32_t to jint in jni for ascent/descent

Signed-off-by: Arseny Novikov <arseny.n@gmail.com>

* [ios] Route ascent/descent. Moved font attributes to static field

Signed-off-by: Arseny Novikov <arseny.n@gmail.com>
This commit is contained in:
Arseny Novikov 2022-08-02 01:05:49 +03:00 • committed by GitHub
parent eb4bd4f378
commit e6aaadf28f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 61 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -1230,12 +1230,12 @@ Java_com_mapswithme_maps_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv *
}
vector<uint8_t> imageRGBAData;
int32_t minRouteAltitude = 0;
int32_t maxRouteAltitude = 0;
uint32_t totalAscent = 0;
uint32_t totalDescent = 0;
measurement_utils::Units units = measurement_utils::Units::Metric;
if (!fr->GetRoutingManager().GenerateRouteAltitudeChart(
width, height, altitudes, routePointDistanceM, imageRGBAData,
minRouteAltitude, maxRouteAltitude, units))
totalAscent, totalDescent, units))
{
LOG(LWARNING, ("Can't generate route altitude image."));
return nullptr;
@ -1245,13 +1245,13 @@ Java_com_mapswithme_maps_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv *
jclass const routeAltitudeLimitsClass = env->GetObjectClass(routeAltitudeLimits);
ASSERT(routeAltitudeLimitsClass, ());
static jfieldID const minRouteAltitudeField = env->GetFieldID(routeAltitudeLimitsClass, "minRouteAltitude", "I");
ASSERT(minRouteAltitudeField, ());
env->SetIntField(routeAltitudeLimits, minRouteAltitudeField, minRouteAltitude);
static jfieldID const totalAscentField = env->GetFieldID(routeAltitudeLimitsClass, "totalAscent", "I");
ASSERT(totalAscentField, ());
env->SetIntField(routeAltitudeLimits, totalAscentField, static_cast<jint>(totalAscent));
static jfieldID const maxRouteAltitudeField = env->GetFieldID(routeAltitudeLimitsClass, "maxRouteAltitude", "I");
ASSERT(maxRouteAltitudeField, ());
env->SetIntField(routeAltitudeLimits, maxRouteAltitudeField, maxRouteAltitude);
static jfieldID const totalDescentField = env->GetFieldID(routeAltitudeLimitsClass, "totalDescent", "I");
ASSERT(totalDescentField, ());
env->SetIntField(routeAltitudeLimits, totalDescentField, static_cast<jint>(totalDescent));
static jfieldID const isMetricUnitsField = env->GetFieldID(routeAltitudeLimitsClass, "isMetricUnits", "Z");
ASSERT(isMetricUnitsField, ());

BIN
android/res/drawable-hdpi/ic_altitude_difference.webp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 88 B

BIN
android/res/drawable-mdpi/ic_altitude_difference.webp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 118 B

BIN
android/res/drawable-xhdpi/ic_altitude_difference.webp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 154 B

BIN
android/res/drawable-xxhdpi/ic_altitude_difference.webp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 114 B

BIN
android/res/drawable-xxxhdpi/ic_altitude_difference.webp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 194 B

4
android/src/com/mapswithme/maps/Framework.java
View file

@ -112,8 +112,8 @@ public class Framework
public static class RouteAltitudeLimits
{
public int minRouteAltitude;
public int maxRouteAltitude;
public int totalAscent;
public int totalDescent;
public boolean isMetricUnits;
}

15
android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java
View file

@ -264,17 +264,10 @@ final class RoutingBottomMenuController implements View.OnClickListener
{
mAltitudeChart.setImageBitmap(bm);
UiUtils.show(mAltitudeChart);
String meter = mAltitudeDifference.getResources().getString(R.string.meter);
String foot = mAltitudeDifference.getResources().getString(R.string.foot);
mAltitudeDifference.setText(String.format(Locale.getDefault(), "%d %s",
limits.maxRouteAltitude - limits.minRouteAltitude,
limits.isMetricUnits ? meter : foot));
Drawable icon = ContextCompat.getDrawable(mContext,
R.drawable.ic_altitude_difference);
int colorAccent = ContextCompat.getColor(mContext,
UiUtils.getStyledResourceId(mContext, R.attr.colorAccent));
mAltitudeDifference.setCompoundDrawablesRelativeWithIntrinsicBounds(Graphics.tint(icon, colorAccent),
null, null, null);
final String unit = limits.isMetricUnits ? mAltitudeDifference.getResources().getString(R.string.meter) : mAltitudeDifference.getResources().getString(R.string.foot);
mAltitudeDifference.setText(String.format(Locale.getDefault(), "▲ %d %s ▼ %d %s",
limits.totalAscent, unit,
limits.totalDescent, unit));
UiUtils.show(mAltitudeDifference);
}
}

20
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift
View file

@ -39,6 +39,12 @@ final class BaseRoutePreviewStatus: SolidTouchView {
weak var navigationInfo: MWMNavigationDashboardEntity?
static let elevationAttributes: [NSAttributedString.Key: Any] =
[
.foregroundColor: UIColor.linkBlue(),
.font: UIFont.medium14()
]
var elevation: NSAttributedString? {
didSet {
updateResultsLabel()
@ -118,15 +124,11 @@ final class BaseRoutePreviewStatus: SolidTouchView {
if MWMRouter.hasRouteAltitude() {
heightBox.isHidden = false
MWMRouter.routeAltitudeImage(for: heightProfileImage.frame.size,
completion: { image, elevation in
self.heightProfileImage.image = image
guard let elevation = elevation else { return }
let attributes: [NSAttributedString.Key: Any] =
[
.foregroundColor: UIColor.linkBlue(),
.font: UIFont.medium14()
]
self.elevation = NSAttributedString(string: "▲▼ \(elevation)", attributes: attributes)
completion: { image, totalAscent, totalDescent in
self.heightProfileImage.image = image
if let totalAscent = totalAscent, let totalDescent = totalDescent {
self.elevation = NSAttributedString(string: "▲ \(totalAscent) ▼ \(totalDescent)", attributes: BaseRoutePreviewStatus.elevationAttributes)
}
})
} else {
heightBox.isHidden = true

2
iphone/Maps/Core/Routing/MWMRouter.h
View file

@ -8,7 +8,7 @@ typedef NS_ENUM(NSInteger, MWMRoadType) {
MWMRoadTypeMotorway
};
typedef void (^MWMImageHeightBlock)(UIImage *, NSString *);
typedef void (^MWMImageHeightBlock)(UIImage *, NSString *, NSString *);
@interface MWMRouter : NSObject

21
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -23,7 +23,8 @@ using namespace routing;
@interface MWMRouter () <MWMLocationObserver, MWMFrameworkRouteBuilderObserver>
@property(nonatomic) NSMutableDictionary<NSValue *, NSData *> *altitudeImagesData;
@property(nonatomic) NSString *altitudeElevation;
@property(nonatomic) NSString *totalAscent;
@property(nonatomic) NSString *totalDescent;
@property(nonatomic) dispatch_queue_t renderAltitudeImagesQueue;
@property(nonatomic) uint32_t routeManagerTransactionId;
@property(nonatomic) BOOL canAutoAddLastLocation;
@ -370,13 +371,13 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
NSData *imageData = router.altitudeImagesData[sizeValue];
if (!imageData) {
std::vector<uint8_t> imageRGBAData;
int32_t minRouteAltitude = 0;
int32_t maxRouteAltitude = 0;
uint32_t totalAscent = 0;
uint32_t totalDescent = 0;
measurement_utils::Units units = measurement_utils::Units::Metric;
if (!GetFramework().GetRoutingManager().GenerateRouteAltitudeChart(width, height, *altitudes,
*routePointDistanceM, imageRGBAData,
minRouteAltitude, maxRouteAltitude, units)) {
totalAscent, totalDescent, units)) {
return;
}
@ -386,15 +387,16 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
router.altitudeImagesData[sizeValue] = imageData;
auto const localizedUnits = platform::GetLocalizedAltitudeUnits();
auto const height = maxRouteAltitude - minRouteAltitude;
router.altitudeElevation =
@(measurement_utils::FormatAltitudeWithLocalization(height, localizedUnits.m_low).c_str());
router.totalAscent =
@(measurement_utils::FormatAltitudeWithLocalization(totalAscent, localizedUnits.m_low).c_str());
router.totalDescent =
@(measurement_utils::FormatAltitudeWithLocalization(totalDescent, localizedUnits.m_low).c_str());
}
dispatch_async(dispatch_get_main_queue(), ^{
UIImage *altitudeImage = [UIImage imageWithRGBAData:imageData width:width height:height];
if (altitudeImage)
block(altitudeImage, router.altitudeElevation);
block(altitudeImage, router.totalAscent, router.totalDescent);
});
});
}
@ -403,7 +405,8 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
auto router = self.router;
dispatch_async(router.renderAltitudeImagesQueue, ^{
[router.altitudeImagesData removeAllObjects];
router.altitudeElevation = nil;
router.totalAscent = nil;
router.totalDescent = nil;
});
}

26
map/routing_manager.cpp
View file

@ -1158,8 +1158,8 @@ bool RoutingManager::GenerateRouteAltitudeChart(uint32_t width, uint32_t height,
geometry::Altitudes const & altitudes,
vector<double> const & routePointDistanceM,
vector<uint8_t> & imageRGBAData,
int32_t & minRouteAltitude,
int32_t & maxRouteAltitude,
uint32_t & totalAscent,
uint32_t & totalDescent,
measurement_utils::Units & altitudeUnits) const
{
CHECK_EQUAL(altitudes.size(), routePointDistanceM.size(), ());
@ -1170,9 +1170,17 @@ bool RoutingManager::GenerateRouteAltitudeChart(uint32_t width, uint32_t height,
GetStyleReader().GetCurrentStyle(), imageRGBAData))
return false;
auto const minMaxIt = minmax_element(altitudes.cbegin(), altitudes.cend());
geometry::Altitude const minRouteAltitudeM = *minMaxIt.first;
geometry::Altitude const maxRouteAltitudeM = *minMaxIt.second;
uint32_t totalAscentM = 0;
uint32_t totalDescentM = 0;
int16_t delta;
for (size_t i = 1; i < altitudes.size(); i++) {
delta = altitudes[i] - altitudes[i - 1];
if (delta > 0)
totalAscentM += delta;
else
totalDescentM += -delta;
}
if (!settings::Get(settings::kMeasurementUnits, altitudeUnits))
altitudeUnits = measurement_utils::Units::Metric;
@ -1180,12 +1188,12 @@ bool RoutingManager::GenerateRouteAltitudeChart(uint32_t width, uint32_t height,
switch (altitudeUnits)
{
case measurement_utils::Units::Imperial:
minRouteAltitude = measurement_utils::MetersToFeet(minRouteAltitudeM);
maxRouteAltitude = measurement_utils::MetersToFeet(maxRouteAltitudeM);
totalAscent = measurement_utils::MetersToFeet(totalAscentM);
totalDescent = measurement_utils::MetersToFeet(totalDescentM);
break;
case measurement_utils::Units::Metric:
minRouteAltitude = minRouteAltitudeM;
maxRouteAltitude = maxRouteAltitudeM;
totalAscent = totalAscentM;
totalDescent = totalDescentM;
break;
}
return true;

9
map/routing_manager.hpp
View file

@ -277,8 +277,8 @@ public:
/// \param altitudes route points altitude.
/// \param routePointDistanceM distance in meters from route beginning to route points.
/// \param imageRGBAData is bits of result image in RGBA.
/// \param minRouteAltitude is min altitude along the route in altitudeUnits.
/// \param maxRouteAltitude is max altitude along the route in altitudeUnits.
/// \param totalAscent is total ascent of the route in altitudeUnits.
/// \param totalDescent is total descent of the route in altitudeUnits.
/// \param altitudeUnits is units (meters or feet) which is used to pass min and max altitudes.
/// \returns If there is valid route info and the chart was generated returns true
/// and false otherwise. If the method returns true it is guaranteed that the size of
@ -288,8 +288,9 @@ public:
bool GenerateRouteAltitudeChart(uint32_t width, uint32_t height,
geometry::Altitudes const & altitudes,
std::vector<double> const & routePointDistanceM,
std::vector<uint8_t> & imageRGBAData, int32_t & minRouteAltitude,
int32_t & maxRouteAltitude,
std::vector<uint8_t> & imageRGBAData,
uint32_t & totalAscent,
uint32_t & totalDescent,
measurement_utils::Units & altitudeUnits) const;
uint32_t OpenRoutePointsTransaction();