conflicts

This commit is contained in:
veliymolfar 2020-03-25 17:07:21 +02:00
parent 2a5f6627c2
commit 6cb6ff1d3c

View file

@ -45,7 +45,6 @@ public class TerrainLayer extends MapTileLayer {
private TerrainMode mode;
private QuadTree<String> indexedResources = new QuadTree<String>(new QuadRect(0, 0, 1 << (ZOOM_BOUNDARY+1), 1 << (ZOOM_BOUNDARY+1)), 8, 0.55f);
private final int defaultAlpha;
public TerrainLayer(MapActivity activity, SRTMPlugin srtmPlugin) {
super(false);
@ -53,8 +52,7 @@ public class TerrainLayer extends MapTileLayer {
this.srtmPlugin = srtmPlugin;
mode = srtmPlugin.getTerrainMode();
indexTerrainFiles(app);
indexHillshadeFiles(app);
setAlpha(defaultAlpha);
setAlpha(DEFAULT_ALPHA);
setMap(createTileSource(activity));
}