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

Add small fixes

Browse source
This commit is contained in:
Alexander Sytnyk 2017-08-25 15:34:06 +03:00
parent fe196a0f67
commit b47b4d8aeb
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,16 +12,14 @@ import net.osmand.plus.OsmandSettings;
import net.osmand.plus.measurementtool.command.MeasurementCommandManager; import net.osmand.plus.measurementtool.command.MeasurementCommandManager;
import net.osmand.plus.routing.RouteCalculationParams; import net.osmand.plus.routing.RouteCalculationParams;
import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.Renderable;
import net.osmand.router.RouteCalculationProgress; import net.osmand.router.RouteCalculationProgress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
public class MeasurementEditingContext { public class MeasurementEditingContext {
@ -47,7 +45,7 @@ public class MeasurementEditingContext {
private SnapToRoadProgressListener progressListener; private SnapToRoadProgressListener progressListener;
private ApplicationMode snapToRoadAppMode; private ApplicationMode snapToRoadAppMode;
private RouteCalculationProgress calculationProgress; private RouteCalculationProgress calculationProgress;
private Queue<Pair<WptPt, WptPt>> snapToRoadPairsToCalculate = new LinkedList<>(); private Queue<Pair<WptPt, WptPt>> snapToRoadPairsToCalculate = new ConcurrentLinkedQueue<>();
private Map<Pair<WptPt, WptPt>, List<WptPt>> snappedToRoadPoints = new ConcurrentHashMap<>(); private Map<Pair<WptPt, WptPt>, List<WptPt>> snappedToRoadPoints = new ConcurrentHashMap<>();
public void setApplication(OsmandApplication application) { public void setApplication(OsmandApplication application) {
@ -168,7 +166,7 @@ public class MeasurementEditingContext {
} }
public List<WptPt> getAfterPoints() { public List<WptPt> getAfterPoints() {
return after.points; return after.points;
} }
public int getPointsCount() { public int getPointsCount() {
@ -210,9 +208,10 @@ public class MeasurementEditingContext {
if (application == null || before.points.size() < 1) { if (application == null || before.points.size() < 1) {
return; return;
} }
snapToRoadPairsToCalculate.clear();
for (int i = 0; i < before.points.size() - 1; i++) { for (int i = 0; i < before.points.size() - 1; i++) {
Pair<WptPt, WptPt> pair = new Pair<>(before.points.get(i), before.points.get(i + 1)); Pair<WptPt, WptPt> pair = new Pair<>(before.points.get(i), before.points.get(i + 1));
if (snappedToRoadPoints.get(pair) == null && !snapToRoadPairsToCalculate.contains(pair)) { if (snappedToRoadPoints.get(pair) == null) {
snapToRoadPairsToCalculate.add(pair); snapToRoadPairsToCalculate.add(pair);
} }
} }