Fix waypoints bug (not removing) in navigation
This commit is contained in:
parent
a024b79297
commit
b14e285e76
4 changed files with 6 additions and 7 deletions
|
@ -289,7 +289,7 @@ public class AppInitializer implements IProgress {
|
|||
return app.getString(in);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.err.println(e.getMessage());
|
||||
System.err.println("No translation for "+ type.getIconKeyName() + " " + e.getMessage());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -126,7 +126,7 @@ public class TargetPointsHelper {
|
|||
public List<TargetPoint> getIntermediatePointsNavigation() {
|
||||
List<TargetPoint> intermediatePoints = new ArrayList<>();
|
||||
if (settings.USE_INTERMEDIATE_POINTS_NAVIGATION.get()) {
|
||||
for (TargetPoint t : intermediatePoints) {
|
||||
for (TargetPoint t : this.intermediatePoints) {
|
||||
intermediatePoints.add(t);
|
||||
}
|
||||
}
|
||||
|
@ -135,7 +135,7 @@ public class TargetPointsHelper {
|
|||
|
||||
public List<LatLon> getIntermediatePointsLatLon() {
|
||||
List<LatLon> intermediatePointsLatLon = new ArrayList<LatLon>();
|
||||
for (TargetPoint t : intermediatePoints) {
|
||||
for (TargetPoint t : this.intermediatePoints) {
|
||||
intermediatePointsLatLon.add(t.point);
|
||||
}
|
||||
return intermediatePointsLatLon;
|
||||
|
@ -144,7 +144,7 @@ public class TargetPointsHelper {
|
|||
public List<LatLon> getIntermediatePointsLatLonNavigation() {
|
||||
List<LatLon> intermediatePointsLatLon = new ArrayList<LatLon>();
|
||||
if (settings.USE_INTERMEDIATE_POINTS_NAVIGATION.get()) {
|
||||
for (TargetPoint t : intermediatePoints) {
|
||||
for (TargetPoint t : this.intermediatePoints) {
|
||||
intermediatePointsLatLon.add(t.point);
|
||||
}
|
||||
}
|
||||
|
@ -153,7 +153,7 @@ public class TargetPointsHelper {
|
|||
|
||||
public List<TargetPoint> getIntermediatePointsWithTarget() {
|
||||
List<TargetPoint> res = new ArrayList<TargetPoint>();
|
||||
res.addAll(intermediatePoints);
|
||||
res.addAll(this.intermediatePoints);
|
||||
if(pointToNavigate != null) {
|
||||
res.add(pointToNavigate);
|
||||
}
|
||||
|
|
|
@ -317,7 +317,6 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
|
|||
if (loc != null && loc.hasAltitude()) {
|
||||
double alt = loc.getAltitude();
|
||||
String altString = (int) (Math.abs(alt) * 100.0) + "/100";
|
||||
System.err.println(altString);
|
||||
setAttribute.invoke(exInstance, "GPSAltitude", altString);
|
||||
setAttribute.invoke(exInstance, "GPSAltitudeRef", alt < 0 ? "1" : "0");
|
||||
}
|
||||
|
|
|
@ -433,7 +433,7 @@ public class SearchHistoryHelper {
|
|||
st.put(p, e);
|
||||
} while (query.moveToNext());
|
||||
if(reinsert) {
|
||||
System.err.println("Reinsert all values");
|
||||
System.err.println("Reinsert all values for search history");
|
||||
db.execSQL("DELETE FROM " + HISTORY_TABLE_NAME); //$NON-NLS-1$
|
||||
entries.clear();
|
||||
entries.addAll(st.values());
|
||||
|
|
Loading…
Reference in a new issue