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

Improve GPX display (when the points having 2-5 km far away, the line breaks up). To be properly tested before release

Browse source
This commit is contained in:
Victor Shcherb 2015-06-09 00:19:02 +02:00
parent 78cdd2a176
commit 2ce29533fc
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd/src/net/osmand/plus/views/GPXLayer.java
View file

@ -303,19 +303,30 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
for (List<WptPt> l : points) { for (List<WptPt> l : points) {
path.rewind(); path.rewind();
int startIndex = -1; int startIndex = -1;
int endIndex = -1;
int prevCross = 0;
boolean intersect = false;
for (int i = 0; i < l.size(); i++) { for (int i = 0; i < l.size(); i++) {
WptPt ls = l.get(i); WptPt ls = l.get(i);
if (startIndex == -1) { int cross = 0;
if (ls.lat >= latLonBounds.bottom - 0.1 && ls.lat <= latLonBounds.top + 0.1 && ls.lon >= latLonBounds.left - 0.1 cross |= (ls.lon < latLonBounds.left - 0.1 ? 1 : 0);
&& ls.lon <= latLonBounds.right + 0.1) { cross |= (ls.lon > latLonBounds.right + 0.1 ? 2 : 0);
startIndex = i > 0 ? i - 1 : i; cross |= (ls.lat > latLonBounds.top + 0.1 ? 4 : 0);
cross |= (ls.lat < latLonBounds.bottom - 0.1 ? 8 : 0);
if (i > 0) {
if ((prevCross & cross) == 0) {
if (prevCross != 0 || !intersect) {
if (startIndex > 0) {
drawSegment(canvas, tileBox, l, startIndex, endIndex);
} }
} else if (!(latLonBounds.left <= ls.lon + 0.1 && ls.lon - 0.1 <= latLonBounds.right startIndex = i - 1;
&& latLonBounds.bottom <= ls.lat + 0.1 && ls.lat - 0.1 <= latLonBounds.top)) {
drawSegment(canvas, tileBox, l, startIndex, i);
startIndex = -1;
} }
endIndex = i;
intersect = true;
}
}
prevCross = cross;
} }
if (startIndex != -1) { if (startIndex != -1) {
drawSegment(canvas, tileBox, l, startIndex, l.size() - 1); drawSegment(canvas, tileBox, l, startIndex, l.size() - 1);