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

Fix working with PointDescription

Browse source
This commit is contained in:
Alexander Sytnyk 2017-09-05 17:07:45 +03:00
parent 2501657467
commit c1d0dfb383
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java
View file

@ -10,6 +10,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.api.SQLiteAPI.SQLiteConnection; import net.osmand.plus.api.SQLiteAPI.SQLiteConnection;
import net.osmand.plus.api.SQLiteAPI.SQLiteCursor; import net.osmand.plus.api.SQLiteAPI.SQLiteCursor;
import net.osmand.plus.helpers.SearchHistoryHelper;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -163,13 +164,19 @@ public class MapMarkersDbHelper {
marker.creationDate = currentTime; marker.creationDate = currentTime;
double lat = marker.getLatitude(); double lat = marker.getLatitude();
double lon = marker.getLongitude(); double lon = marker.getLongitude();
String descr = marker.getName(context); //fixme String descr = PointDescription.serializeToString(marker.getOriginalPointDescription());
int active = marker.history ? 0 : 1; int active = marker.history ? 0 : 1;
long visited = 0; long visited = 0;
int groupKey = 0; int groupKey = 0;
int colorIndex = marker.colorIndex; int colorIndex = marker.colorIndex;
int displayPlace = marker.displayPlace == WIDGET ? 0 : 1; int displayPlace = marker.displayPlace == WIDGET ? 0 : 1;
PointDescription pointDescription = marker.getOriginalPointDescription();
if (pointDescription != null && !pointDescription.isSearchingAddress(context)) {
SearchHistoryHelper.getInstance(context)
.addNewItemToHistory(marker.getLatitude(), marker.getLongitude(), pointDescription);
}
if (!marker.history) { if (!marker.history) {
db.execSQL("UPDATE " + MARKERS_TABLE_NAME + " SET " + MARKERS_COL_NEXT_KEY + " = ? " + db.execSQL("UPDATE " + MARKERS_TABLE_NAME + " SET " + MARKERS_COL_NEXT_KEY + " = ? " +
"WHERE " + MARKERS_COL_NEXT_KEY + " = ?", new Object[]{marker.id, TAIL_NEXT_VALUE}); "WHERE " + MARKERS_COL_NEXT_KEY + " = ?", new Object[]{marker.id, TAIL_NEXT_VALUE});
@ -243,14 +250,14 @@ public class MapMarkersDbHelper {
SQLiteConnection db = openConnection(false); SQLiteConnection db = openConnection(false);
if (db != null) { if (db != null) {
try { try {
String descr = PointDescription.serializeToString(marker.getOriginalPointDescription());
db.execSQL("UPDATE " + MARKERS_TABLE_NAME + " SET " + db.execSQL("UPDATE " + MARKERS_TABLE_NAME + " SET " +
MARKERS_COL_LAT + " = ?, " + MARKERS_COL_LAT + " = ?, " +
MARKERS_COL_LON + " = ?, " + MARKERS_COL_LON + " = ?, " +
MARKERS_COL_DESCRIPTION + " = ?, " + MARKERS_COL_DESCRIPTION + " = ?, " +
MARKERS_COL_COLOR + " = ? " + MARKERS_COL_COLOR + " = ? " +
"WHERE " + MARKERS_COL_ID + " = ?", "WHERE " + MARKERS_COL_ID + " = ?",
new Object[]{marker.getLatitude(), marker.getLongitude(), marker.getName(context), //fixme new Object[]{marker.getLatitude(), marker.getLongitude(), descr, marker.colorIndex, marker.id});
marker.colorIndex, marker.id});
} finally { } finally {
db.close(); db.close();
} }