From fbec2abd195c9b0a3d0cb4cc35f4e35c8fc83458 Mon Sep 17 00:00:00 2001
From: cepprice <super.cepprice@gmail.com>
Date: Fri, 16 Apr 2021 19:23:54 +0500
Subject: [PATCH] Small fixes

---
 .../java/net/osmand/router/RouteColorize.java |  2 +
 .../views/layers/geometry/GeometryWay.java    |  7 ++
 .../layers/geometry/GeometryWayContext.java   |  4 ++
 .../layers/geometry/RouteGeometryWay.java     | 66 ++++++++++---------
 .../geometry/RouteGeometryWayDrawer.java      |  1 -
 5 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RouteColorize.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteColorize.java
index 62186a8bb3..0db39d0695 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/RouteColorize.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteColorize.java
@@ -266,6 +266,8 @@ public class RouteColorize {
             List<RouteColorizationPoint> sublist = dataList.subList(prevId, currentId);
             simplified.addAll(getExtremums(sublist));
         }
+        Node lastSurvivedPoint = result.get(result.size() - 1);
+        simplified.add(dataList.get((int) lastSurvivedPoint.getId()));
         return simplified;
     }
 
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java
index 2cfb950200..9bb4bf9445 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java
@@ -139,6 +139,11 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
 	@NonNull
 	public abstract GeometryWayStyle<?> getDefaultWayStyle();
 
+	@NonNull
+	protected Map<Integer, GeometryWayStyle<?>> getStyleMap() {
+		return styleMap;
+	}
+
 	public Location getNextVisiblePoint() {
 		return null;
 	}
@@ -380,6 +385,8 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
 					}
 				}
 				context.clearCustomColor();
+				context.clearCustomShader();
+
 			}
 			drawer.drawArrowsOverPath(canvas, tb, tx, ty, angles, distances, distToFinish, styles);
 		} finally {
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayContext.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayContext.java
index d53160bd04..c4a58478d6 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayContext.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayContext.java
@@ -105,6 +105,10 @@ public abstract class GeometryWayContext {
 		attrs.customColor = 0;
 	}
 
+	public void clearCustomShader() {
+		attrs.customColorPaint.setShader(null);
+	}
+
 	public int getStrokeColor(int sourceColor) {
 		return ColorUtils.blendARGB(sourceColor, Color.BLACK, 0.6f);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWay.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWay.java
index 28eef91f07..8d3ff947e9 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWay.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWay.java
@@ -15,6 +15,7 @@ import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.track.GradientScaleType;
 import net.osmand.router.RouteColorize;
 import net.osmand.router.RouteColorize.RouteColorizationPoint;
+import net.osmand.util.Algorithms;
 
 import java.util.Collections;
 import java.util.List;
@@ -46,6 +47,11 @@ public class RouteGeometryWay extends GeometryWay<RouteGeometryWayContext, Route
 	                                @Nullable Float width,
 	                                @Nullable @ColorInt Integer pointColor,
 									@Nullable GradientScaleType scaleType) {
+		if (scaleType != null && !Algorithms.objectEquals(customWidth, width)) {
+			for (GeometryWayStyle<?> style : getStyleMap().values()) {
+				style.width = width;
+			}
+		}
 		this.customColor = color;
 		this.customWidth = width;
 		this.customPointColor = pointColor;
@@ -54,50 +60,46 @@ public class RouteGeometryWay extends GeometryWay<RouteGeometryWayContext, Route
 		if (width != null) {
 			getContext().getAttrs().shadowPaint.setStrokeWidth(width + getContext().getDensity() * 2);
 		}
-
+		getContext().getAttrs().customColorPaint.setStrokeCap(scaleType != null ? Paint.Cap.ROUND : Paint.Cap.BUTT);
 	}
 
 	public void updateRoute(RotatedTileBox tb, RouteCalculationResult route, OsmandApplication app) {
-		if (tb.getMapDensity() == getMapDensity() && this.route == route && prevScaleType == scaleType) {
-			return;
+		if (tb.getMapDensity() != getMapDensity() || this.route != route || prevScaleType != scaleType) {
+			this.route = route;
+			List<Location> locations = route != null ? route.getImmutableAllLocations() : Collections.<Location>emptyList();
+
+			if (scaleType == null || locations.size() < 2) {
+				updateWay(locations, tb);
+				return;
+			}
+			GPXFile gpxFile = GpxUiHelper.makeGpxFromRoute(route, app);
+			if (!gpxFile.hasAltitude) {
+				updateWay(locations, tb);
+				return;
+			}
+
+			// Start point can have wrong zero altitude
+			List<GPXUtilities.WptPt> pts = gpxFile.tracks.get(0).segments.get(0).points;
+			GPXUtilities.WptPt firstPt = pts.get(0);
+			if (firstPt.ele == 0) {
+				firstPt.ele = pts.get(1).ele;
+			}
+
+			RouteColorize routeColorize = new RouteColorize(tb.getZoom(), gpxFile, null, scaleType.toColorizationType(), 0);
+			List<RouteColorizationPoint> points = routeColorize.getResult(false);
+
+			updateWay(new GradientGeometryWayProvider(routeColorize, points), createStyles(points), tb);
 		}
-
-		this.route = route;
-		List<Location> locations = route != null ? route.getImmutableAllLocations() : Collections.<Location>emptyList();
-
-		if (scaleType == null || locations.size() < 2) {
-			updateWay(locations, tb);
-			return;
-		}
-		GPXFile gpxFile = GpxUiHelper.makeGpxFromRoute(route, app);
-		if (!gpxFile.hasAltitude) {
-			updateWay(locations, tb);
-			return;
-		}
-
-		// Start point can have wrong zero altitude
-		List<GPXUtilities.WptPt> pts = gpxFile.tracks.get(0).segments.get(0).points;
-		GPXUtilities.WptPt firstPt = pts.get(0);
-		if (firstPt.ele == 0) {
-			firstPt.ele = pts.get(1).ele;
-		}
-
-		RouteColorize routeColorize = new RouteColorize(tb.getZoom(), gpxFile, null, scaleType.toColorizationType(), 0);
-		List<RouteColorizationPoint> points = routeColorize.getResult(false);
-
-		updateWay(new GradientGeometryWayProvider(routeColorize), createStyles(points), tb);
 	}
 
 	private Map<Integer, GeometryWayStyle<?>> createStyles(List<RouteColorizationPoint> points) {
 		Map<Integer, GeometryWayStyle<?>> styleMap = new TreeMap<>();
-
 		for (int i = 1; i < points.size(); i++) {
 			GeometryGradientWayStyle style = getGradientWayStyle();
 			style.startColor = points.get(i - 1).color;
 			style.endColor = points.get(i).color;
 			styleMap.put(i, style);
 		}
-
 		return styleMap;
 	}
 
@@ -183,9 +185,9 @@ public class RouteGeometryWay extends GeometryWay<RouteGeometryWayContext, Route
 		private final RouteColorize routeColorize;
 		private final List<RouteColorizationPoint> locations;
 
-		public GradientGeometryWayProvider(RouteColorize routeColorize) {
+		public GradientGeometryWayProvider(RouteColorize routeColorize, List<RouteColorizationPoint> locations) {
 			this.routeColorize = routeColorize;
-			locations = routeColorize.getResult(false);
+			this.locations = locations;
 		}
 
 		public List<RouteColorizationPoint> simplify(int zoom) {
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWayDrawer.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWayDrawer.java
index 060370e546..746283a180 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWayDrawer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWayDrawer.java
@@ -44,7 +44,6 @@ public class RouteGeometryWayDrawer extends GeometryWayDrawer<RouteGeometryWayCo
 			LinearGradient gradient = new LinearGradient(style.startXY.x, style.startXY.y, style.endXY.x, style.endXY.y,
 					style.startColor, style.endColor, Shader.TileMode.CLAMP);
 			getContext().getAttrs().customColorPaint.setShader(gradient);
-			getContext().getAttrs().customColorPaint.setStrokeCap(Paint.Cap.ROUND);
 		}
 		super.drawPath(canvas, path, s);
 	}