Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-16 17:28:53 +01:00
commit b06d2e0b5f

View file

@ -59,7 +59,7 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
@Override
public synchronized void preloadCities(ResultMatcher<City> resultMatcher) {
if (cities.isEmpty()) {
// if (cities.isEmpty()) {
try {
List<City> cs = file.getCities(region, BinaryMapIndexReader.buildAddressRequest(resultMatcher),
BinaryMapAddressReaderAdapter.CITY_TOWN_TYPE);
@ -76,7 +76,7 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
} catch (IOException e) {
log.error("Disk operation failed", e); //$NON-NLS-1$
}
}
// }
}
public City getClosestCity(LatLon l, List<City> cache) {