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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-10-09 00:54:12 +02:00
commit d4178f20bd
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -728,7 +728,7 @@ public class ResourceManager {
LatLon l = a.getLocation(); LatLon l = a.getLocation();
if (l != null && l.getLatitude() <= topLatitude && l.getLatitude() >= bottomLatitude if (l != null && l.getLatitude() <= topLatitude && l.getLatitude() >= bottomLatitude
&& l.getLongitude() >= leftLongitude && l.getLongitude() <= rightLongitude) { && l.getLongitude() >= leftLongitude && l.getLongitude() <= rightLongitude) {
if (matcher.publish(a)) { if (matcher == null || matcher.publish(a)) {
amenities.add(a); amenities.add(a);
} }
} }
@ -743,16 +743,18 @@ public class ResourceManager {
new ResultMatcher<Amenity>() { new ResultMatcher<Amenity>() {
@Override @Override
public boolean publish(Amenity object) { public boolean publish(Amenity a) {
if (checkNameFilter(object, filterByName)) { if (checkNameFilter(a, filterByName)) {
return matcher.publish(object); if (matcher == null || matcher.publish(a)) {
amenities.add(a);
}
} }
return false; return false;
} }
@Override @Override
public boolean isCancelled() { public boolean isCancelled() {
return matcher.isCancelled(); return matcher != null && matcher.isCancelled();
} }
}); });
} }