conflicts
This commit is contained in:
parent
2a5f6627c2
commit
6cb6ff1d3c
1 changed files with 1 additions and 3 deletions
|
@ -45,7 +45,6 @@ public class TerrainLayer extends MapTileLayer {
|
||||||
private TerrainMode mode;
|
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 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) {
|
public TerrainLayer(MapActivity activity, SRTMPlugin srtmPlugin) {
|
||||||
super(false);
|
super(false);
|
||||||
|
@ -53,8 +52,7 @@ public class TerrainLayer extends MapTileLayer {
|
||||||
this.srtmPlugin = srtmPlugin;
|
this.srtmPlugin = srtmPlugin;
|
||||||
mode = srtmPlugin.getTerrainMode();
|
mode = srtmPlugin.getTerrainMode();
|
||||||
indexTerrainFiles(app);
|
indexTerrainFiles(app);
|
||||||
indexHillshadeFiles(app);
|
setAlpha(DEFAULT_ALPHA);
|
||||||
setAlpha(defaultAlpha);
|
|
||||||
setMap(createTileSource(activity));
|
setMap(createTileSource(activity));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue