Fix crashes and poi search
This commit is contained in:
parent
97e67c8ca6
commit
8639e508c9
4 changed files with 12 additions and 6 deletions
|
@ -75,11 +75,11 @@
|
|||
<string name="shared_string_favorites">Favorites</string>
|
||||
<string name="shared_string_add">Add</string>
|
||||
<string name="shared_string_add_to_favorites">Add to Favorites</string>
|
||||
<string name="shared_string_shared_string_my_location">My Location</string>
|
||||
<string name="shared_string_my_location">My Location</string>
|
||||
<string name="shared_string_my_places">My Places</string>
|
||||
<string name="shared_string_shared_string_my_favorites">My Favorites</string>
|
||||
<string name="shared_string_shared_string_my_tracks">My Tracks</string>
|
||||
<string name="shared_string_shared_string_currently_recording_track">Currently recording track</string>
|
||||
<string name="shared_string_my_favorites">My Favorites</string>
|
||||
<string name="shared_string_my_tracks">My Tracks</string>
|
||||
<string name="shared_string_currently_recording_track">Currently recording track</string>
|
||||
<string name="shared_string_audio">Audio</string>
|
||||
<string name="shared_string_video">Video</string>
|
||||
<string name="shared_string_photo">Photo</string>
|
||||
|
|
|
@ -378,6 +378,9 @@ public class AppInitializer implements IProgress {
|
|||
startBgTime = System.currentTimeMillis();
|
||||
app.favorites.loadFavorites();
|
||||
notifyEvent(InitEvents.FAVORITES_INITIALIZED);
|
||||
// init poi types before indexes and before POI
|
||||
initPoiTypes();
|
||||
|
||||
app.resourceManager.reloadIndexesOnStart(this, warnings);
|
||||
|
||||
app.resourceManager.initRenderers(this);
|
||||
|
@ -386,7 +389,7 @@ public class AppInitializer implements IProgress {
|
|||
initNativeCore();
|
||||
notifyEvent(InitEvents.NATIVE_INITIALIZED);
|
||||
|
||||
initPoiTypes();
|
||||
|
||||
app.poiFilters.reloadAllPoiFilters();
|
||||
notifyEvent(InitEvents.POI_TYPES_INITIALIZED);
|
||||
indexRegionsBoundaries(false);
|
||||
|
|
|
@ -622,7 +622,7 @@ public class OsmandSettings {
|
|||
return p;
|
||||
}
|
||||
|
||||
public final CommonPreference<Boolean> USE_DASHBOARD_INSTEAD_OF_DRAWER = new BooleanPreference("use_dashboard_instead_of_drawer", false).makeGlobal().cache();
|
||||
public final CommonPreference<Boolean> USE_DASHBOARD_INSTEAD_OF_DRAWER = new BooleanPreference("use_dashboard_instead_of_drawer", true).makeGlobal().cache();
|
||||
|
||||
// this value string is synchronized with settings_pref.xml preference name
|
||||
public final CommonPreference<Boolean> USE_INTERNET_TO_DOWNLOAD_TILES = new BooleanPreference("use_internet_to_download_tiles", true).makeGlobal().cache();
|
||||
|
|
|
@ -207,6 +207,9 @@ public class PoiLegacyFilter {
|
|||
}
|
||||
|
||||
public boolean acceptTypeSubtype(PoiCategory t, String subtype){
|
||||
if(t == null) {
|
||||
return true;
|
||||
}
|
||||
if(!poiTypes.isRegisteredType(t)) {
|
||||
t = poiTypes.getOtherPoiCategory();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue