Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix start style index

Browse source
This commit is contained in:
Vitaliy 2020-10-01 15:51:08 +03:00
parent e0d266ff0d
commit fbcf2fa7c7
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayDrawer.java
View file

@ -38,20 +38,21 @@ public class GeometryWayDrawer<T extends GeometryWayContext> {
boolean hasStyles = styles != null && styles.size() == tx.size(); boolean hasStyles = styles != null && styles.size() == tx.size();
double zoomCoef = tb.getZoomAnimation() > 0 ? (Math.pow(2, tb.getZoomAnimation() + tb.getZoomFloatPart())) : 1f; double zoomCoef = tb.getZoomAnimation() > 0 ? (Math.pow(2, tb.getZoomAnimation() + tb.getZoomFloatPart())) : 1f;
Bitmap arrow = context.getArrowBitmap();
int arrowHeight = arrow.getHeight(); int startIndex = tx.size() - 2;
double defaultPxStep; double defaultPxStep;
if (hasStyles && styles.get(0) != null) { if (hasStyles && styles.get(startIndex) != null) {
defaultPxStep = styles.get(0).getPointStepPx(zoomCoef); defaultPxStep = styles.get(startIndex).getPointStepPx(zoomCoef);
} else { } else {
defaultPxStep = arrowHeight * 4f * zoomCoef; Bitmap arrow = context.getArrowBitmap();
defaultPxStep = arrow.getHeight() * 4f * zoomCoef;
} }
double pxStep = defaultPxStep; double pxStep = defaultPxStep;
double dist = 0; double dist = 0;
if (distPixToFinish != 0) { if (distPixToFinish != 0) {
dist = distPixToFinish - pxStep * ((int) (distPixToFinish / pxStep)); // dist < 1 dist = distPixToFinish - pxStep * ((int) (distPixToFinish / pxStep)); // dist < 1
} }
for (int i = tx.size() - 2; i >= 0; i--) { for (int i = startIndex; i >= 0; i--) {
GeometryWayStyle<?> style = hasStyles ? styles.get(i) : null; GeometryWayStyle<?> style = hasStyles ? styles.get(i) : null;
float px = tx.get(i); float px = tx.get(i);
float py = ty.get(i); float py = ty.get(i);