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

Don't bias arrow's position

Browse source
This commit is contained in:
cepprice 2021-03-21 21:57:59 +05:00
parent 170c70e42b
commit e058dad692
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/views/layers/geometry/GpxGeometryWay.java
View file

@ -89,13 +89,11 @@ public class GpxGeometryWay extends GeometryWay<GpxGeometryWayContext, GeometryW
protected int trackColor; protected int trackColor;
protected float trackWidth; protected float trackWidth;
private float circleAngleOffset;
private float outerCircleRadius; private float outerCircleRadius;
private float innerCircleRadius; private float innerCircleRadius;
GeometryArrowsStyle(GpxGeometryWayContext context, int arrowColor, int trackColor, float trackWidth) { GeometryArrowsStyle(GpxGeometryWayContext context, int arrowColor, int trackColor, float trackWidth) {
this(context, null, arrowColor, trackColor, trackWidth); this(context, null, arrowColor, trackColor, trackWidth);
circleAngleOffset = AndroidUtils.dpToPx(context.getCtx(), 1);
outerCircleRadius = AndroidUtils.dpToPx(context.getCtx(), 8); outerCircleRadius = AndroidUtils.dpToPx(context.getCtx(), 8);
innerCircleRadius = AndroidUtils.dpToPx(context.getCtx(), 7); innerCircleRadius = AndroidUtils.dpToPx(context.getCtx(), 7);
} }
@ -146,10 +144,6 @@ public class GpxGeometryWay extends GeometryWay<GpxGeometryWayContext, GeometryW
return trackWidth; return trackWidth;
} }
public float getCircleAngleOffset() {
return circleAngleOffset;
}
public float getOuterCircleRadius() { public float getOuterCircleRadius() {
return outerCircleRadius; return outerCircleRadius;
} }

3
OsmAnd/src/net/osmand/plus/views/layers/geometry/GpxGeometryWayDrawer.java
View file

@ -59,9 +59,6 @@ public class GpxGeometryWayDrawer extends GeometryWayDrawer<GpxGeometryWayContex
} }
private void drawCircle(Canvas canvas, GeometryArrowsStyle style) { private void drawCircle(Canvas canvas, GeometryArrowsStyle style) {
double rad = Math.toRadians(angle + 90);
float x = (float) (this.x - style.getCircleAngleOffset() * Math.cos(rad));
float y = (float) (this.y - style.getCircleAngleOffset() * Math.sin(rad));
Paint paint = style.getContext().getCirclePaint(); Paint paint = style.getContext().getCirclePaint();
paint.setColor(GeometryArrowsStyle.OUTER_CIRCLE_COLOR); paint.setColor(GeometryArrowsStyle.OUTER_CIRCLE_COLOR);
canvas.drawCircle(x, y, style.getOuterCircleRadius(), paint); canvas.drawCircle(x, y, style.getOuterCircleRadius(), paint);