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

refactor PoiHelper

Browse source
This commit is contained in:
veliymolfar 2020-05-12 17:39:03 +03:00
parent bb6980ff2d
commit 165d1430e3
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
OsmAnd/src/net/osmand/plus/poi/PoiHelper.java
View file

@ -112,11 +112,14 @@ public class PoiHelper {
} }
private void replaceSavedFiles(List<LocalIndexInfo> localMapsIndexes) { private void replaceSavedFiles(List<LocalIndexInfo> localMapsIndexes) {
helper.deleteFilesTable(helper.getWritableDatabase()); files.clear();
helper.deleteFilesTable();
for (LocalIndexInfo info : localMapsIndexes) { for (LocalIndexInfo info : localMapsIndexes) {
File f = new File(info.getPathToData()); File f = new File(info.getPathToData());
helper.addFile(f, helper.getWritableDatabase()); helper.addFile(f);
files.put(f.getName(), f.lastModified());
} }
helper.close();
} }
private void initCategoriesFromFiles() { private void initCategoriesFromFiles() {
@ -133,10 +136,21 @@ public class PoiHelper {
} }
private void replaceSavedCategories(List<PoiCategory> poiCategories) { private void replaceSavedCategories(List<PoiCategory> poiCategories) {
helper.deletePoiTypesTable(helper.getWritableDatabase()); categories.clear();
helper.deletePoiTypesTable();
for (PoiCategory category : poiCategories) { for (PoiCategory category : poiCategories) {
helper.addCategory(category, helper.getWritableDatabase()); helper.addCategory(category);
categories.put(category.getKeyName(), getSubCategoriesFilters(category.getPoiTypes()));
} }
helper.close();
}
private List<String> getSubCategoriesFilters(List<PoiType> poiTypeList) {
List<String> filters = new ArrayList<>();
for (PoiType poiType : poiTypeList) {
filters.add(poiType.getKeyName());
}
return filters;
} }
public class PoiDbHelper { public class PoiDbHelper {
@ -205,26 +219,30 @@ public class PoiHelper {
conn.execSQL(POI_TYPES_TABLE_CREATE); conn.execSQL(POI_TYPES_TABLE_CREATE);
} }
protected void addFile(File f, SQLiteAPI.SQLiteConnection db) { protected void addFile(File f) {
SQLiteAPI.SQLiteConnection db = getReadableDatabase();
if (db != null) { if (db != null) {
db.execSQL("INSERT INTO " + FILES_TABLE_NAME + " VALUES (?, ?)", db.execSQL("INSERT INTO " + FILES_TABLE_NAME + " VALUES (?, ?)",
new Object[]{f.getName(), f.lastModified()}); new Object[]{f.getName(), f.lastModified()});
} }
} }
protected void deleteFilesTable(SQLiteAPI.SQLiteConnection db) { protected void deleteFilesTable() {
SQLiteAPI.SQLiteConnection db = getReadableDatabase();
if (db != null) { if (db != null) {
db.execSQL("DELETE FROM " + FILES_TABLE_NAME); db.execSQL("DELETE FROM " + FILES_TABLE_NAME);
} }
} }
protected void deletePoiTypesTable(SQLiteAPI.SQLiteConnection db) { protected void deletePoiTypesTable() {
SQLiteAPI.SQLiteConnection db = getReadableDatabase();
if (db != null) { if (db != null) {
db.execSQL("DELETE FROM " + POI_TYPES_TABLE_NAME); db.execSQL("DELETE FROM " + POI_TYPES_TABLE_NAME);
} }
} }
protected void addCategory(PoiCategory poiCategory, SQLiteAPI.SQLiteConnection db) { protected void addCategory(PoiCategory poiCategory) {
SQLiteAPI.SQLiteConnection db = getReadableDatabase();
if (db != null) { if (db != null) {
db.execSQL("INSERT INTO " + POI_TYPES_TABLE_NAME + " VALUES (?, ?)", db.execSQL("INSERT INTO " + POI_TYPES_TABLE_NAME + " VALUES (?, ?)",
new Object[]{poiCategory.getKeyName(), getSubCategoriesJson(poiCategory.getPoiTypes())}); new Object[]{poiCategory.getKeyName(), getSubCategoriesJson(poiCategory.getPoiTypes())});