Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-05-19 21:50:41 +02:00
commit 4d9ae1e8bf
2 changed files with 3 additions and 4 deletions

View file

@ -103,8 +103,8 @@ public class MapillaryPlugin extends OsmandPlugin {
rasterSource = settings.getTileSourceByName(TileSourceManager.getMapillaryRasterSource().getName(), false);
vectorSource = settings.getTileSourceByName(TileSourceManager.getMapillaryVectorSource().getName(), false);
}
updateLayer(mapView, rasterSource, rasterLayer, 0.6f);
updateLayer(mapView, vectorSource, vectorLayer, 0.61f);
updateLayer(mapView, rasterSource, rasterLayer, 0.61f);
updateLayer(mapView, vectorSource, vectorLayer, 0.62f);
} else {
mapView.removeLayer(rasterLayer);
rasterLayer.setMap(null);

View file

@ -305,8 +305,7 @@ public class ResourceManager {
public synchronized boolean tileExistOnFileSystem(String file, ITileSource map, int x, int y, int zoom) {
TilesCache cache = getTilesCache(map);
return cache != null && !cache.tilesOnFS.containsKey(file)
&& cache.tileExistOnFileSystem(file, map, x, y, zoom);
return cache != null && cache.tileExistOnFileSystem(file, map, x, y, zoom);
}
public void clearTileForMap(String file, ITileSource map, int x, int y, int zoom){