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

Fix crashes and poi search

Browse source
This commit is contained in:
Victor Shcherb 2015-03-09 01:25:47 +01:00
parent 97e67c8ca6
commit 8639e508c9
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/values/strings.xml
View file

@ -75,11 +75,11 @@
<string name="shared_string_favorites">Favorites</string> <string name="shared_string_favorites">Favorites</string>
<string name="shared_string_add">Add</string> <string name="shared_string_add">Add</string>
<string name="shared_string_add_to_favorites">Add to Favorites</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_my_places">My Places</string>
<string name="shared_string_shared_string_my_favorites">My Favorites</string> <string name="shared_string_my_favorites">My Favorites</string>
<string name="shared_string_shared_string_my_tracks">My Tracks</string> <string name="shared_string_my_tracks">My Tracks</string>
<string name="shared_string_shared_string_currently_recording_track">Currently recording track</string> <string name="shared_string_currently_recording_track">Currently recording track</string>
<string name="shared_string_audio">Audio</string> <string name="shared_string_audio">Audio</string>
<string name="shared_string_video">Video</string> <string name="shared_string_video">Video</string>
<string name="shared_string_photo">Photo</string> <string name="shared_string_photo">Photo</string>

5
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -378,6 +378,9 @@ public class AppInitializer implements IProgress {
startBgTime = System.currentTimeMillis(); startBgTime = System.currentTimeMillis();
app.favorites.loadFavorites(); app.favorites.loadFavorites();
notifyEvent(InitEvents.FAVORITES_INITIALIZED); notifyEvent(InitEvents.FAVORITES_INITIALIZED);
// init poi types before indexes and before POI
initPoiTypes();
app.resourceManager.reloadIndexesOnStart(this, warnings); app.resourceManager.reloadIndexesOnStart(this, warnings);
app.resourceManager.initRenderers(this); app.resourceManager.initRenderers(this);
@ -386,7 +389,7 @@ public class AppInitializer implements IProgress {
initNativeCore(); initNativeCore();
notifyEvent(InitEvents.NATIVE_INITIALIZED); notifyEvent(InitEvents.NATIVE_INITIALIZED);
initPoiTypes();
app.poiFilters.reloadAllPoiFilters(); app.poiFilters.reloadAllPoiFilters();
notifyEvent(InitEvents.POI_TYPES_INITIALIZED); notifyEvent(InitEvents.POI_TYPES_INITIALIZED);
indexRegionsBoundaries(false); indexRegionsBoundaries(false);

2
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -622,7 +622,7 @@ public class OsmandSettings {
return p; 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 // 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(); public final CommonPreference<Boolean> USE_INTERNET_TO_DOWNLOAD_TILES = new BooleanPreference("use_internet_to_download_tiles", true).makeGlobal().cache();

3
OsmAnd/src/net/osmand/plus/poi/PoiLegacyFilter.java
View file

@ -207,6 +207,9 @@ public class PoiLegacyFilter {
} }
public boolean acceptTypeSubtype(PoiCategory t, String subtype){ public boolean acceptTypeSubtype(PoiCategory t, String subtype){
if(t == null) {
return true;
}
if(!poiTypes.isRegisteredType(t)) { if(!poiTypes.isRegisteredType(t)) {
t = poiTypes.getOtherPoiCategory(); t = poiTypes.getOtherPoiCategory();
} }