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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2018-01-25 20:26:14 +01:00
commit 5e3b62ca9b
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -247,8 +247,10 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
Object obj = listAdapter.getItem(position); Object obj = listAdapter.getItem(position);
if (obj instanceof LocationPointWrapper) { if (obj instanceof LocationPointWrapper) {
LocationPointWrapper w = (LocationPointWrapper) obj; LocationPointWrapper w = (LocationPointWrapper) obj;
if (w.getPoint() instanceof TargetPoint) {
return !((TargetPoint) w.getPoint()).start; return !((TargetPoint) w.getPoint()).start;
} }
}
return activeObjects.contains(obj); return activeObjects.contains(obj);
} }
return false; return false;
@ -332,9 +334,11 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
Object item = items.get(0); Object item = items.get(0);
if (item instanceof LocationPointWrapper) { if (item instanceof LocationPointWrapper) {
LocationPointWrapper w = (LocationPointWrapper) item; LocationPointWrapper w = (LocationPointWrapper) item;
if (w.getPoint() instanceof TargetPoint) {
return ((TargetPoint) w.getPoint()).start; return ((TargetPoint) w.getPoint()).start;
} }
} }
}
return false; return false;
} }
}); });

4
OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
View file

@ -388,7 +388,7 @@ public class WaypointDialogHelper {
move.setVisibility(View.GONE); move.setVisibility(View.GONE);
} else { } else {
boolean notFlatTargets = point.type == WaypointHelper.TARGETS && !flat; boolean notFlatTargets = point.type == WaypointHelper.TARGETS && !flat;
boolean startPoint = ((TargetPoint) point.point).start; boolean startPoint = notFlatTargets && ((TargetPoint) point.point).start;
final TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper(); final TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
boolean canRemove = !targetPointsHelper.getIntermediatePoints().isEmpty(); boolean canRemove = !targetPointsHelper.getIntermediatePoints().isEmpty();
@ -627,7 +627,9 @@ public class WaypointDialogHelper {
Object item = items.get(0); Object item = items.get(0);
if (item instanceof LocationPointWrapper) { if (item instanceof LocationPointWrapper) {
LocationPointWrapper w = (LocationPointWrapper) item; LocationPointWrapper w = (LocationPointWrapper) item;
if (w.getPoint() instanceof TargetPoint) {
hasActivePoints = !((TargetPoint) w.point).start; hasActivePoints = !((TargetPoint) w.point).start;
}
} else { } else {
hasActivePoints = true; hasActivePoints = true;
} }