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

Fix lane arrow stroke line

Browse source
This commit is contained in:
crimean 2019-06-04 19:02:03 +03:00
parent 18f98901b1
commit ac7f765be7
2 changed files with 10 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
View file

@ -17,8 +17,6 @@ import android.support.annotation.NonNull;
import net.osmand.plus.R;
import net.osmand.router.TurnType;
import java.util.Map;
public class TurnPathHelper {
//Index of processed turn
@ -568,7 +566,7 @@ public class TurnPathHelper {
}
}
public static Path getPathFromTurnType(Resources res, Map<TurnResource, Path> cache, int firstTurn,
public static Path getPathFromTurnType(Resources res, int firstTurn,
int secondTurn, int thirdTurn, int turnIndex, float coef, boolean leftSide, boolean smallArrow) {
int firstTurnType = TurnType.valueOf(firstTurn, leftSide).getValue();
@ -621,20 +619,8 @@ public class TurnPathHelper {
return null;
}
Path p = cache.get(turnResource);
if (p == null) {
int size = res.getDimensionPixelSize(R.dimen.widget_turn_lane_size);
p = getPathFromTurnResource(turnResource, size, smallArrow);
cache.put(turnResource, p);
}
// Maybe redundant scaling
/*
* float bRatio = (float)b.getWidth() / (float)b.getHeight(); float s = 72f * coef; int wq = Math.round(s /
* bRatio); int hq = Math.round(s); b = Bitmap.createScaledBitmap(b, wq, hq, false);
*/
return p;
int size = res.getDimensionPixelSize(R.dimen.widget_turn_lane_size);
return getPathFromTurnResource(turnResource, size, smallArrow);
}
private static Path getPathFromTurnResource(TurnResource turnResource, int size, boolean smallArrow) {

18
OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
View file

@ -51,7 +51,6 @@ import net.osmand.plus.views.AnimateDraggingMapThread;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.plus.views.TurnPathHelper;
import net.osmand.plus.views.TurnPathHelper.TurnResource;
import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.WidgetState;
import net.osmand.router.RouteResultPreparation;
import net.osmand.router.TurnType;
@ -59,9 +58,7 @@ import net.osmand.util.Algorithms;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class RouteInfoWidgetsFactory {
@ -869,7 +866,6 @@ public class RouteInfoWidgetsFactory {
int[] lanes = null;
boolean imminent = false;
private Context ctx;
private Map<TurnResource, Path> pathsCache = new HashMap<>();
private Paint paintBlack;
private Paint paintRouteDirection;
private Paint paintSecondTurn;
@ -896,7 +892,7 @@ public class RouteInfoWidgetsFactory {
paintBlack = new Paint(Paint.ANTI_ALIAS_FLAG);
paintBlack.setStyle(Style.STROKE);
paintBlack.setColor(Color.BLACK);
paintBlack.setStrokeWidth(3.5f);
paintBlack.setStrokeWidth(scaleCoefficent);
paintRouteDirection = new Paint(Paint.ANTI_ALIAS_FLAG);
paintRouteDirection.setStyle(Style.FILL);
@ -921,7 +917,7 @@ public class RouteInfoWidgetsFactory {
RectF imgBounds = new RectF();
if (thirdTurnType > 0) {
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), pathsCache, turnType,
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), turnType,
secondTurnType, thirdTurnType, TurnPathHelper.THIRD_TURN, coef, leftSide, true);
if (p != null) {
RectF b = new RectF();
@ -936,7 +932,7 @@ public class RouteInfoWidgetsFactory {
}
}
if (secondTurnType > 0) {
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), pathsCache, turnType,
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), turnType,
secondTurnType, thirdTurnType, TurnPathHelper.SECOND_TURN, coef, leftSide, true);
if (p != null) {
RectF b = new RectF();
@ -950,7 +946,7 @@ public class RouteInfoWidgetsFactory {
}
}
}
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), pathsCache, turnType,
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), turnType,
secondTurnType, thirdTurnType, TurnPathHelper.FIRST_TURN, coef, leftSide, true);
if (p != null) {
RectF b = new RectF();
@ -1037,7 +1033,7 @@ public class RouteInfoWidgetsFactory {
Path firstTurnPath = null;
if (thirdTurnType > 0) {
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), pathsCache, turnType,
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), turnType,
secondTurnType, thirdTurnType, TurnPathHelper.THIRD_TURN, coef, leftSide, true);
if (p != null) {
RectF b = new RectF();
@ -1053,7 +1049,7 @@ public class RouteInfoWidgetsFactory {
}
}
if (secondTurnType > 0) {
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), pathsCache, turnType,
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), turnType,
secondTurnType, thirdTurnType, TurnPathHelper.SECOND_TURN, coef, leftSide, true);
if (p != null) {
RectF b = new RectF();
@ -1068,7 +1064,7 @@ public class RouteInfoWidgetsFactory {
}
}
}
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), pathsCache, turnType,
Path p = TurnPathHelper.getPathFromTurnType(ctx.getResources(), turnType,
secondTurnType, thirdTurnType, TurnPathHelper.FIRST_TURN, coef, leftSide, true);
if (p != null) {
RectF b = new RectF();