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

Mark some method syncrhonized cause they might be used in different thread and lead to corruption of file reader structure. The operation to read from 1 file should be strictly synchronized

Browse source
This commit is contained in:
Victor Shcherb 2015-04-12 15:46:22 +03:00
parent 55b46e2e48
commit 5bc346f902
2 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java
View file

@ -38,16 +38,6 @@ public class SearchCityByNameActivity extends SearchByNameAbstractActivity<City>
//This is really only a "clear input text field", hence do not reset settings here
//searchVillagesMode = -1;
//osmandSettings.setLastSearchedCity(-1L, "", null);
//Issue 2535: Try to reload indexes as workaround
// This creates the issue immediately after tapping "Reset", but then going back to the searchAdressFragment screen resets the issue and everything works(!?)
//new AsyncTask<Void, Void, List<String>>() {
// @Override
// protected List<String> doInBackground(Void... params) {
// return getMyApplication().getResourceManager().reloadIndexes(IProgress.EMPTY_PROGRESS);
// }
//}.execute();
super.reset();
}
@ -193,11 +183,9 @@ public class SearchCityByNameActivity extends SearchByNameAbstractActivity<City>
@Override
public void itemSelected(City obj) {
settings.setLastSearchedCity(obj.getId(), obj.getName(region.useEnglishNames()), obj.getLocation());
// Issue 2535: Disabling the next 3 lines fixes the issue of the Search City dialogue becoming non-functional after the first tapping on a found village (not city)
// but then the issue is still present once a neighborhood street is selected on the Search Street screen
//if (region.getCityById(obj.getId(), obj.getName(region.useEnglishNames())) == null) {
// region.addCityToPreloadedList((City) obj);
//}
if (region.getCityById(obj.getId(), obj.getName(region.useEnglishNames())) == null) {
region.addCityToPreloadedList((City) obj);
}
quitActivity(SearchStreetByNameActivity.class);
}

21
OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java
View file

@ -36,7 +36,7 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
private String region;
private final LinkedHashMap<Long, City> cities = new LinkedHashMap<Long, City>();
private LinkedHashMap<Long, City> cities = new LinkedHashMap<Long, City>();
private int ZOOM_QTREE = 10;
private QuadTree<City> citiesQtree = new QuadTree<City>(new QuadRect(0, 0, 1 << (ZOOM_QTREE + 1),
1 << (ZOOM_QTREE + 1)), 8, 0.55f);
@ -63,8 +63,9 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
try {
List<City> cs = file.getCities(region, BinaryMapIndexReader.buildAddressRequest(resultMatcher),
BinaryMapAddressReaderAdapter.CITY_TOWN_TYPE);
LinkedHashMap<Long, City> ncities = new LinkedHashMap<Long, City>();
for (City c : cs) {
cities.put(c.getId(), c);
ncities.put(c.getId(), c);
LatLon loc = c.getLocation();
if(loc != null) {
int y31 = MapUtils.get31TileNumberY(loc.getLatitude());
@ -73,6 +74,7 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
citiesQtree.insert(c, new QuadRect((x31 >> dz) - 1, (y31 >> dz) - 1, (x31 >> dz) + 1, (y31 >> dz) + 1));
}
}
cities = ncities;
} catch (IOException e) {
log.error("Disk operation failed", e); //$NON-NLS-1$
}
@ -118,20 +120,21 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
}
@Override
public synchronized void addCityToPreloadedList(City city) {
public void addCityToPreloadedList(City city) {
if (!cities.containsKey(city.getId())) {
cities.put(city.getId(), city);
LinkedHashMap<Long, City> ncities = new LinkedHashMap<Long, City>(cities);
ncities.put(city.getId(), city);
cities = ncities;
}
}
@Override
public synchronized List<City> getLoadedCities(){
public List<City> getLoadedCities(){
return new ArrayList<City>(cities.values());
}
@Override
public synchronized void preloadStreets(City o, ResultMatcher<Street> resultMatcher) {
//TODO: Check NPE, looks like o can be null here, question is why
Collection<Street> streets = o.getStreets();
if(!streets.isEmpty()){
return;
@ -148,7 +151,7 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
// StringMatcherMode.CHECK_STARTS_FROM_SPACE_NOT_BEGINNING};
@Override
public List<MapObject> searchMapObjectsByName(String name, ResultMatcher<MapObject> resultMatcher) {
public synchronized List<MapObject> searchMapObjectsByName(String name, ResultMatcher<MapObject> resultMatcher) {
SearchRequest<MapObject> req = BinaryMapIndexReader.buildAddressByNameRequest(resultMatcher, name);
try {
file.searchAddressDataByName(req);
@ -160,7 +163,7 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
@Override
public List<City> fillWithSuggestedCities(String name, final ResultMatcher<City> resultMatcher, boolean searchVillages, LatLon currentLocation) {
public synchronized List<City> fillWithSuggestedCities(String name, final ResultMatcher<City> resultMatcher, boolean searchVillages, LatLon currentLocation) {
List<City> citiesToFill = new ArrayList<City>();
if (cities.isEmpty()) {
preloadCities(resultMatcher);
@ -338,7 +341,7 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
@Override
public void clearCache() {
cities.clear();
cities = new LinkedHashMap<Long, City>();
citiesQtree.clear();
postCodes.clear();