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

Fix line visibility on high zoom

Browse source
This commit is contained in:
cepprice 2021-04-07 11:55:59 +05:00
parent 687e5f6d81
commit 14272afa44
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,15 +4,10 @@ import android.graphics.Canvas;
import android.graphics.Path;
import android.util.Pair;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import net.osmand.Location;
import net.osmand.data.RotatedTileBox;
import net.osmand.util.MapAlgorithms;
import net.osmand.util.MapUtils;
import net.osmand.plus.views.layers.geometry.MultiProfileGeometryWay.GeometryMultiProfileWayStyle;
import java.util.ArrayList;
import java.util.Collections;
@ -20,6 +15,8 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import gnu.trove.list.array.TByteArrayList;
public abstract class GeometryWay<T extends GeometryWayContext, D extends GeometryWayDrawer<T>> {
@ -176,7 +173,7 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
}
double lat = locationProvider.getLatitude(i);
double lon = locationProvider.getLongitude(i);
if (shouldAddLocation(tb, leftLongitude, rightLongitude, bottomLatitude, topLatitude,
if (shouldAddLocation(simplification, leftLongitude, rightLongitude, bottomLatitude, topLatitude,
locationProvider, i)) {
double dist = previous == -1 ? 0 : odistances.get(i);
if (!previousVisible) {
@ -210,7 +207,7 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
drawRouteSegment(tb, canvas, tx, ty, angles, distances, 0, styles);
}
protected boolean shouldAddLocation(RotatedTileBox tileBox, double leftLon, double rightLon, double bottomLat,
protected boolean shouldAddLocation(TByteArrayList simplification, double leftLon, double rightLon, double bottomLat,
double topLat, GeometryWayProvider provider, int currLocationIdx) {
double lat = provider.getLatitude(currLocationIdx);
double lon = provider.getLongitude(currLocationIdx);

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

@ -29,6 +29,7 @@ import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.ColorUtils;
import gnu.trove.list.array.TByteArrayList;
public class MultiProfileGeometryWay extends GeometryWay<MultiProfileGeometryWayContext, MultiProfileGeometryWayDrawer> {
@ -148,19 +149,23 @@ public class MultiProfileGeometryWay extends GeometryWay<MultiProfileGeometryWay
}
@Override
protected boolean shouldAddLocation(RotatedTileBox tileBox, double leftLon, double rightLon,
protected boolean shouldAddLocation(TByteArrayList simplification, double leftLon, double rightLon,
double bottomLat, double topLat, GeometryWayProvider provider,
int currLocationIdx) {
float currX = tileBox.getPixXFromLatLon(provider.getLatitude(currLocationIdx), provider.getLongitude(currLocationIdx));
float currY = tileBox.getPixYFromLatLon(provider.getLatitude(currLocationIdx), provider.getLongitude(currLocationIdx));
if (tileBox.containsPoint(currX, currY, getContext().circleSize)) {
return true;
} else if (currLocationIdx + 1 >= provider.getSize()) {
return false;
double currLat = provider.getLatitude(currLocationIdx);
double currLon = provider.getLongitude(currLocationIdx);
int nextIdx = currLocationIdx;
for (int i = nextIdx + 1; i < simplification.size(); i++) {
if (simplification.getQuick(i) == 1) {
nextIdx = i;
}
}
float nextX = tileBox.getPixXFromLatLon(provider.getLatitude(currLocationIdx + 1), provider.getLongitude(currLocationIdx + 1));
float nextY = tileBox.getPixXFromLatLon(provider.getLatitude(currLocationIdx + 1), provider.getLongitude(currLocationIdx + 1));
return tileBox.containsPoint(nextX, nextY, getContext().circleSize);
double nextLat = provider.getLatitude(nextIdx);
double nextLon = provider.getLongitude(nextIdx);
return Math.min(currLon, nextLon) < rightLon && Math.max(currLon, nextLon) > leftLon
&& Math.min(currLat, nextLat) < topLat && Math.max(currLat, nextLat) > bottomLat;
}
private boolean segmentDataChanged(Map<Pair<WptPt, WptPt>, RoadSegmentData> other) {