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

Add snapped to road points to trkSegment

Browse source
This commit is contained in:
Alex 2017-08-23 18:41:27 +03:00
parent 9a3cafc431
commit b37b14bf30
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
View file

@ -146,7 +146,23 @@ public class MeasurementEditingContext {
public void recreateSegments() {
before = new TrkSegment();
before.points.addAll(measurementPoints);
if (measurementPoints.size() > 1) {
for (int i = 0; i < measurementPoints.size(); i++) {
Pair<WptPt, WptPt> pair = new Pair<>(measurementPoints.get(i), measurementPoints.get(i + 1));
List<WptPt> pts = snappedToRoadPoints.get(pair);
if (pts != null) {
before.points.addAll(pts);
} else {
if (inSnapToRoadMode) {
snapToRoadPairsToCalculate.add(pair);
}
before.points.add(pair.first);
before.points.add(pair.second);
}
}
} else {
before.points.addAll(measurementPoints);
}
addBeforeRenders();
after = new TrkSegment();
}
@ -174,8 +190,9 @@ public class MeasurementEditingContext {
for (int i = 0; i < measurementPoints.size() - 1; i++) {
snapToRoadPairsToCalculate.add(new Pair<>(measurementPoints.get(i), measurementPoints.get(i + 1)));
}
inSnapToRoadMode = true;
this.progressBar = progressBar;
if (!snapToRoadPairsToCalculate.isEmpty()) {
if (!snapToRoadPairsToCalculate.isEmpty() && this.progressBar != null) {
mapActivity.getMyApplication().getRoutingHelper().startRouteCalculationThread(getParams(), true, true);
progressBar.setVisibility(View.VISIBLE);
}