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

Do not draw point in center of the line

Browse source
This commit is contained in:
Alexander Sytnyk 2017-10-31 15:26:15 +02:00
parent f592a4ca03
commit 7e5a2271e0
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
View file

@ -241,7 +241,6 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
float dist = (float) MapUtils.getDistance(myLoc.getLatitude(), myLoc.getLongitude(), marker.getLatitude(), marker.getLongitude()); float dist = (float) MapUtils.getDistance(myLoc.getLatitude(), myLoc.getLongitude(), marker.getLatitude(), marker.getLongitude());
String distSt = OsmAndFormatter.getFormattedDistance(dist, view.getApplication()); String distSt = OsmAndFormatter.getFormattedDistance(dist, view.getApplication());
boolean locationInvisible = locX < 0 || locX > tileBox.getPixWidth() || locY < 0 || locY > tileBox.getPixHeight();
String text = distSt + " • " + marker.getName(map); String text = distSt + " • " + marker.getName(map);
Rect bounds = new Rect(); Rect bounds = new Rect();
textAttrs.paint.getTextBounds(text, 0, text.length(), bounds); textAttrs.paint.getTextBounds(text, 0, text.length(), bounds);
@ -250,9 +249,6 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
canvas.rotate(-tileBox.getRotate(), tileBox.getCenterPixelX(), tileBox.getCenterPixelY()); canvas.rotate(-tileBox.getRotate(), tileBox.getCenterPixelX(), tileBox.getCenterPixelY());
canvas.drawPath(linePath, lineAttrs.paint); canvas.drawPath(linePath, lineAttrs.paint);
if (locationInvisible && !(pos[0] == 0 && pos[1] == 0)) {
canvas.drawCircle(pos[0], pos[1], 5, new Paint());
}
if (locX >= markerX) { if (locX >= markerX) {
canvas.rotate(180, pos[0], pos[1]); canvas.rotate(180, pos[0], pos[1]);
canvas.drawTextOnPath(text, linePath, hOffset, bounds.height() + VERTICAL_OFFSET, textAttrs.paint2); canvas.drawTextOnPath(text, linePath, hOffset, bounds.height() + VERTICAL_OFFSET, textAttrs.paint2);