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

Fixes

Browse source
This commit is contained in:
Alexey Kulish 2016-05-12 23:32:09 +03:00 committed by GaidamakUA
parent 7af83c12f8
commit 06a9c19478
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -1893,6 +1893,7 @@ public class OsmandSettings {
if (ps.size() > index) { if (ps.size() > index) {
ps.set(index, latLonNew); ps.set(index, latLonNew);
} }
<<<<<<< 56c73430b940b4690ba7ddd2da9f14c234fc0155
ds.set(index, PointDescription.serializeToString(historyDescription)); ds.set(index, PointDescription.serializeToString(historyDescription));
if (cs.size() > index) { if (cs.size() > index) {
cs.set(index, colorIndex); cs.set(index, colorIndex);
@ -1908,6 +1909,8 @@ public class OsmandSettings {
double lon = latLonNew.getLongitude(); double lon = latLonNew.getLongitude();
SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(lat, lon, historyDescription); SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(lat, lon, historyDescription);
} }
=======
>>>>>>> Fixes
return savePoints(ps, ds, cs, ns, bs); return savePoints(ps, ds, cs, ns, bs);
} else { } else {
return false; return false;

3
OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
View file

@ -537,7 +537,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
boolean isObjectMovable(Object o); boolean isObjectMovable(Object o);
void applyNewObjectPosition(@NonNull Object o, @NonNull LatLon position, void applyNewObjectPosition(@NonNull Object o,
@NonNull LatLon position,
@Nullable ApplyMovedObjectCallback callback); @Nullable ApplyMovedObjectCallback callback);
} }

3
OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java
View file

@ -246,7 +246,8 @@ public class FavouritesLayer extends OsmandMapLayer implements ContextMenuLayer.
} }
@Override @Override
public void applyNewObjectPosition(@NonNull Object o, @NonNull LatLon position, public void applyNewObjectPosition(@NonNull Object o,
@NonNull LatLon position,
@Nullable ApplyMovedObjectCallback callback) { @Nullable ApplyMovedObjectCallback callback) {
boolean result = false; boolean result = false;
if (o instanceof FavouritePoint) { if (o instanceof FavouritePoint) {

3
OsmAnd/src/net/osmand/plus/views/ImpassableRoadsLayer.java
View file

@ -205,7 +205,8 @@ public class ImpassableRoadsLayer extends OsmandMapLayer implements
} }
@Override @Override
public void applyNewObjectPosition(@NonNull Object o, @NonNull LatLon position, public void applyNewObjectPosition(@NonNull Object o,
@NonNull LatLon position,
@Nullable final ApplyMovedObjectCallback callback) { @Nullable final ApplyMovedObjectCallback callback) {
if (o instanceof RouteDataObject) { if (o instanceof RouteDataObject) {
final RouteDataObject object = (RouteDataObject) o; final RouteDataObject object = (RouteDataObject) o;