Merge remote-tracking branch 'origin/master'

2018-02-14 20:59:11 +01:00 · 2018-02-14 20:59:11 +01:00 · deaede0256
commit deaede0256
parent c21244683d 25667578be
9 changed files with 1 additions and 0 deletions
--- a/OsmAnd/res/drawable-hdpi/bg_shadow_quick_input_left.png
+++ b/OsmAnd/res/drawable-hdpi/bg_shadow_quick_input_left.png
--- a/OsmAnd/res/drawable-hdpi/bg_shadow_quick_input_right.png
+++ b/OsmAnd/res/drawable-hdpi/bg_shadow_quick_input_right.png
--- a/OsmAnd/res/drawable-mdpi/bg_shadow_quick_input_left.png
+++ b/OsmAnd/res/drawable-mdpi/bg_shadow_quick_input_left.png
--- a/OsmAnd/res/drawable-mdpi/bg_shadow_quick_input_right.png
+++ b/OsmAnd/res/drawable-mdpi/bg_shadow_quick_input_right.png
--- a/OsmAnd/res/drawable-xhdpi/bg_shadow_quick_input_left.png
+++ b/OsmAnd/res/drawable-xhdpi/bg_shadow_quick_input_left.png
--- a/OsmAnd/res/drawable-xhdpi/bg_shadow_quick_input_right.png
+++ b/OsmAnd/res/drawable-xhdpi/bg_shadow_quick_input_right.png
--- a/OsmAnd/res/drawable-xxhdpi/bg_shadow_quick_input_left.png
+++ b/OsmAnd/res/drawable-xxhdpi/bg_shadow_quick_input_left.png
--- a/OsmAnd/res/drawable-xxhdpi/bg_shadow_quick_input_right.png
+++ b/OsmAnd/res/drawable-xxhdpi/bg_shadow_quick_input_right.png
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
@ -312,6 +312,7 @@ public class MeasurementEditingContext {
 					WptPt pt = new WptPt();
 					pt.lat = loc.getLatitude();
 					pt.lon = loc.getLongitude();
+					pt.ele = loc.getAltitude();
 					pts.add(pt);
 				}
 				calculatedPairs++;