Merge remote-tracking branch 'origin/master'

OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java

@@ -251,7 +251,7 @@ public class GpxSelectionHelper {
 		}
 		return null;
 	}
-	
+
 	public SelectedGpxFile getSelectedCurrentRecordingTrack() {
 		for (SelectedGpxFile s : selectedGPXFiles) {
 			if (s.isShowCurrentTrack()) {
@@ -260,7 +260,7 @@ public class GpxSelectionHelper {
 		}
 		return null;
 	}
-	
+
 	public void setGpxFileToDisplay(GPXFile... gpxs) {
 		// special case for gpx current route
 		for(GPXFile gpx : gpxs) {

OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java

@@ -2,7 +2,6 @@ package net.osmand.plus.routepointsnavigation;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import net.osmand.CallbackWithObject;
 import net.osmand.data.LatLon;
 import net.osmand.plus.GPXUtilities;

OsmAnd/src/net/osmand/plus/views/GPXLayer.java

@@ -165,6 +165,11 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		for (List<WptPt> l : points) {
 			path.rewind();
 			paint.setPathEffect(routePoints ? pathEffect : null);
+			if (routePoints){
+				paint.setStrokeCap(Cap.BUTT);
+			} else {
+				paint.setStrokeCap(Cap.ROUND);
+			}
 			int startIndex = -1;
 
 			for (int i = 0; i < l.size(); i++) {