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

Merge pull request #7064 from osmandapp/Fix_6814

Browse source 
Fix #6814
This commit is contained in:
Alexey 2019-06-21 10:55:01 +03:00 committed by GitHub
commit 4b697c14ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
View file

@ -308,7 +308,7 @@ public class MapActivityLayers {
PoiUIFilter filter = list.get(i); PoiUIFilter filter = list.get(i);
if (item.getSelected()) { if (item.getSelected()) {
if (filter.isStandardFilter()) { if (filter.isStandardFilter()) {
filter.setFilterByName(null); filter.removeUnsavedFilterByName();
} }
getApplication().getPoiFilters().addSelectedPoiFilter(filter); getApplication().getPoiFilters().addSelectedPoiFilter(filter);
} else { } else {
@ -376,7 +376,7 @@ public class MapActivityLayers {
activity.showQuickSearch(ShowQuickSearchMode.NEW, true); activity.showQuickSearch(ShowQuickSearchMode.NEW, true);
} else { } else {
if (pf.isStandardFilter()) { if (pf.isStandardFilter()) {
pf.setFilterByName(null); pf.removeUnsavedFilterByName();
} }
getApplication().getPoiFilters().clearSelectedPoiFilters(); getApplication().getPoiFilters().clearSelectedPoiFilters();
getApplication().getPoiFilters().addSelectedPoiFilter(pf); getApplication().getPoiFilters().addSelectedPoiFilter(pf);

5
OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
View file

@ -139,6 +139,11 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
updateFilterResults(); updateFilterResults();
} }
public void removeUnsavedFilterByName() {
filterByName = savedFilterByName;
updateFilterResults();
}
public void updateFilterResults() { public void updateFilterResults() {
List<Amenity> prev = currentSearchResult; List<Amenity> prev = currentSearchResult;
if (prev != null) { if (prev != null) {

2
OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
View file

@ -108,7 +108,7 @@ public class ShowHidePoiAction extends QuickAction {
for (PoiUIFilter filter : poiFilters) { for (PoiUIFilter filter : poiFilters) {
if (filter.isStandardFilter()) { if (filter.isStandardFilter()) {
filter.setFilterByName(null); filter.removeUnsavedFilterByName();
} }
pf.addSelectedPoiFilter(filter); pf.addSelectedPoiFilter(filter);
} }