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

Fix waypoints bug (not removing) in navigation

Browse source
This commit is contained in:
Victor Shcherb 2015-12-09 17:22:20 +01:00
parent a024b79297
commit b14e285e76
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -289,7 +289,7 @@ public class AppInitializer implements IProgress {
return app.getString(in); return app.getString(in);
} }
} catch (Exception e) { } catch (Exception e) {
System.err.println(e.getMessage()); System.err.println("No translation for "+ type.getIconKeyName() + " " + e.getMessage());
} }
return null; return null;
} }

8
OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
View file

@ -126,7 +126,7 @@ public class TargetPointsHelper {
public List<TargetPoint> getIntermediatePointsNavigation() { public List<TargetPoint> getIntermediatePointsNavigation() {
List<TargetPoint> intermediatePoints = new ArrayList<>(); List<TargetPoint> intermediatePoints = new ArrayList<>();
if (settings.USE_INTERMEDIATE_POINTS_NAVIGATION.get()) { if (settings.USE_INTERMEDIATE_POINTS_NAVIGATION.get()) {
for (TargetPoint t : intermediatePoints) { for (TargetPoint t : this.intermediatePoints) {
intermediatePoints.add(t); intermediatePoints.add(t);
} }
} }
@ -135,7 +135,7 @@ public class TargetPointsHelper {
public List<LatLon> getIntermediatePointsLatLon() { public List<LatLon> getIntermediatePointsLatLon() {
List<LatLon> intermediatePointsLatLon = new ArrayList<LatLon>(); List<LatLon> intermediatePointsLatLon = new ArrayList<LatLon>();
for (TargetPoint t : intermediatePoints) { for (TargetPoint t : this.intermediatePoints) {
intermediatePointsLatLon.add(t.point); intermediatePointsLatLon.add(t.point);
} }
return intermediatePointsLatLon; return intermediatePointsLatLon;
@ -144,7 +144,7 @@ public class TargetPointsHelper {
public List<LatLon> getIntermediatePointsLatLonNavigation() { public List<LatLon> getIntermediatePointsLatLonNavigation() {
List<LatLon> intermediatePointsLatLon = new ArrayList<LatLon>(); List<LatLon> intermediatePointsLatLon = new ArrayList<LatLon>();
if (settings.USE_INTERMEDIATE_POINTS_NAVIGATION.get()) { if (settings.USE_INTERMEDIATE_POINTS_NAVIGATION.get()) {
for (TargetPoint t : intermediatePoints) { for (TargetPoint t : this.intermediatePoints) {
intermediatePointsLatLon.add(t.point); intermediatePointsLatLon.add(t.point);
} }
} }
@ -153,7 +153,7 @@ public class TargetPointsHelper {
public List<TargetPoint> getIntermediatePointsWithTarget() { public List<TargetPoint> getIntermediatePointsWithTarget() {
List<TargetPoint> res = new ArrayList<TargetPoint>(); List<TargetPoint> res = new ArrayList<TargetPoint>();
res.addAll(intermediatePoints); res.addAll(this.intermediatePoints);
if(pointToNavigate != null) { if(pointToNavigate != null) {
res.add(pointToNavigate); res.add(pointToNavigate);
} }

1
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -317,7 +317,6 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
if (loc != null && loc.hasAltitude()) { if (loc != null && loc.hasAltitude()) {
double alt = loc.getAltitude(); double alt = loc.getAltitude();
String altString = (int) (Math.abs(alt) * 100.0) + "/100"; String altString = (int) (Math.abs(alt) * 100.0) + "/100";
System.err.println(altString);
setAttribute.invoke(exInstance, "GPSAltitude", altString); setAttribute.invoke(exInstance, "GPSAltitude", altString);
setAttribute.invoke(exInstance, "GPSAltitudeRef", alt < 0 ? "1" : "0"); setAttribute.invoke(exInstance, "GPSAltitudeRef", alt < 0 ? "1" : "0");
} }

2
OsmAnd/src/net/osmand/plus/helpers/SearchHistoryHelper.java
View file

@ -433,7 +433,7 @@ public class SearchHistoryHelper {
st.put(p, e); st.put(p, e);
} while (query.moveToNext()); } while (query.moveToNext());
if(reinsert) { 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$ db.execSQL("DELETE FROM " + HISTORY_TABLE_NAME); //$NON-NLS-1$
entries.clear(); entries.clear();
entries.addAll(st.values()); entries.addAll(st.values());