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

Fix NPE that occurs while search amenities

Browse source
This commit is contained in:
Alexander Sytnyk 2018-02-02 12:34:01 +02:00
parent 95d1c7370e
commit 6fbfbf1b65
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
View file

@ -716,18 +716,18 @@ public class ResourceManager {
int left31 = MapUtils.get31TileNumberX(leftLongitude); int left31 = MapUtils.get31TileNumberX(leftLongitude);
int bottom31 = MapUtils.get31TileNumberY(bottomLatitude); int bottom31 = MapUtils.get31TileNumberY(bottomLatitude);
int right31 = MapUtils.get31TileNumberX(rightLongitude); int right31 = MapUtils.get31TileNumberX(rightLongitude);
List<String> fileNames = new ArrayList<String>(amenityRepositories.keySet()); List<String> fileNames = new ArrayList<>(amenityRepositories.keySet());
Collections.sort(fileNames, Algorithms.getStringVersionComparator()); Collections.sort(fileNames, Algorithms.getStringVersionComparator());
for (String name : fileNames) { for (String name : fileNames) {
AmenityIndexRepository index = amenityRepositories.get(name);
if (matcher != null && matcher.isCancelled()) { if (matcher != null && matcher.isCancelled()) {
searchAmenitiesInProgress = false; searchAmenitiesInProgress = false;
break; break;
} }
if (index.checkContainsInt(top31, left31, bottom31, right31)) { AmenityIndexRepository index = amenityRepositories.get(name);
if (index != null && index.checkContainsInt(top31, left31, bottom31, right31)) {
List<Amenity> r = index.searchAmenities(top31, List<Amenity> r = index.searchAmenities(top31,
left31, bottom31, right31, zoom, filter, matcher); left31, bottom31, right31, zoom, filter, matcher);
if(r != null) { if (r != null) {
amenities.addAll(r); amenities.addAll(r);
} }
} }