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

search only parent poitypes, sort after search

Browse source
This commit is contained in:
veliymolfar 2020-06-03 14:38:57 +03:00
parent ed997b9137
commit 3b6a44a4d9
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java
View file

@ -338,7 +338,10 @@ public class QuickSearchCustomPoiFragment extends DialogFragment implements OnFi
case POI_TYPE: case POI_TYPE:
Object poiObject = searchResult.object; Object poiObject = searchResult.object;
if (poiObject instanceof PoiType) { if (poiObject instanceof PoiType) {
results.add((PoiType) poiObject); PoiType poiType = (PoiType) poiObject;
if (poiType.getParentType() == null) {
results.add(poiType);
}
} else if (poiObject instanceof PoiCategory) { } else if (poiObject instanceof PoiCategory) {
results.addAll(((PoiCategory) poiObject).getPoiTypes()); results.addAll(((PoiCategory) poiObject).getPoiTypes());
} }
@ -355,9 +358,16 @@ public class QuickSearchCustomPoiFragment extends DialogFragment implements OnFi
app.runInUIThread(new Runnable() { app.runInUIThread(new Runnable() {
@Override @Override
public void run() { public void run() {
List<PoiType> poiTypes = new ArrayList<>(results);
Collections.sort(poiTypes, new Comparator<PoiType>() {
@Override
public int compare(PoiType poiType, PoiType t1) {
return poiType.getTranslation().compareTo(t1.getTranslation());
}
});
listView.setAdapter(subCategoriesAdapter); listView.setAdapter(subCategoriesAdapter);
subCategoriesAdapter.clear(); subCategoriesAdapter.clear();
subCategoriesAdapter.addAll(results); subCategoriesAdapter.addAll(poiTypes);
subCategoriesAdapter.notifyDataSetChanged(); subCategoriesAdapter.notifyDataSetChanged();
removeAllHeaders(); removeAllHeaders();
listView.addHeaderView(headerShadow, null, false); listView.addHeaderView(headerShadow, null, false);
@ -576,7 +586,10 @@ public class QuickSearchCustomPoiFragment extends DialogFragment implements OnFi
if (filters == null || filters.size() > 1) { if (filters == null || filters.size() > 1) {
name = category.getTranslation(); name = category.getTranslation();
} else { } else {
name = category.getPoiTypeByKeyName(filters.iterator().next()).getTranslation(); PoiType poiType = category.getPoiTypeByKeyName(filters.iterator().next());
if (poiType != null) {
name = poiType.getTranslation();
}
} }
if (!Algorithms.isEmpty(name)) { if (!Algorithms.isEmpty(name)) {
filter.setName(Algorithms.capitalizeFirstLetter(name)); filter.setName(Algorithms.capitalizeFirstLetter(name));