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

Get all translations in wikivoyage search

Browse source
This commit is contained in:
Alexander Sytnyk 2018-03-30 12:40:26 +03:00
parent cdc29f3e85
commit cde978955c
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
OsmAnd/src/net/osmand/plus/wikivoyage/data/WikivoyageDbHelper.java
View file

@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import gnu.trove.list.array.TLongArrayList;
import gnu.trove.map.hash.TLongObjectHashMap;
public class WikivoyageDbHelper {
@ -78,18 +79,22 @@ public class WikivoyageDbHelper {
@NonNull
public List<WikivoyageSearchResult> search(final String searchQuery) {
TLongArrayList cityIds = getCityIdsBySearchTerm(searchQuery);
List<WikivoyageSearchResult> res = new ArrayList<>();
SQLiteConnection conn = openConnection();
if (conn != null) {
try {
String dbQuery = SEARCH_TABLE_SELECT + " WHERE " + SEARCH_COL_SEARCH_TERM + " LIKE ?";
SQLiteCursor cursor = conn.rawQuery(dbQuery, new String[]{searchQuery + "%"});
if (cursor.moveToFirst()) {
do {
res.add(readSearchResult(cursor));
} while (cursor.moveToNext());
for (int i = 0; i < cityIds.size(); i++) {
String dbQuery = SEARCH_TABLE_SELECT + " WHERE " + SEARCH_COL_CITY_ID + " = ?";
SQLiteCursor cursor = conn.rawQuery(dbQuery, new String[]{String.valueOf(cityIds.get(0))});
if (cursor.moveToFirst()) {
do {
res.add(readSearchResult(cursor));
} while (cursor.moveToNext());
}
cursor.close();
}
cursor.close();
} finally {
conn.close();
}
@ -118,6 +123,27 @@ public class WikivoyageDbHelper {
return list;
}
private TLongArrayList getCityIdsBySearchTerm(String searchTerm) {
TLongArrayList res = new TLongArrayList();
SQLiteConnection conn = openConnection();
if (conn != null) {
try {
String query = "SELECT DISTINCT " + SEARCH_COL_CITY_ID + " FROM " + SEARCH_TABLE_NAME +
" WHERE " + SEARCH_COL_SEARCH_TERM + " LIKE ?";
SQLiteCursor cursor = conn.rawQuery(query, new String[]{searchTerm + "%"});
if (cursor.moveToFirst()) {
do {
res.add(cursor.getLong(0));
} while (cursor.moveToNext());
}
cursor.close();
} finally {
conn.close();
}
}
return res;
}
private Collection<WikivoyageSearchResult> groupSearchResultsByCityId(List<WikivoyageSearchResult> res) {
String baseLng = application.getLanguage();
TLongObjectHashMap<WikivoyageSearchResult> wikivoyage = new TLongObjectHashMap<>();