From 6cb6ff1d3c59c6026cd306a7f74b3cde4407ce5e Mon Sep 17 00:00:00 2001
From: veliymolfar <veliymolfar@gmailcom>
Date: Wed, 25 Mar 2020 17:07:21 +0200
Subject: [PATCH] conflicts

---
 OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java
index edf6699477..952ac4a498 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java
@@ -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));
 	}