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

Remove out margin

Browse source
This commit is contained in:
cepprice 2021-04-05 14:21:00 +05:00
parent 34f3474f12
commit 0604374475
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java
View file

@ -265,20 +265,16 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
return x >= lx && x <= rx && y >= ty && y <= by; return x >= lx && x <= rx && y >= ty && y <= by;
} }
public static boolean isIn(float x, float y, int lx, int ty, int rx, int by, float outMargin) {
return x >= lx - outMargin && x <= rx + outMargin && y >= ty - outMargin && y <= by + outMargin;
}
public static int calculatePath(RotatedTileBox tb, List<Float> xs, List<Float> ys, Path path) { public static int calculatePath(RotatedTileBox tb, List<Float> xs, List<Float> ys, Path path) {
List<Pair<Path, GeometryWayStyle<?>>> paths = new ArrayList<>(); List<Pair<Path, GeometryWayStyle<?>>> paths = new ArrayList<>();
int res = calculatePath(tb, xs, ys, 0, null, paths); int res = calculatePath(tb, xs, ys, null, paths);
if (paths.size() > 0) { if (paths.size() > 0) {
path.addPath(paths.get(0).first); path.addPath(paths.get(0).first);
} }
return res; return res;
} }
public static int calculatePath(RotatedTileBox tb, List<Float> xs, List<Float> ys, float outMargin, List<GeometryWayStyle<?>> styles, List<Pair<Path, GeometryWayStyle<?>>> paths) { public static int calculatePath(RotatedTileBox tb, List<Float> xs, List<Float> ys, List<GeometryWayStyle<?>> styles, List<Pair<Path, GeometryWayStyle<?>>> paths) {
boolean segmentStarted = false; boolean segmentStarted = false;
float prevX = xs.get(0); float prevX = xs.get(0);
float prevY = ys.get(0); float prevY = ys.get(0);
@ -288,11 +284,11 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
boolean hasStyles = styles != null && styles.size() == xs.size(); boolean hasStyles = styles != null && styles.size() == xs.size();
GeometryWayStyle<?> style = hasStyles ? styles.get(0) : null; GeometryWayStyle<?> style = hasStyles ? styles.get(0) : null;
Path path = new Path(); Path path = new Path();
boolean prevIn = isIn(prevX, prevY, 0, 0, width, height, outMargin); boolean prevIn = isIn(prevX, prevY, 0, 0, width, height);
for (int i = 1; i < xs.size(); i++) { for (int i = 1; i < xs.size(); i++) {
float currX = xs.get(i); float currX = xs.get(i);
float currY = ys.get(i); float currY = ys.get(i);
boolean currIn = isIn(currX, currY, 0, 0, width, height, outMargin); boolean currIn = isIn(currX, currY, 0, 0, width, height);
boolean draw = false; boolean draw = false;
if (prevIn && currIn) { if (prevIn && currIn) {
draw = true; draw = true;
@ -364,7 +360,7 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
if (hasPathLine) { if (hasPathLine) {
List<Pair<Path, GeometryWayStyle<?>>> paths = new ArrayList<>(); List<Pair<Path, GeometryWayStyle<?>>> paths = new ArrayList<>();
canvas.rotate(-tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); canvas.rotate(-tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY());
calculatePath(tb, tx, ty, getOutMargin(), styles, paths); calculatePath(tb, tx, ty, styles, paths);
for (Pair<Path, GeometryWayStyle<?>> pc : paths) { for (Pair<Path, GeometryWayStyle<?>> pc : paths) {
GeometryWayStyle<?> style = pc.second; GeometryWayStyle<?> style = pc.second;
if (style.hasPathLine()) { if (style.hasPathLine()) {
@ -381,10 +377,6 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
} }
} }
protected float getOutMargin() {
return 0;
}
private static class PathGeometryZoom { private static class PathGeometryZoom {
private static final float EPSILON_IN_DPI = 2; private static final float EPSILON_IN_DPI = 2;

5
OsmAnd/src/net/osmand/plus/views/layers/geometry/MultiProfileGeometryWay.java
View file

@ -189,11 +189,6 @@ public class MultiProfileGeometryWay extends GeometryWay<MultiProfileGeometryWay
new Pair<>(mode.getProfileColor(night), mode.getIconRes()); new Pair<>(mode.getProfileColor(night), mode.getIconRes());
} }
@Override
protected float getOutMargin() {
return getContext().getAttrs().paint.getStrokeWidth() * 2;
}
@NonNull @NonNull
@Override @Override
public GeometryWayStyle<?> getDefaultWayStyle() { public GeometryWayStyle<?> getDefaultWayStyle() {