From fe844bd9bd28c38764e0eabe45d413f947d1884b Mon Sep 17 00:00:00 2001
From: Nazar-Kutz <vitamikuna@gmail.com>
Date: Wed, 3 Jun 2020 11:27:33 +0300
Subject: [PATCH 1/8] Fix Wikipedia languages bottom sheet

---
 .../SelectWikiLanguagesBottomSheet.java       | 28 ++++++------
 .../plus/wikipedia/WikipediaPoiMenu.java      | 45 ++++++-------------
 2 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java b/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java
index 113cba1ebe..f69b6a9397 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java
@@ -11,9 +11,9 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.core.os.ConfigurationCompat;
 import androidx.core.os.LocaleListCompat;
+import androidx.fragment.app.FragmentActivity;
 
 import net.osmand.AndroidUtils;
-import net.osmand.CallbackWithObject;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
@@ -48,7 +48,6 @@ public class SelectWikiLanguagesBottomSheet extends MenuBottomSheetDialogFragmen
 	private List<BottomSheetItemWithCompoundButton> languageItems;
 
 	private ArrayList<WikiLanguageItem> languages;
-	private CallbackWithObject<Boolean> languageChangedCallback;
 	private boolean isGlobalWikiPoiEnabled = false;
 
 	@Override
@@ -56,6 +55,7 @@ public class SelectWikiLanguagesBottomSheet extends MenuBottomSheetDialogFragmen
 		super.onCreate(savedInstanceState);
 		app = requiredMyApplication();
 		settings = app.getSettings();
+		appMode = settings.getApplicationMode();
 		initLanguagesData();
 	}
 
@@ -192,8 +192,9 @@ public class SelectWikiLanguagesBottomSheet extends MenuBottomSheetDialogFragmen
 		}
 		settings.WIKIPEDIA_POI_ENABLED_LANGUAGES.setStringsListForProfile(appMode, localesForSaving);
 		settings.GLOBAL_WIKIPEDIA_POI_ENABLED.setModeValue(appMode, isGlobalWikiPoiEnabled);
-		if (languageChangedCallback != null) {
-			languageChangedCallback.processResult(true);
+		MapActivity ma = getMapActivity();
+		if (ma != null) {
+			WikipediaPoiMenu.updateWikipediaState(ma);
 		}
 		dismiss();
 	}
@@ -227,12 +228,13 @@ public class SelectWikiLanguagesBottomSheet extends MenuBottomSheetDialogFragmen
 		}
 	}
 
-	public void setAppMode(ApplicationMode appMode) {
-		this.appMode = appMode;
-	}
-
-	public void setLanguageChangedCallback(CallbackWithObject<Boolean> languageChangedCallback) {
-		this.languageChangedCallback = languageChangedCallback;
+	@Nullable
+	private MapActivity getMapActivity() {
+		FragmentActivity activity = getActivity();
+		if (activity instanceof MapActivity) {
+			return (MapActivity) activity;
+		}
+		return null;
 	}
 
 	private class WikiLanguageItem implements Comparable<WikiLanguageItem> {
@@ -276,13 +278,9 @@ public class SelectWikiLanguagesBottomSheet extends MenuBottomSheetDialogFragmen
 	}
 
 	public static void showInstance(@NonNull MapActivity mapActivity,
-	                                @NonNull ApplicationMode appMode,
-	                                boolean usedOnMap,
-	                                CallbackWithObject<Boolean> callback) {
+	                                boolean usedOnMap) {
 		SelectWikiLanguagesBottomSheet fragment = new SelectWikiLanguagesBottomSheet();
-		fragment.setAppMode(appMode);
 		fragment.setUsedOnMap(usedOnMap);
-		fragment.setLanguageChangedCallback(callback);
 		fragment.show(mapActivity.getSupportFragmentManager(), SelectWikiLanguagesBottomSheet.TAG);
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java
index 054edb18c5..28c1245030 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java
@@ -38,14 +38,12 @@ public class WikipediaPoiMenu {
 	private MapActivity mapActivity;
 	private OsmandApplication app;
 	private OsmandSettings settings;
-	private ApplicationMode appMode;
 	private boolean nightMode;
 
 	public WikipediaPoiMenu(MapActivity mapActivity) {
 		this.mapActivity = mapActivity;
 		this.app = mapActivity.getMyApplication();
 		this.settings = app.getSettings();
-		this.appMode = settings.getApplicationMode();
 		this.nightMode = app.getDaynightHelper().isNightModeForMapControls();
 	}
 
@@ -59,14 +57,6 @@ public class WikipediaPoiMenu {
 		adapter.setProfileDependent(true);
 		adapter.setNightMode(nightMode);
 
-		final CallbackWithObject<Boolean> callback = new CallbackWithObject<Boolean>() {
-			@Override
-			public boolean processResult(Boolean result) {
-				mapActivity.getDashboard().refreshContent(true);
-				return true;
-			}
-		};
-
 		ContextMenuAdapter.OnRowItemClick l = new ContextMenuAdapter.OnRowItemClick() {
 			@Override
 			public boolean onContextMenuClick(final ArrayAdapter<ContextMenuItem> adapter,
@@ -75,11 +65,11 @@ public class WikipediaPoiMenu {
 					app.runInUIThread(new Runnable() {
 						@Override
 						public void run() {
-							toggleWikipediaPoi(mapActivity, !enabled, callback);
+							toggleWikipediaPoi(mapActivity, !enabled, null);
 						}
 					});
 				} else if (itemId == languageActionStringId) {
-					showLanguagesDialog(mapActivity, appMode, true, callback);
+					SelectWikiLanguagesBottomSheet.showInstance(mapActivity, true);
 				}
 				return false;
 			}
@@ -230,26 +220,15 @@ public class WikipediaPoiMenu {
 		return adapter;
 	}
 
-	private static void showLanguagesDialog(@NonNull final MapActivity mapActivity,
-	                                        @NonNull final ApplicationMode appMode,
-	                                        final boolean usedOnMap,
-	                                        final CallbackWithObject<Boolean> callback) {
-		final OsmandApplication app = mapActivity.getMyApplication();
-		SelectWikiLanguagesBottomSheet.showInstance(mapActivity, appMode, usedOnMap,
-				new CallbackWithObject<Boolean>() {
-					@Override
-					public boolean processResult(Boolean result) {
-						if (result) {
-							Bundle wikiPoiSetting = getWikiPoiSettingsForProfile(app, appMode);
-							if (wikiPoiSetting != null) {
-								refreshWikipediaOnMap(mapActivity);
-							} else {
-								toggleWikipediaPoi(mapActivity, false, callback);
-							}
-						}
-						return true;
-					}
-				});
+	public static void updateWikipediaState(MapActivity ma) {
+		final OsmandApplication app = ma.getMyApplication();
+		ApplicationMode appMode = app.getSettings().getApplicationMode();
+		Bundle wikiPoiSetting = getWikiPoiSettingsForProfile(app, appMode);
+		if (wikiPoiSetting != null) {
+			refreshWikipediaOnMap(ma);
+		} else {
+			toggleWikipediaPoi(ma, false, null);
+		}
 	}
 
 	public static String getTranslation(OsmandApplication app, String locale) {
@@ -305,6 +284,8 @@ public class WikipediaPoiMenu {
 		}
 		if (callback != null) {
 			callback.processResult(enable);
+		} else {
+			mapActivity.getDashboard().refreshContent(true);
 		}
 		mapActivity.refreshMap();
 	}

From 6dde05d2973e5d3255fa95cf092053758dc22c9f Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 3 Jun 2020 12:22:19 +0200
Subject: [PATCH 2/8] Fix compilation

---
 .../test/resources/search/navacerrada.json    | 41 +------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/OsmAnd-java/src/test/resources/search/navacerrada.json b/OsmAnd-java/src/test/resources/search/navacerrada.json
index 27653999ba..17c09093e4 100644
--- a/OsmAnd-java/src/test/resources/search/navacerrada.json
+++ b/OsmAnd-java/src/test/resources/search/navacerrada.json
@@ -11,7 +11,6 @@
   },
   "phrase": "Calle de las eras 5, Navacerrada",
   "results": [
-<<<<<<< HEAD
     "5, Calle de las Eras (Uranización Los Corales), Navacerrada"
   ],
   "extra-results": [
@@ -74,45 +73,7 @@
 	"Calle Dos Castillas, Puerto de Navacerrada",
 	"Travesía de las Huertas, Navacerrada",
 	"Vereda de las Encinillas, Navacerrada",
-	"Centro Municipal de Mayores «Navacerrada»",
-=======
-    "5, Calle de las Eras (Uranización Los Corales), Navacerrada",
-    "5, Calle Navacerrada (Urb. Las Suertes), Las Suertes",
-    "50, Calle de Francisco Navacerrada, Salamanca",
-    "52, Calle de Francisco Navacerrada, Salamanca",
-    "53, Calle de Francisco Navacerrada, Salamanca",
-    "54, Calle de Francisco Navacerrada, Salamanca",
-    "55, Calle de Francisco Navacerrada, Salamanca",
-    "56, Calle de Francisco Navacerrada, Salamanca",
-    "57, Calle de Francisco Navacerrada, Salamanca",
-    "58, Calle de Francisco Navacerrada, Salamanca",
-    "59, Calle de Francisco Navacerrada, Salamanca",
-    "Calle del Puerto de Navacerrada, Las Nieves",
-    "Calle Puerto de Navacerrada, La Poveda",
-    "Calle del Embalse de Navacerrada, Villa de Vallecas",
-    "Calle del Puerto de Navacerrada, Puente de Vallecas",
-    "Calle de Francisco Navacerrada, Salamanca",
-    "Calle de Navacerrada, Moraleja de Enmedio",
-    "Calle Navacerrada (Urb. Las Suertes), Las Suertes",
-    "Calle Puerto de Navacerrada, Roman Candelas",
-    "Calle Navacerrada, Becerril de la Sierra",
-    "Carretera de Collado Villalba a Navacerrada, El Baillo y las Hojarascas",
-    "Calle Navacerrada (Cerceda), El Boalo",
-    "Calle Navacerrada (El Pedregal), Bustarviejo",
-    "Calle Navacerrada, Buitrago del Lozoya",
-    "Carretera de Colmenar Viejo a Navacerrada, Becerril de la Sierra",
-    "Carretera de Colmenar Viejo a Navacerrada, Manzanares el Real",
-    "Carretera de Collado Villalba a Navacerrada, Dehesa Boyal",
-    "Carretera de Collado Villalba a Navacerrada, Polideportivo Dehesa Boyal",
-    "Carretera de Navacerrada, Jazmines",
-    "Carretera de Colmenar Viejo a Navacerrada (Cerceda), El Boalo",
-    "Carretera de Collado Villalba a Navacerrada, Cerca de Cascarrilla",
-    "Carretera de Navacerrada, El Boalo",
-    "Carretera de Collado Villalba a Navacerrada, Collado Mediano",
-    "Camino de Navacerrada (Serranía de la Paloma), Collado Mediano",
-    "Camino de Los Molinos a Navacerrada, Collado Mediano",
-    "Carretera de Collado Villalba a Navacerrada, Navacerrada"
->>>>>>> e69e0d95cc... Added search test
+	"Centro Municipal de Mayores «Navacerrada»"
   ],
   "amenities": [
     {

From 1a4970fbbc23111502d859e3d69cff96f1f21fab Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Wed, 3 Jun 2020 15:43:53 +0300
Subject: [PATCH 3/8] Fix turn screen on

---
 OsmAnd/src/net/osmand/plus/activities/MapActivity.java | 3 ++-
 OsmAnd/src/net/osmand/plus/helpers/LockHelper.java     | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index e19af7c3e5..c39309b99e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -1977,10 +1977,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		if (enable) {
 			getWindow().setFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED,
 					WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+			setKeepScreenOn(true);
 		} else {
 			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+			setKeepScreenOn(forceKeepScreenOn);
 		}
-		setKeepScreenOn(forceKeepScreenOn);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
index a7dcf6b011..9502c17401 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
@@ -118,11 +118,8 @@ public class LockHelper implements SensorEventListener {
 
 	private void lock() {
 		releaseWakeLocks();
-		int unlockTime = turnScreenOnTime.get();
-		if (lockUIAdapter != null) {
-			if (!(useSystemScreenTimeout.get() && turnScreenOnPowerButton.get()) && unlockTime != 0) {
-				lockUIAdapter.lock();
-			}
+		if (lockUIAdapter != null && !(useSystemScreenTimeout.get() && turnScreenOnPowerButton.get())) {
+			lockUIAdapter.lock();
 		}
 	}
 

From b92c91c31e1de4df3b5c9cfdc4d82e61fee1965a Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Wed, 3 Jun 2020 15:53:01 +0300
Subject: [PATCH 4/8] Remove unnecessary changes

---
 OsmAnd/src/net/osmand/plus/activities/MapActivity.java | 5 ++---
 OsmAnd/src/net/osmand/plus/helpers/LockHelper.java     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index c39309b99e..3e94bae493 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -1977,11 +1977,10 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		if (enable) {
 			getWindow().setFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED,
 					WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-			setKeepScreenOn(true);
 		} else {
 			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-			setKeepScreenOn(forceKeepScreenOn);
 		}
+		setKeepScreenOn(forceKeepScreenOn);
 	}
 
 	@Override
@@ -1991,7 +1990,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 	@Override
 	public void unlock() {
-		changeKeyguardFlags(true, false);
+		changeKeyguardFlags(true, true);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
index 9502c17401..d58bbd104c 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
@@ -118,7 +118,7 @@ public class LockHelper implements SensorEventListener {
 
 	private void lock() {
 		releaseWakeLocks();
-		if (lockUIAdapter != null && !(useSystemScreenTimeout.get() && turnScreenOnPowerButton.get())) {
+		if (lockUIAdapter != null) {
 			lockUIAdapter.lock();
 		}
 	}

From 96bccff5159c6072f0d5f041dadeb76c11fb11d4 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Wed, 3 Jun 2020 16:09:05 +0300
Subject: [PATCH 5/8] Remove unnecessary changes for power button

---
 OsmAnd/src/net/osmand/plus/helpers/LockHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
index d58bbd104c..9502c17401 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
@@ -118,7 +118,7 @@ public class LockHelper implements SensorEventListener {
 
 	private void lock() {
 		releaseWakeLocks();
-		if (lockUIAdapter != null) {
+		if (lockUIAdapter != null && !(useSystemScreenTimeout.get() && turnScreenOnPowerButton.get())) {
 			lockUIAdapter.lock();
 		}
 	}

From c69e1104c31bf624cd9a9981c16dc94adf39b8d0 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Wed, 3 Jun 2020 16:41:51 +0300
Subject: [PATCH 6/8] Fix power button for keep screen on

---
 OsmAnd/src/net/osmand/plus/helpers/LockHelper.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
index 9502c17401..9bf628803a 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
@@ -118,8 +118,13 @@ public class LockHelper implements SensorEventListener {
 
 	private void lock() {
 		releaseWakeLocks();
-		if (lockUIAdapter != null && !(useSystemScreenTimeout.get() && turnScreenOnPowerButton.get())) {
-			lockUIAdapter.lock();
+		if (lockUIAdapter != null) {
+			boolean useSystemTimeout = useSystemScreenTimeout.get();
+			boolean usePowerButton = useSystemTimeout && turnScreenOnPowerButton.get()
+					|| !useSystemTimeout && turnScreenOnTime.get() == 0 && turnScreenOnPowerButton.get();
+			if (!usePowerButton) {
+				lockUIAdapter.lock();
+			}
 		}
 	}
 

From 3a16a63520d971d90e944c897185fe3c15ac92f0 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Wed, 3 Jun 2020 17:48:21 +0300
Subject: [PATCH 7/8] Fix #9085

---
 .../src/net/osmand/plus/OsmAndFormatter.java  | 24 ++++---------------
 .../builders/AmenityMenuBuilder.java          | 15 +++++++++---
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
index 2076943954..49218b198c 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
@@ -26,9 +26,7 @@ import java.text.DecimalFormatSymbols;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.LinkedHashMap;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Map.Entry;
 
 import static net.osmand.data.PointDescription.getLocationOlcName;
@@ -276,27 +274,13 @@ public class OsmAndFormatter {
 		}
 	}
 
-	public static Map<MetricsConstants, String> getDistanceData(OsmandApplication app, float meters) {
-		Map<MetricsConstants, String> results = new LinkedHashMap<>();
-
-		String kilometersAndMeters = getFormattedDistance(meters, app, true, MetricsConstants.KILOMETERS_AND_METERS);
-		String milesAndFeet = getFormattedDistance(meters, app, true, MetricsConstants.MILES_AND_FEET);
-		String milesAndMeters = getFormattedDistance(meters, app, true, MetricsConstants.MILES_AND_METERS);
-		String milesAndYards = getFormattedDistance(meters, app, true, MetricsConstants.MILES_AND_YARDS);
-		String nauticalMiles = getFormattedDistance(meters, app, true, MetricsConstants.NAUTICAL_MILES);
-
-		results.put(MetricsConstants.KILOMETERS_AND_METERS, kilometersAndMeters);
-		results.put(MetricsConstants.MILES_AND_FEET, milesAndFeet);
-		results.put(MetricsConstants.MILES_AND_METERS, milesAndMeters);
-		results.put(MetricsConstants.MILES_AND_YARDS, milesAndYards);
-		results.put(MetricsConstants.NAUTICAL_MILES, nauticalMiles);
-
-		return results;
-	}
-
 	public static String getFormattedAlt(double alt, OsmandApplication ctx) {
 		OsmandSettings settings = ctx.getSettings();
 		MetricsConstants mc = settings.METRIC_SYSTEM.get();
+		return getFormattedAlt(alt, ctx, mc);
+	}
+
+	public static String getFormattedAlt(double alt, OsmandApplication ctx, MetricsConstants mc) {
 		boolean useFeet = (mc == MetricsConstants.MILES_AND_FEET) || (mc == MetricsConstants.MILES_AND_YARDS);
 		if (!useFeet) {
 			return ((int) (alt + 0.5)) + " " + ctx.getString(R.string.m);
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
index aae282d18e..3fb8d61fa8 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
@@ -58,11 +58,13 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 public class AmenityMenuBuilder extends MenuBuilder {
 
@@ -529,9 +531,16 @@ public class AmenityMenuBuilder extends MenuBuilder {
 			if ("ele".equals(key)) {
 				try {
 					float distance = Float.parseFloat(vl);
-					vl = OsmAndFormatter.getFormattedDistance(distance, app, true, metricSystem);
-					Map<MetricsConstants, String> distanceData = OsmAndFormatter.getDistanceData(app, distance);
-					collapsableView = getDistanceCollapsableView(new LinkedHashSet<>(distanceData.values()));
+					vl = OsmAndFormatter.getFormattedAlt(distance, app, metricSystem);
+					String collapsibleVal;
+					if (metricSystem == MetricsConstants.MILES_AND_FEET || metricSystem == MetricsConstants.MILES_AND_YARDS) {
+						collapsibleVal = OsmAndFormatter.getFormattedAlt(distance, app, MetricsConstants.KILOMETERS_AND_METERS);
+					} else {
+						collapsibleVal = OsmAndFormatter.getFormattedAlt(distance, app, MetricsConstants.MILES_AND_FEET);
+					}
+					Set<String> elevationData = new HashSet<>();
+					elevationData.add(collapsibleVal);
+					collapsableView = getDistanceCollapsableView(elevationData);
 					collapsable = true;
 				} catch (NumberFormatException ex) {
 					LOG.error(ex);

From 1f011927cb0f0bd129fed7478070a1b152064514 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Thu, 4 Jun 2020 13:30:07 +0300
Subject: [PATCH 8/8] fix white point

---
 OsmAnd/res/drawable-hdpi/map_compass.png         | Bin 1510 -> 0 bytes
 OsmAnd/res/drawable-hdpi/map_compass_bearing.png | Bin 1491 -> 0 bytes
 .../drawable-hdpi/map_compass_bearing_white.png  | Bin 1491 -> 0 bytes
 OsmAnd/res/drawable-hdpi/map_compass_niu.png     | Bin 1315 -> 0 bytes
 .../res/drawable-hdpi/map_compass_niu_white.png  | Bin 1315 -> 0 bytes
 OsmAnd/res/drawable-hdpi/map_compass_white.png   | Bin 1510 -> 0 bytes
 OsmAnd/res/drawable-mdpi/map_compass.png         | Bin 1338 -> 0 bytes
 OsmAnd/res/drawable-mdpi/map_compass_bearing.png | Bin 1326 -> 0 bytes
 .../drawable-mdpi/map_compass_bearing_white.png  | Bin 1326 -> 0 bytes
 OsmAnd/res/drawable-mdpi/map_compass_niu.png     | Bin 1225 -> 0 bytes
 .../res/drawable-mdpi/map_compass_niu_white.png  | Bin 1230 -> 0 bytes
 OsmAnd/res/drawable-mdpi/map_compass_white.png   | Bin 1341 -> 0 bytes
 OsmAnd/res/drawable-xhdpi/map_compass.png        | Bin 1693 -> 0 bytes
 .../res/drawable-xhdpi/map_compass_bearing.png   | Bin 1690 -> 0 bytes
 .../drawable-xhdpi/map_compass_bearing_white.png | Bin 1690 -> 0 bytes
 OsmAnd/res/drawable-xhdpi/map_compass_niu.png    | Bin 1421 -> 0 bytes
 .../res/drawable-xhdpi/map_compass_niu_white.png | Bin 1421 -> 0 bytes
 OsmAnd/res/drawable-xhdpi/map_compass_white.png  | Bin 1695 -> 0 bytes
 OsmAnd/res/drawable-xxhdpi/map_compass.png       | Bin 1979 -> 0 bytes
 .../res/drawable-xxhdpi/map_compass_bearing.png  | Bin 2032 -> 0 bytes
 .../map_compass_bearing_white.png                | Bin 2032 -> 0 bytes
 OsmAnd/res/drawable-xxhdpi/map_compass_niu.png   | Bin 1655 -> 0 bytes
 .../drawable-xxhdpi/map_compass_niu_white.png    | Bin 1653 -> 0 bytes
 OsmAnd/res/drawable-xxhdpi/map_compass_white.png | Bin 1978 -> 0 bytes
 .../mapcontextmenu/MapContextMenuFragment.java   |   2 +-
 .../net/osmand/plus/views/FavouritesLayer.java   |   2 +-
 26 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 OsmAnd/res/drawable-hdpi/map_compass.png
 delete mode 100644 OsmAnd/res/drawable-hdpi/map_compass_bearing.png
 delete mode 100644 OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png
 delete mode 100644 OsmAnd/res/drawable-hdpi/map_compass_niu.png
 delete mode 100644 OsmAnd/res/drawable-hdpi/map_compass_niu_white.png
 delete mode 100644 OsmAnd/res/drawable-hdpi/map_compass_white.png
 delete mode 100644 OsmAnd/res/drawable-mdpi/map_compass.png
 delete mode 100644 OsmAnd/res/drawable-mdpi/map_compass_bearing.png
 delete mode 100644 OsmAnd/res/drawable-mdpi/map_compass_bearing_white.png
 delete mode 100644 OsmAnd/res/drawable-mdpi/map_compass_niu.png
 delete mode 100644 OsmAnd/res/drawable-mdpi/map_compass_niu_white.png
 delete mode 100644 OsmAnd/res/drawable-mdpi/map_compass_white.png
 delete mode 100644 OsmAnd/res/drawable-xhdpi/map_compass.png
 delete mode 100644 OsmAnd/res/drawable-xhdpi/map_compass_bearing.png
 delete mode 100644 OsmAnd/res/drawable-xhdpi/map_compass_bearing_white.png
 delete mode 100644 OsmAnd/res/drawable-xhdpi/map_compass_niu.png
 delete mode 100644 OsmAnd/res/drawable-xhdpi/map_compass_niu_white.png
 delete mode 100644 OsmAnd/res/drawable-xhdpi/map_compass_white.png
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/map_compass.png
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/map_compass_bearing.png
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/map_compass_bearing_white.png
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/map_compass_niu.png
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/map_compass_niu_white.png
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/map_compass_white.png

diff --git a/OsmAnd/res/drawable-hdpi/map_compass.png b/OsmAnd/res/drawable-hdpi/map_compass.png
deleted file mode 100644
index e852a4db1de10d234e5636021d3f8b70133f3b55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1510
zcmbVMeM}Q)7(d!sQFK&MhOoM`$b{kb?%H14yV=n%I_fBEuwb{C#cS^^J)phz?vRsA
zBN!PNV{nTL+mfZY7?Cj(7L&!Ob5S;9bRT}OY`Db8h!OXtTb2<uV{ehV{bBrLm)yPY
z^S;mTd4A8=^#<x*T)eP&A%Y-_eKnqXxUSB;xf=Mrj`a7#WrbWFk~auZxt$dO;^c%d
zKz(tx3Dg6Y+nPED)**;`3m**0A%86s5#k0mqhnCwNr*;}byZ4|jkEw64TB~=Vb}k5
z{FEN$IlF!%<tO|}H;C~y9U|D!Q5TGKv_xo5U-bgIPGO*dIFMOXiMJ*sMzQN>?J{tm
zImY$qtcu)X*FPW?@&{12AOe&!Sg;5|no%olASsKLwys5uP{s)xZX_^*W+)Rw7}2>$
z550+8l&SZ4=X^oQu8+xblELxz_I5+N$smYLI7!nqP8e~c5rZ0-v^62K3YL&cvlcu+
ziimtt=7j{BvB-vnHrcL+Odo_0Px}224JV|zM8TBd3Y)}91A)imnYd=PCAl8_OXHE+
zQgCY$;PpTf+QbN~N3=8xhPivZql_YC!@Ml=uqbS+M~Jk=K|=O<?0R@(;CPNPM#B*h
zj<Q&Uv;vGK%~s4t&;%AGZ8k0nIFpqivUVPYCp;F4@OqqXo6|{>)n=R3Q*Enun_V{2
z<MevXS*$N1$!sD5vc7rfdk#xK7R$Irz{-Lc6ol4n7X)I0EJ!gSiMrjhRY%J=@(E68
zmnt%4dJwe-i2N47c|{?P&gPlnAHjjMm`ve_(Sng?DvX&3GfaYojl$jvhdB#HnJ6Qr
zpTl$iH-9)Jg=d=OKh2Xpf*qOJJ{$!oJRByFfD<IbQTa;Rb{j!d8lT4*RK~;iXJ)F-
zY*wuuE$@f|Z%uEdc4pqhw&`U)-SgGD`Ad*Jjvq8_eP!AW%O-1s$pE2!4;i7g^8?LA
z1<MbdSkZe;HF`lkl~&Mi9TP1%sh=HmkGkilksd2T-gDT>3wppv&v|u9b5b{&H@aMz
z{4m{o^G4c*7M>}^H4W~k=Jz5ga>=dT1I_%e>GkN1QkU+TAm-OSv3~TG)q`K3-go=(
zjdVwB%b}yO^zNPJ^t@FEcdZ$F`bupSTu^;fKX?l*h?T83<aRZF8k7PhN8fSs1-qDE
z23k}6Wbyr6?bW4IeP<l4>K}&>g>xHLQ70UQO2NR{l5^zDKs4~Bb4{nBUV3W(j@O<Y
zEH3&Ep>_@(8`g~1&db?`?)~foi)yGlXXsFO;rD+RYjN*{HHWM$Y#R>HMWIDwFTM3<
z@s;Vj3qYkhwXl$?2+*3ram}lZy8KQ>v-DJ9&#}JgO#!l~KWEH+d3<H?{nxucF6*@A
z`waQdeStJw_6}X2wB1~;{j2oO`5htc?(==4_Xe5|Uz0vpbqx6PmYCnjbxm0Vl-zQ9
zyQ{M4_iqjy(G7JUIk|VLX2IKe6{#xC1h2lh`1JmRC7sh}9e-}Rn0K<oaUzKxzjSj<
zHMr=m`;R-TR7hj0>)rB}3TjXBlU)?nU!f~eeKM)J+PBiNBL|rXh4#60m$qmAyuRu>
K&k@(=u73d5B?&VC

diff --git a/OsmAnd/res/drawable-hdpi/map_compass_bearing.png b/OsmAnd/res/drawable-hdpi/map_compass_bearing.png
deleted file mode 100644
index 525fec84765f82f39805f00075caa62e43cdd623..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1491
zcmbVMZA=qq9KW^`9B--4sTc^42b(%+@A}?5>7evLN-TD@gE|+-UGEA9v{$YNEle{i
z0}DaS2wQN8TE||TGuxuX4{pY7*2S5*7{;O@*^G^G!w)#3TZ}Qfr%2sC5I^jayXW~o
z&+q^Hzu$nfZgXzdnk)oCa_u#g3$7)pcWDOvUPs2p;F2#@d8BQEPYTl_hgeyG;eg#w
zH*qeGX1m&d;K~q0(aF0#lE<-y^a_48ox-Ri{vgywkh1bfkoLB65@5I{K43v_e{~iG
zJZnK43=Z58v~kURO}EHx>#lQqyIZ{ki<Z9($|58r@N*IkBL22Oh>Td!d0rCkQ^yzz
z<{?t61%2$4$KeDvLF9lzZB%)2jUJc?wZ>pH5vEe0g))YlF)gmb3DTe=aV=PQP-snL
zeWZ)3Ua$ov3)(D6K@!8l;jlWaQww4frXdId!?l=JtAYqss4F1R5mg{moMxc7kXPh`
z5-$Wmijii74#|Q-PalWi4>}xAhy$U8M8T9{5ju!z)Hvq%r{bDNha?yGuN#Y^L+-91
zhq<_r&>?zZJ$%J!Wth9C8%hD8H{@24hee^=D8bv|=K_+QvY_xr&GIa%^)X(K@zE-;
z#>A-zjozd(;{>kqY0PHU$FVvSj;DDR)5j^QlCt4io7rmBXsYyP6IErdvgs?$8p>K-
ztxxOP10jhHc)7G~9@@q!s|hz!RZrC=Z6ZfYg6I~6wsaRbn*~V-H48ytv&~l>tZ(20
ztPl=uNR{bv)D$Q3og7;&3Vtx3XOdsU2iB<5F<z}vrO_K0l@8a#Bp7KQ>@9|2jRu3x
zpf#Wi`t1MB9|oPmQqA(8=1CvHj!bQzi~<y%3=<cC6C}b>Q4kM5LlD^=J7sl8rkMwi
z9+jVKlyAxD%^4zN%EoVBST?d*oIWN`8eRJ12NE?Wl_!v7JvdcR`bz!26}5_4up9i{
zf8xxM2eJ<3dUxYM^qooP2UFHt@w@vE6~&W^WIU_Xhg;9j%z`d3{QcThibU4kPG`RI
zWOBo`+L;+(2X!U!7ndCyR_DDWXX@lF<|DV7X8{d<0xo}s+u|r3%}kVidAj*8syf5w
zn7aS$r^CtUu}=>4-n*=7d}jJ!{`m{vT<W``*fk+KS1PmP*;#Ws{KL2L<fOuN*q)sk
zUCzsl1L30l)oqTRSI@}m&h$~Ne57zxo=9FTxp};Q;^5?W?foNWclj>`iT*F*n>q%f
z*Z&|gGIj>O_Kj9vIx^VHL_I4H%bn|YKODT0v;8QsVpFVd?Benpt36Z8jt*_V(6X&K
zii7&KAOD&=cxwFjKgrr9Ex&0++tSh6jRQmV%$rM|ugN7x3RfTrGIHY$*<2~;-22|e
zS?9xzW!+Nr>i*X=>Fk5+D$4R>g*~3E*w4|(D&<?flQYit%%i8*MaU&3AFXWw#=aA`
zWpl5AotcSs1F=JAD|RUd??kT_#Cm(ot7GrRZ|?c=nq#oH;{6@*Ve?k2E$_y?=bSk$
sQ~4;7cg{LAK3+7Qx28k6Pgc<*LoV0upzw+C{nT&PUR6hZUfH<kAG`_&V*mgE

diff --git a/OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png
deleted file mode 100644
index dff3bbb54a8f8adac5b4be89d713f551169163e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1491
zcmbVMeM}Q)7{8VYj;|EwRE&hzlTDnocl~ZpIw(Dm5{q5wu+GJC*SpdK+N;+qEle{i
z0}DaS2wQXsTE{*ZG24Q~KirJltcx>qF^olHvKbrVhRJY5w-{q|Z;`tFLHuKv+`aGf
zzR&M@e$UtS+3UCFWv|Uf5G2o9OFH0Ml6seC!tV{_@L{+Viq$T$f%k}EN?;K)!_zFV
z`lx2s!BR}ep6}Um1j%UUoG#I2+eWx~pMpy1C?dW9L?cLfMI=DETUim%Y%}LKp|`(0
zivo@@p*yrT+!nB~Uaq!NU>iE?o$k(7w~;|BUIyh60vhnKA_XG8Hh++an9v2g1l*^N
zF%&GQh^;2{F)5eL4lKOD0<A(PcjHP8&>Iy>txj*$mjM-&G2DQua5-)yv}yuZfyD=f
z-UP-&ILMksUr;ikUQrAX7#0qP6=Ai47n(7p(P+eQ6{b?jp@uxz;TNfh+#lSKwm`B$
zx4;ENj`xF<MT+J_q6vjeABW%z*lbS>`-6*#f+@oyQ~*;daLngR#kHUv6dmlpG?vs3
zIy(X^=3s+-NN~e?cs8WLFn3RPlv0Fji0uLgi$b-LygTG${i2mLq3}k*a15dH&~BFY
zP;$3Y&&rKTjb3iRjkw&SG#D5U%c%7@p0=|T9w*5v(t_(O2D4eItkxLxWVNB%qNy?{
zNpnq&CXKcFgCga3vuWQP^u37HJ{3z?1eOwc!O8P&=`OH)d65r#`2et37OD<PcW{1&
z4+l4;%JevDk`=gimZ=eVA6UpU!7ago(W%w6TcwjLHCkG(#x*brI?4lki>4W!R;$*k
zwCEz9`M>$YASo=>EdObq^bzdH)b`0JK;g+Sv3@u~0vwe;_{NI}BDrHF&CbX*`oW_|
z73Z3y+j6^e2Z)%g>6;e{hPDdV#-&M}Lv!LtqV}Y00!cQ4Q|roJX*{^HE@KYt1Aq5U
zoH_nL5|WiVoBE>fOxZt}Hs6ZhJ#@4<p3F$bv&%fV`TXo0=m3M?tzVsy$iCZdFO;23
zZn|DKI}5C!z9jx)!T6ve|0OA1FKsa#zvZ0+6!;N1e3?#@t!OwaQU1kg?_Xq1ro}dW
z|JhFmlhN@{j&$F<EN^<|+DPH~3twOAxstJWQn0U*<-~Kc=hgU!Z{x|S4978RPF8dU
zC(-qViwoDZ*}7gmBdI^rLo(8#qG4$wd9~!`iQdVPsc-l64jG&kKd(#lejeWv>Wkj^
z-I$rV+y9kkxa!jJ{%$(zT6IinFWvXB|4Q!8G2_ZDv7W;hSIn$&O&5#}?7Yy@upx?r
z#`PcnlGlG~^tV5Wx@9fDsszjO;kwOz1C8{X%bu^zBZi7rA_*cg^M+);474A3@8X>O
z;pXyAF?#jT>seIJ$i~X@!dOw4D?9d6G_qRuR`=AbeNWcd>5UO$S;<H1cK}__#BIs^
zYhZU)Vq;(I=-JA>vi>{KtLtLjU4}KWcjGtr|8U*b-(C6suK1u~yV;UIbMHBOZp(Bb
qYRo@p9vB@h9?f4Hk{y&(c1e)Sb-PG>GJHSvo3&Qglb=;J?f(ZQ83+jg

diff --git a/OsmAnd/res/drawable-hdpi/map_compass_niu.png b/OsmAnd/res/drawable-hdpi/map_compass_niu.png
deleted file mode 100644
index 3ae3157990d451687edcf29528936407517342fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1315
zcmbVMTTC2P7@mT#gusev+CUS`$v_iP=eqX^TlO-$vdZGJtm!IgvvWDiPL{baGq4K}
z3SxqNXhPy8Xkr7gvBB6zn`&ZxAVwb4^Z~1wT79s*G@@x=dPxWo&jO1+kUluc%sKx#
z|M&mjf15L@{^yz-k2PW#)|}|&(`fCiybbl}dkdSNM@yR>%i4o_-Yy9y#KN*JLXc2}
zVVH)3JTdwm?8dO#aV3+rv&lYA(p6HZ=#XXAKxho>?kO9BRD?DV;jp3w@w;Cw<3N#v
z_(@NaP8v~IP<kg#I5^p#ktT~$K*oDcfbKGf45-i+Kv^BpEUp~HckFU#Upc05u%luZ
zgZM6~Y%&F+x(R`Y^b!)yxPdP~G9Irl;CmLZNTz5%#nJ>F;5;slX2ITrBX6dh=hA$9
z&li${c)_*}j-pDX5?OMQx;acSfk1$wS&C%|q(N8{nk|$G&FZLH;Grd%ieW3d1}YW>
zQ6IB|IAXdRf@&m_`-U}ZFHtCER9P@6hNLM~t;DsXZP{t~FO37Wt;~c0sWi0oF;hbI
z$ahr1D0h!`R8d51xED<Y6-5}~b!kk6nw{W-IJzNaMdsMNC_ynV5EA2qM1XPo2tOU5
zi9F-?%Xuifd^BCPa}b{9!#>)}`=b7Em|<dWzmJdkV^Md+&+y@R++D>cG|Lt=308e8
z$oC%B`$#MoHKAbZW=7XXs$GyO=(cVZbOS`AJ5>iyom4bgFIiocGVMmqLsJ=ta@^Ea
zu#;y_Ie>%gb-6@|^%9KRBN8s!jgsIM@~F2&QTBQ~E)VO$_we%n%^!tGQI%%-PxDld
zP)Am_`=fw_{b7O{njo_>DrEi(3_BD}@Zn7Prnt4e-SbVZrmtzHsflxZHuv$Z_ugsq
z3gh5h&B`C4t;bKLH*R!YolP~jT);-}<lbaY0dn^8&~#P-?JG?y*7W?5?{C+yzZ|;e
zPdT5)#6dSR4Eoy}99^}e9nLRF@b2P;na}`x_*m=)){{A>IiG(c-hATsx)tW0G1uAh
zuw`i+Z+T($X85h?>|F2Xk<|Sw&n!&?IrUQeFYDJkhc3T*e(k~bVr%Bi<`au|dTKw2
zG-QqvHR9UWKRsD<Wa`hU`6BIEwWrDtaz!S7X!P%#vD$Z~aV@{l{<dRfcwxi~PS;(0
zrT$uYdExlOq4Sg4@$`%uy1p7MTyz$H`!({R9y)yA3A9Kt;VdtI(zfww_{V`Q$Jwj1
zGfTHOkG}uyYtD}@-D@k1hECT7xJ_nbVZiZ2EB06`b~fj_TmE_dugY&L5$oqKMRKqI
E1Aha%eE<Le

diff --git a/OsmAnd/res/drawable-hdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-hdpi/map_compass_niu_white.png
deleted file mode 100644
index 6f91322c2aaaeba7b7cb46f839cd212177b7db04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1315
zcmbVMZ)h837{9Entu^g}Qm}*0ch`-r)64zoC6_y!wdo~kGnX!=nado5UhdwcXPdk9
z?wX|a%d!kQKMXo#qeH0fgKia9uyo=oC}SC-h=2ECoqp(s;H=;uP(;{>Z`!8%q3nYP
zcklbW@AG?}-}CQYjr8|6Hf(ReFsw1u=Z~UwSLLm*Mc=#F^fX#ptU%lv(34h9G9czt
z^aKQ<w3LETC@JHkpTbTItI4XdxD^i{6l6W^lqx#Td^&^B7}nX9&q(qxv_Jx;RLzV3
z`r*eoP!%tJ#1*E(84(VteG>*8nCOqm6T>pE;9dJcXI?-C($JDXK0TtDLf(t7+7-~g
za!lf2RmB?i;%lVh;Rq0Q0|J-RO~@3@0*-gmE;q+>&jJR?B;_F)ilBJG)ge#}SbuQj
z%}|m;)E`{;g(NRNWLX)3By+i(GuPqNjTA}qJWo;#$uI=cAk1;ilJbORwpA_op(z_`
z#!__+R4hsfea!OWi0N7g=}b7hVOTTQ6NOSn=A{ftJ1H`quEe#fZCX+IFO5yL&DeMb
zl2K^tV}^|Ck!-7iQSKh?sG^A22!{+66-65H>+)C{YF5ba#nFvZQ5AtnCS;gMN`y>v
zkl<;SBRmvO5lPzPQIb&U;3%qUXEQuU^8rQ_g8_~eX*$62BE<$p(dVH9J)Fz$sbWK#
zX-S$4tG-p_dmS5iBvud&C|SA@)Af;R7et11OE-t~3=qZDs)M~pR87%yW_zVfYf<~5
zp=O~HH1srB&9k6x!oe-MWH;-P374C45v~L)q4+6|;8_kuE-@0rCh>K=@_+M3B2r|f
zS^m>J)g#oAmF>nTAYo&epoS*MK%=r;LoZ;MO$_;cvHYFHgL1j+#^9EN_M+V`)V(+L
z&fN>=THI0=%xo$B)cs)F@#xC!_QlCaqvH}b`pe*H<~VRp&L1npRnS_pm(0R+^JhQS
z-aFd;xhK-J4@(TNbPDvh*4MSyjJ7phbAt01FBQ9AV4mC_xQ%tiX0)aQr-F_9m$#Pa
zKQdFh9Dg}xv$*5=ukQF>E5xVzuJ%O!TzF=-0F=n#)-U%Q+Ozb;?AaH;D^DgOyH|Qo
zEtc(8!_LUjh5FNn>jqw_k708)iMi{yy1%vETPj|;`PA0Z-^J^`j<5H{UN2-LI~;Em
z=9f<7n-^Ygq3Rx<Jpa9ZcIDc+zQ*@$A#vNqtHQgZ`r~IlvW0IwcjAM`uI%QQAI>K)
z->41u{{A$(vZLwknV*jh;bne$@tf3}H*Mq1Kit3n$>n0O)h}a?LF}d9*e~ANd1kco
O+X@Bx{c}BoC;tKMMY>%8

diff --git a/OsmAnd/res/drawable-hdpi/map_compass_white.png b/OsmAnd/res/drawable-hdpi/map_compass_white.png
deleted file mode 100644
index 347709b624c9caf5e771e51eff9404ff376f273a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1510
zcmbVMeQXnD7(d$5m5+ttnC^qgaT{Sou6Nh9yWY7<+iS<VP;5qJ9e?$D_m*C_-gS4k
zt*g-hGPj`y6+*zT6l5@vnamKQh#H}UpcwdLpdln+fr)^Eh8PoO@H$rX55gZ_a`(Q^
z`#!(t`8{7Z6j;5ocy{G%2!e`z&7M|mt<AqCqxSs?+PPC(DpYSsT_Z)+URDN>i<cq*
z_9fW$pcSxuU)L$n2toQDAsA9a{#7(5CCqGI$DB$eH8cb@u1F<Wt^=rW1gsZC2Xgz1
zuMt?_9Y~wakNcAhhzZSU8LUaK4sz)Zj^dFO&%uo;S~HLUDhsC)ouWdg9LSViTHEK3
zF$A7cQ9B&S15zP>0A?f^z&3LO%Hf0+CMh#vYal6dIc(8n47Xzz9K|WxR!`#=c=|y!
zZ!#aHTRlzFzBI{!#8fp&V_0u*uerD0EXnIJf}$u4w_p|vs%fA~pQy4aR8(pT7Cb=V
zWFe^vk_hK5vJt6Ubs!qk2O%Vqe*Z(mqB5N*EoE4WO=5%@#}bKrTvOVL+6w-q@knhY
z*p~!YD^R3vnbYbKtto)D+&$h=UQuI1KQ9YfQP@t8#C0ctsQNq(M7uHb0#93_5e`J6
zEXoliKq<mXqIR6Z(I{cJ^HIRplQ>?m^C&z?P+kkexV@y6AqcOPVsL8{!?^5(*G<|y
z_5#)?Dk>{-px|53d{1LtkHylA3|Li?gOb!)=z>5@QY9rOC1Hk{sybZPCWyS$t1Qcx
z=|R*UAPYT!Z<3`1Je6l!cm#(A*2Xnh?Hp=rz-_24Vr8}XaT2Ahq!u}AVJ+4uGL7f|
zZ~ici6qaw6|1?kGNbAV__TeaK!oy(#qBcRYHY%SEf3qEebVi@Y6--@-Oy0l0;&@oM
zJX@EJf~Mx7XG-qR%)Rv20$=sB-s+<H(Cf~N#_l(ll&o2BbyYAKz)RkR#;B5_K)k%P
zY|qh(p-Z~#Y5gym6nx&9>zL7X%SjFD2XBrIk`QsvX|F3C1Y?8W>AQ?yR%hpA%TiZA
z%EYfvWZdwR$7?X-3(QkRLr@nn|HhWxapAX23p`Qdu3i*G{ndt+Y<um<nPYF=IWUn)
z$9nc3j%BvIV$IB4JlwzZ+`{oyQE*x}+B$LrE{!c|F`G86{VJ#gst)gR38nq?ue*QV
zw!h|w%PTkhxTASsp)pdG(!a4~aj<{<j;{T(fAiB)?a9f3cU-oj_YJw?=E=3X^sY=i
z9M+G|Jvi}6Wvsr;aCf6!xAlT)q|!L@LFGFBUWfB&`Oqap_E2bi%zZ5!CW4s1B_6nP
zbLsZcx!Gl*@x9J#<(YU@ti8L@kgI5(TnA6MbBgOkIBX2g^LM-$==-DM+Z~2nW9{dS
zBjx&_zv{rN+pc8VoENudF@3~UXJ($bJ#cXN<uhe-uJ<>fp0f)P)9@wdxwE6Q?#&u~
z?-cXek)DytBY)ESYL<k|d$WI+5AHAakfydBq9M0Pe@^jYcSY#;V;gU^eAqT8W4S)>
z`;!AED0E_0e9xibaXfA}oj)Ajr*@hyzFpPHq@fu`==8q!WZ<(6oAZBOpLezAV|RGd
EKOxf%w*UYD

diff --git a/OsmAnd/res/drawable-mdpi/map_compass.png b/OsmAnd/res/drawable-mdpi/map_compass.png
deleted file mode 100644
index 82ee8e66f6a0a949f64e93fd0717c1c1a6a26996..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1338
zcmbVMU2NM_6m~nBRjpcOrK;LZgNwt)R@J|W6WeRnWN}KPEp13s8U~y2&vj$9wo}_(
z(!Q{4Z0a;=urY}-34w$JdqSw4)*+AvqMI~$;bB7vBs5h#F!3<T6QGK6(>8^NY7bbl
z?>+aP@0{=a`CMl3`Ie@gO&Er?qz0rcT05(6qYr%_l%jv2rOQj^y<uDTO0om7xMnL5
zq)d4XW}&Q2Pu_*S7`E+%k;{Ae^bt|DO;WDvkY%%o&=}U+S1!uxIP`!5#|$fqKl<zz
z4h$`dk8)``T};4&F)-u6;hDjlIy0^c8s2vh^p-_rz=WO*%I1XSisdN2W>-Y}>M@0b
zH5G3>im#K(r!yd7I}mVWm{4gZ1R?^-aN&p$=>aT~DVnEPnxF-d3yL%gHXa;#b2MGd
zO8pzYkQBuWo>vqps#GeGr66fLV-zC@0!6bF%MwU~aHlO#E)$j;s9BJpt2#!}Gi(b~
zEy{{L<wbGCbUg&Km`-mRw%m<Gp_EZ&xkxc2O_^pjt~G7f%ff$YY^m+$ri+luLf4*h
zR8$W=Py?gfJ>F4O5wQ`690L_ao{(&H%7m7elA<`eAvHr2SzS?~qRWKJL?9tBp$Ng#
z0!`=)&uco=f)Sdo+1U!uNHiac$N2;wk26d%bcp5nL^8zF;Y1`DNwPI;%5pu~Qen-v
zfqZXZBag+32?xra?c{8GqSghOg6-LE!7hSCVy)_6->6|}cFEmeEz^3`5_F6cQ0sSW
z6RhP~G`8TNg@ZvwWy1s$;uIoChfos2vW|L7QM53}1v!?(H}Km3%^!tGQPpPoPxI7{
zP)Am`o1=h)&0&HTnji;_iasABF|6)rN{Z*oKPW4!t9{#ux@Pj+*o*r2uOF*i>6$IQ
ze|TW`f#lVOJoco&6n}Uuw(>?ky?Cks!k7{T7xvs9S;Sg_)xQ);+`gvA!~Smq%do<~
zceJCiev<20ZUP-2o^2S(9R9X~wVqGSVeLIa`RDnQ`AS=JV{-2S|H7s5N?piktG^hV
zIC7!kUFpt_K#nj3;pJDZ?)bXbxA+}@dACp5_2!;m@BS9=y3T)6zZC2Fy)N_BYU2K-
zi7y+#aUWdx;Lnal>-5|xw)~Pa{6dR=6;r0bV7zU}r=-E(seP1x?!hzup)+&4PF~qQ
z`)TFoQ{CZ~*+*}UJPqnH;!wRZ3CPNw^UwNU1DChY65T%q&XkyYZT?@drG<Ol>5pQk
zo7<(&V=JAr&t>Ot`jQ^ecB{3!|Nc&Mf9T=y`lV$1=wJCS`U+>2y*Cc}-VR*1ZeUMz
ZV((DB*H(WF5!Jt0Dmf^9eCX9v{{R^pvPl2{

diff --git a/OsmAnd/res/drawable-mdpi/map_compass_bearing.png b/OsmAnd/res/drawable-mdpi/map_compass_bearing.png
deleted file mode 100644
index 4617da83faa66de840e1540e3664aefb263478ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1326
zcmbVMZA=?w9KY@yW6&uwEo{`}JeZ*2dN1wu+FL8My|Q(&wd+{u)EMsNIk-XZ%H6RR
zJ}eaDg1EWFEg2>=8D9))m?OrRh>2E+if_>m`oZ{NnVP6EaeOdY;wC-?ihdyb;3ap@
z^M9V-|M!2t7t*Oid+PSrAqcW3aahQ}wYl=v*1+%eLiiS3_Sx~Qeaukpf@lIHq8Jju
z5;<`IWPqrQjjVtWf}p3g-mINXKEcaI&LdVZo?<Q!wGkxLRm_X>5U?=`3}|{7|6}n3
z9MhCA-p3}XWIhH4wZr2kI5wW@mB)wVpn`Wjj)jUmB*+0<#EQ9L-QtU3e4Uqv`^qti
zW9txmD2#77l})Cxm|+5p_4o;yqJ0<_^w6xI3v!(p17(s5kPJmoL7w&U6oYL(IJ9Oe
zDxVR0Hf=#Ej1Ss&o+rsdq2MWaJ%%|z(!pSmq!^N62#6r8G2Ir6gl@G~83bU-rk1xg
zL&qwNqGXKPVH|q85kfAXOl}eD)@Gt$%E+RaCut8w=5m#|*3p)o0sp$OE!yfG%L6h4
zEMwG^VLjB=sxr*o-3?WM&>Q|qQ-ehjhXq3(%>ms`2w@!Fcoa?H8C8;jq>6-0bASla
zK8^@bL5fi6KtNG};^io+%Cnt5Ed)4D;QX;bBtp}1UzA}3vA8cl`D2`yi!)W-gl^fQ
zE`zFV4cev!R^Z}2vAgQ>F%yWkVfGrvaJ384gNAKbgGL^U#n!8ib@XYvVic@LD`nb<
zS^%bY3Mf6Mk;B&W%xl~Dp!mIBNoM>6?PDdvOZi|D{GtkbOOg~n%X(Rc#W(ep|C>J&
zIz?8R<v-0+J%Sxs*=~&j6t;#5=x~BeI4Y_6%dH6FNF{_wZ}EHS_S#w(N;vkS=Nw-W
z{gI~Hm8BNN-+jAj>imzHYieWb>H6A<y1AWyD}N#PeT_<F$I~rSZ)FbN`&nt`{^`$O
ze`w`MxBJZU`Fo_XlTW25U6(u4^cz{svAjFGe4&)RxZm{?O1Ha4QgiOO>n1u<GqrGX
zN9%KE8ioAP_R#zQN|Og%6V4`tZZ4_nAun_7?b%Q3KXiA$w6h~}^Uf}G>79d4=QpR%
z{_<O0Y35aT{f$z#@kD?5y*1}+ywmBP`#2H(_GQKKopS3=JGylC!L@Sv`I;l8nO7dD
zkCw9gPGDEvnc8RHcU=79la7Yt-9NW2xUN4|r#nVk8s0@$bD{X|@<(6oo%(b3_m(S-
z%~O5o>VY=)c$%F}UwRW=c(`HFv6_myCZ=yZGFQH|+BW%O`WckaVpqnGcJ{mHFYNkZ
a#{_~R+OMJM@}gi>{$PoCO1K*BpZo`T)Uuxd

diff --git a/OsmAnd/res/drawable-mdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-mdpi/map_compass_bearing_white.png
deleted file mode 100644
index 680be485dd0f2667c1d82a1ddb3a831c8a7204bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1326
zcmbVMU2NM_6n19Tb!`TvgS1<NWZaGxRL4Jw<HSp7(>U8Qk&tDbn!$wXpX=6ZZKt-o
zq<xs0BBnAnCb3B?5=iR{Dxi&32q94rgjPWL=K&rN57Ph%5EAPH(j+#@P1_V6sy$%I
zzW3aFzH`3w=VvqN{X6P**C7b9BY8l`!nL{b*4Du9wL<hJTy{B$oO9Szoq}iqB&L`W
zz>>N+0J1<-#zvMv1VPXfT5rzDr5@vDQ}>A#9bZw;Lo|X!x{7&G9s&*~fdS2k;(yG)
zk7Jq=#rxP4mCDD#pmt!~0*A-bz4G{w99HnIN3lqehX!=uh*(h{Hf+8a#aHd}a9=ql
zacot^8H(a-q;jbY7B?+`vA!T7Q*;31!akY}a$&9$W1vh@A(Ej8D$KKfo?@`|2Z!D)
zMdh=?zI9(visFNgljljYP$>8cexGR#kaRd4CMkww7y@b#_L$*_MZ&OKs}=-c%a)dR
zG}FK;7DdS%b)q<Ax)y?-Po*{t8}@plV9Lm%m?vo;Me2Gbu2pT@$%21rY^rVdj^zQF
z1-3bA$*>-3YZVN0cV|ZxMaYJK+|poC#9_gdM|EI0Ng;~E8=s;nJfli7kW`V7X$}x!
zI=~SjDohb79SSKbQ2ZQ4Rqbqsr-cy530y25ip6L;5$IvqP&^R`QNcLp=Mqd6n>1`k
zG-OcqtwG=G*zg^(eB1(}V_LnYIb7|6%%JI*_Mn-^;_=n0V;y~(p_m2x;Yyj-q85Oq
zodC){%ha*eJoDNn9F(BnFUd@hpaZN#_^AL)LQqs;Z%L98WLZDUu=qM&`M>!iAt|!b
zEdObq>JjY7%64NEps+Daz<?8E!BIK(UdvYq;z}olSa0!r>DJ0h7fQHxqGw%S5dE>H
z+NFgSCD?tdY3kgM*{f<}>&g1siMrXXe=C0>_k4{?WXF>&Q*UJV-u-E5`rgx@z52k?
z!EW!V#dCK_W5=J!OnP4G%+RmpFxTSt+~WCC?!s=*Pbl5)8A;E26P_FBNX^vT@hz=S
zpK28HhuR~T2T+>a<C$<bA#`&|RrmXut8dPHQvZRs`}wUMu^YFyp$l*Ab-TYgdFGej
z>Ppiud+V>4a*ap(%kQkXU*X+u@9am(o^M}JT;C}-Z?~fhXYOAqm!GLQSekzEzWSb0
zZr4%liZ@&P)Vr<=pMTuZaHRX^wmHwWN9qjMNK3=p=&~M3Y%hQK<<6-;XMS(F)Yv@L
zhc54FV~=Fmnasu4(YXg3=3UF_9?!(->krMAFD|!DK9@O$5?cJy_@T~z@8$E`e%LaB
YposQs<aBvnuq%JCWFjqG>FJ;R2cng-&j0`b

diff --git a/OsmAnd/res/drawable-mdpi/map_compass_niu.png b/OsmAnd/res/drawable-mdpi/map_compass_niu.png
deleted file mode 100644
index 5207161498d702be60ecbe7068518b5430ffdcfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1225
zcmbVMTWs4@7<N|L!b+t`<1(f_96ZD>%<(ObW2;$7?UV&IZAdc~5TN;T+?durp6xbn
z-`XP44bY%GAkctKLqec|xCt>3AhCd$gc!;mV7!2)3B+D_9TH+3r%BmEwFfNO=ltjV
z-+%f3|M!vd_ydERw{0c}Vz9Vht>ATQ{NCJ$zrQweSMhRJSg3`Q$O;>p4~e{qbO?%$
zHU%qCGv^PVgF^(-GiO(8VXZVK8^}p%u}&&-Jd7rYq2b8WjA<AG9ZuP9j{NhpFG*mV
zIr5-TVoII@>-PQyA5JceSB-^fLo&(XePAe(u>l8$8i<@3H;|(o*|sa=eSA!lpsf;4
z=g767YNawzkPm^7%1{QwrhzD>SRo@y;$FaEnP##y$54zU3%ty5p!1N}n{QfjMIG(<
z!cvZ`hoL9abfeKoHTV?rr)XA^B%0x9j-#*!70kP#7Ex}nqiaEhf#KU;Xd@TI7BwBs
zhB*>Px|V|Dl}hV|-JnAhri_j>k7iR0?Kp8>ZS5ee!2iP7P&=s3dyuZc0L}Uau7|aw
z3&z~t*io#Aqmd_k8y7{JQIRq0KsPL^ITGKbOxu(>OE;iyX_Uc=kdoN6NM#v`p)59=
zH7#iJBExj;Y=mc3K@|(5f|AYWS+<ZK;e@PGNN1UhBJyH^>tc&;5NfUgyS{DgyMs;N
z5GyM_)I#J}5t`|CLAj1X6x5Li6s28tu<M}hny3-%j?1)`wF-TE4w|DrazLAB+1?-q
zGsE+`!DT2mE$9@_q%jE@&BDE<>t;p}c!3kh4&MB~{LwflI&PNhnx}h&J2Kv`j{+9f
zhY7lPf_ywG=DA;5c+CDNs`+a4v;OzBYr{QMVoT3+iGjO&&!7J8`7@{QAG&>oU%X0>
zm9PA?`|ZC@+`2Nkm_2q!{*At-P@dzH_dRrB(<pdtu(`dwPfVU)Iy(9F(rw^lWlPX^
z>7FNR;Fjj&*~_2i50Aao`{H7ac=|X<PMqBJ@}~T^KYU-mc&T;bgPWc@yBG<tq(3?S
z$g!Qm3#((lC*Hr8T3+d2`7y!L@9d2Ro7>8-Gp(<dw$>B<4<0Cd^xmO6lj6w5S8IOe
zz^XlvME$x2o+u0q{G%*iNhF`Su;<k0%io-xc=Wf+A2uJBpH;qSy?LgWNc0iV+_~D?
S^Vm!A&!t!xSKl2uwDd2Ff03>L

diff --git a/OsmAnd/res/drawable-mdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-mdpi/map_compass_niu_white.png
deleted file mode 100644
index e88b091f950a6731b6d09443ecac34414d444cfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1230
zcmbVMPi)&%7<ZQ{RLwdvItkdxav5949RG<O$5um=#pxD}bR~_nunn|l`=v3h{ao8^
z(uzaFglI3*hJ*kC10iu(hmg>iGz1c8ijZgvCnO{eXbOjkF#*RSO)Af6QaDsQV99>(
zd++!A{(oMX7(X%4f3Tk*h=Ke`wTRazg10Y>zjtb>O}sqm=gR&hs`xeFLLy@z4U%~a
zOu-@q#=`7(aD*U2^Jb~+mkZA+I<jIQz{Kj7gV_WzGFo?lJ`H_RgHxuRqW=8yYl<|D
z6m>={umvXztLDi?7fvpYm-NMHT{fuEXUUPef)!ZM2V~uvu|1`pqS|^Dybq2Uiflvt
z=@hl?RJkxgW|0d?F_xfpmJ>)xj&Wi_lBHuLk7b5UGCWJOvLeP6mM1$8g{`?pMJcLd
z9a~sRQB~h}6o#qQYOz{8hTJKJlVzD<d4}g{jG(;*+Xr>p_J+C|ROsoh>G&qH$v`8}
z(43#5u&3K0SWcm^quBO3iNYyk>cC;R7|U2z5LX-R`9=7z8@r;t(t-n-BJ|LltK)i9
zhPq^&yN4SJfY=-5v}@v`fEg9(a~8Dyyqco$P0TP2g|BEj)GC11ISJA-CrEUXm07yN
zC6h)48gYqbyLxuxOX^sTjmP6TNyu_sPB<>InM|C|3UVTz923<pH*b4BuyxqAZDQLU
zF8@%jl64{Qky}D&rrQM*RpcYDiX1YVZC9N<a>ld`RP%;|GHpk#Lf4#!#+ZvNvYlte
z+{K3k5cPzR)M+uninOQ+0LRZtv@A$Ca=-&#s8Aig@qhEjV5gX%S^m>J-6PzQ!FFd9
zu&^^s(8d$w;!(Nx?!9Yx%>Kx$nNs~{?ZMX8Xo&9lb?Mw+8*6*tS?_O7Hj;zOTeo{Z
zzV!a>YagtrkG$D4do+4?|MkX!$d606!fSR|JM{9|Z~B@y8gGZz?uJ`0Ow6v9FYjs2
zSG6C~@2LZkry92+ub-EWTpGT4fsaP+TpsLg4Q~oJq9D_E=<lVK#<xo!K6>@^)qU$L
zpQXR*EgU>{__f30mDa^C()ZPMQVX@_(x04qCNfWOqfvD6=@(beMSGfWHOk@TpF-T@
zH|fp3=1b`Z2bRBY)MfgO-v-Hj;TB5YKXLsP=dtCXE5C=%8lM-^=Q&|@<M{}&XD{)~
Wun10VeB=jzn0#(r{q*>SSN{Q_<doO|

diff --git a/OsmAnd/res/drawable-mdpi/map_compass_white.png b/OsmAnd/res/drawable-mdpi/map_compass_white.png
deleted file mode 100644
index c7adab646f798a514e14a0a65b2b259514c1e18f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1341
zcmbVMU2NM_6n0znM=dR(>&m)^>EZxoRsEOPNo*RLEKX>&rHit33rwr<&vk2B+o|m~
zX<ulHfWlCxjlJ*yXb-@ikk}-Kw22|nm2H67Lx&KE2~|@?#U!-1O{yq2X;XNp_JAe(
z-gEEy&iT%t-%by{*xJ0e8N;yF<baq#>z?x4)PTOf7s3zF(&ff;?h#9K3z7}7sA|a&
zBn@c<W}u`_Puzfg7*;o>XLD{Ybx2SwgOtiTWYNeYG=}x{7xR)b23;V-5#0>qe_g(c
z16>W{$G8-o%E#cSJ}_g$BQt|pWoAs_RlNTN&{q_Y0Ry@cC>rCYBNW4U#jb$%<zos5
z6%}_ZjBk?4rP3f~*${AKfKX_L1wo!<xImB(_5vT0DLO>?XoBVi&M(kDu=U``o2_a>
zMoet^LQ)tXb=|x`QH4T*Eci*w9-$bX=PBAp`FsS@Ae?E_m5PMvc&ipf=qR?HcXi7I
zWs8z*O}b$mG2INo$fr`<hD~QHQ7C0pQOZ*cNmGVVj;o^WxEc5_jUBa}>~tPd8R%G(
zwu0)Rd8=TQyGJ`JD<U?+VOvK<k;X+!nKYp3CdDw0Zb(&E1)nA>P}U?uVS<q088%3S
zXr3lCCKOUNsQQC6UA40lJ}4&QwBMJA2iX|I#MuKJ9gX^ZF_sVbLkUi-Vw0xhN~Qv<
zzIEh#3mbnVR*2b9axFV+S>x3%NRL{s<&0W+5Q|l+4xT%vo2pfC_Ls}F8MO#)eF~}x
z+cH2U&w{=Khk(Q>0XC!%T!7{XPG%((KOH1^Hi#mZe3FmV@GZRhfAdEnQdGHF{?k0w
zBh-=Q?e-`jVSAXMi6+QKqtZRR?@tV?Igu2j+2Swq`o>0o9Z};YTRwd0eQDQJy{v&d
zCGx4sdmTre+(7=ZU7kX8?L=h#R4%nRHwprn90m)|TpL=%+JKo@3C6CS*P;Q>ci#K3
z6#D4p&ZgQ4uJe8~==|i(`l0l}TP3XRWby*m(aRU_UYyO9+FP39&pz+DbY`qn!|Ls|
zrz7Ks7V19`m!9xu37voV@b22X=~V`Nv2^Yp?fG@K_cZ=ZBfPcpb@P1P=hqt}ts9RI
z9lTKg<ZQ9)>~9OJ$32%@Zw}Wij@(GaxyX9m{OwYxKH1kb&y^l@pSu#dKKE9nZ}&|T
zllOtuhLxG~KeOPgQ$J$zJ7a0#aIHK6$kNiur#-KMvyJma&mHd@1!lS3^9QzaX}Kr$
zY2@{m4)IE4eb0P%=HizPahGVn+SZe}z1P^!t_|0&#1~)1KOX$M@rU&Hi$8r^JidFm
a7OQE%W{*Zn+Iy+WA1xUl6hAxg%G^Kl6uDXe

diff --git a/OsmAnd/res/drawable-xhdpi/map_compass.png b/OsmAnd/res/drawable-xhdpi/map_compass.png
deleted file mode 100644
index d953bc4d09683a510c7112c300f74478cd29ec95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1693
zcmbVNYfuwc6b?^;jEW#AI*!W{<)NGGCgip93P~_QLJ`seR)kG<Lv|q9nB9;7ij<a?
z$CS1xsFhb~>(J6s)E1d>)KIOqQw4P>RxK^osV}rJI-|AiNH++!KOBE_XLj#B_nz-O
zzH`oOeOBiB`9aHqI2_J=twxp2uCV6~@Mpid-cR0Pmk36k$K+5Z#);Vpjsm9)1faEG
z#Y8rN;pJPuBN8|qpE6RP$K>fUP$OmGV;&v8%VJ~E98N;A%Z3?C2nH|^#iTV6oIG|C
z1V}s)%oXckolQxYNlk^F$f?NG8!JkTavV%f0uo#(YrsM<7~ry$T4~gk2+r6=*}dmj
z00J{AOi3d6ET}wP7NDf;1R&;1AR~;#15!C35lf_U=~_U@$^uv>5W)~FN5vu(76P*m
z$a=HmCNx`>HtUO(5<xS=*ieDM>2&g)B0gm=79euDTmTCNLLtOzKy<m4!Ca7)j+(Qe
zB50$Xv@s-Q1w0lp1La^6K{nE7DOhYe-E+fMdX^}bGJy-T2@pOkuvk2K&1ln1Ht}y5
zFVv>><u*c)P0*CXZe;6Wikbtn+`Zh9N0E&NeZ@|)MZro{l+j@!tc+Hb2(mYPoWxO~
z$zUW5CJZtnQUa1A@lr?z%VEfb$Yi*Qz(rCRp0o2Jyjm8ol(HzLOd&@Qb-YZ8uoNP~
zRJJAxwNN^T)mmu=vl@vx-z4jM7Atuv7FF5_jG^p$iYlG!f-Ez|P_&t{0ZQde)q$8?
z(uz|~I@VLBXIZNVJ6T5HX?Ds2%<znoFNgt`h(rdXPy!+GVgn?C<5?0Un2GHzg8`R_
z#Uim#49?>5|I43%4NBl?mj5)*+!5Q6p6&BdV1?(yL|EAgva_Rdf8+K74#)erR;AFp
zuHO4lr+HPe`0QjQx&MRwgpf7CpVl_>L*nX~C3W0IVDM>OUSq~ckY93TYj=p&9MEl5
znM3Q>4AycLUw75=pzcj|eqd_QvZ{h<pY==6l%H@GJ|1d+W5M539dz-)<nS>OJyh;r
zdaXaBzl#`HC2OCW7@Z$|s<3)AZ(d>BzRP!)$M{3zP4x$}ILswS^pmu}0dCOkKhYSG
z)*W~uGM}r+@zvLCjw}n)?*Ybn=0@A3Tr*POR=yv0eT$^$QhrL1xk0!;f;SP@<&Uc(
z=s^8M%=lV!-PY15%?~<vjxFiTp~$R*JFB@}L)Y7)c`B~gy%yOGTju9)<__g}?H>GC
zb}MPW`hG8`HLkOPwhAr1Cjtk&f1kebu=jTLLv@O*qej!GN=J5azn%9R|NdKHyY9t?
zO<np%#M9jA7kWt*pM5XSj|fXj_hrgA*Hm0<>B&q!>=>@;mUW!JId;=$<>Ku=zy4gH
zSrHKZ8o1514_%t>yUllJ>N)ML$dr8?Dzs=zOZBNxSLZ`+Pw1k?F`vt_9n*V+BO)*E
zczf_fSCi^X@se=Ejq%2n(a1W5Q=YsV4Y`Ph%iB&yE&3$GErsJwU+ob^9^qZ!pH6c-
zlaFldUpj5C3U{o=A8~N|(^ec=v!u`0zcw$_5#w41U0MB04Y4Bbu(faSNyNxU!Rx~B
zw4Gc~!NkVqx|c_ernCo{$mR!!7JhMeq{ZboD(iH_bX*kwRoQgxY|<YkV^`yLq#O+H
z^(${~QVWi!ZVD_KU06jYP3X^E@J@>FH_!Vi!#K9MFIM}Nvbl}ikn45sZTE1%<Em=x
zC^zt^U+L@XceG#6d2hv-AH3YBu=YoAm8CV%`w{QXp*>Y4Q1z9{sl5l1Hx3&1^4vGm
vhfNRO4RMz?96nDj?8N+@P9JR;E(6@0!6Hl8hT&Dio*#x*ovAvIT2%875i@3n

diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_bearing.png b/OsmAnd/res/drawable-xhdpi/map_compass_bearing.png
deleted file mode 100644
index ef302192a36fad15e33cc1e3571cd9dbe751b2b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1690
zcmbVNYfuwc6plO;L1h5Nswhj;f{$c3FOn?8x_LoFFhVG3p~EKGkQ6o>cNYj0l^Bsy
zP^wr5upNWbI#!F1%G4>S_-Jc^DKerWR12*d_`!&!bV{{IHwd;r9Dj6YcJDp+p2v5-
zbIxqJHYskd|6+d@i#1mhuS{lE$n*NmWWH%$f0Z%IB3hMBrw}H(03|UNVkGn!puy2>
zEEz+Mh1*)OSQg7W-=a&W(-Sws1_I}z9v!Y7w=vc%R_t4L8*0eGXh4r;TdXqnaB~YA
zuoz|RG*KdyXj5QjOMDTDr4%LU3`IExsgeEGIv~~#GY)W!MgcpXYo%bjj6LZWX7-+A
zkPS?#&^a>p3sC8aT0lXN7$D+Ca|{qq2#BRzo+w%@6|V*Oj0{2&kPmSnDJ&Ae5FeO&
z*i1CiXo8cK>Zw?aBx9Rt+6IGQK|ukxK)@x)Y>+3FN<oMZ^7$M_gF_WsY1GcKQp=}3
zC^5=FT5Pn1umT>BsGi89Wo!oNixhBMV&Y53R%(hUhBDBO+CUx`0&(1v*Q7Q@Cu9G@
zc%?R_E3{!?GDZ=3q=Bi2Y5BA<!`<rxc@!Bm@Fvp26a~#y5{5h+v(g%+jLqC|jTR%!
zH|Y(S-h^@tJTb<R@`PfJ1d>7=6Hg*BnlPh43_;U=US+S6sCkG)Ay-HcDUYWTN)$YX
zLLOhv)C5uS#nZMLD@CJL12!Go!o*fd5QRd{7r)jPR*)D<6QqtHa;LjMYbI!dG7~mH
zp_r^X5S3=J8i@jGm8VQEvQ}cGB_A`YNdgBZd4?^oz+j9P2=oSiG>0b?={W*O$dC|?
znwZ|w>y6POkwC;3v8U{f|Cc|I0R?)R<v-0ceZ+L6XZvy#7~$nGVOC~>NM=-?6&EzH
zSYAyUC8D$U4%N0NEZ7`&edqO@w#14-NBN5T30GA`)r*67EeVoW@ON3qKJcqAlWlA;
zf6QTTLmTn^508ZgJ)ePx6n#@MRNo%D4arTd>~pr5zp9mHyF2d1D1LVazH90Ta|@_t
zEqzgQuDPP(W~*ZLj&$HgRH|sO>ENF$T6`b7yRMv@y}41`$x<UJy0T8ciHkuh#~evp
zOANC8md~Dz<LyXn*h<INk23Ry=7(49zMQHxo&9yL8p#q!a;T(beZl#T3fEP4M(~{7
zTU@~z+D2*Mozm3)u)D|2=VpwSZFW^go=(b`@dynWoGGfqPa>OYd^Xr0kRjc92U_K`
z!)E1iPxnMr-#_D5X}@5t>8d>H-{=^3-^;w2KRB$;sovR9s|U^C*Cmg-hGX80y2$A~
zKTuJ!R=2ew>B}pl7xL9wRdP>UfSG%!1g}5v&WaPgyK(WFc)#IspH<o$r5|FkHNwFG
z@aXsVl}j7iF3odhmWJ9gkaZm)vcj_?2=G%xR5dx&PF;DB>N*rK|9Z_1jZlzqFdn!T
z(-0OHiJZ`SIpOBxe-AyiwYiAC@;hm(pN;CC*n@1V)1Q}r9<F>)^|sro9(9~>`En`r
z=u#>`S#>05JCHz5^hW58bf;~vtuFn+YhV;n?HiDHTxfpw$IPeRmkPUmtCl!OuF^lq
zyXo4kz3T%PvaRxY=QYsqNK=EWdy~UwAprljpwi*Yib;EKRmb7SPH+eJc9U0TM#<gp
zvTcFFksmkoq>*dJF0L$DbgK7eKkNL&!_MqFvG|d@KI4nr<e#Nabll+nz3mYrb^FI3
zdq<8%+}`rpnv`R+e$lu-4G3HmKDKA&aB<xkqV{lBU`0Itlm1pE0f#%5_s{Da&Aoi`
y#{2H*yRF2rF3tLHCnERxdb%fc?6mJ8-#1u2mg2_d;*>3(zlBDXq&y|h+Vu~Q)_$G<

diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-xhdpi/map_compass_bearing_white.png
deleted file mode 100644
index d8d2dd9fa73b5a38dcc41b3d7a8ac89cd8ad0515..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1690
zcmbVNYfuwc6plO;L1h5Nswhj;f{$c3?_?p?B@c)QMhFEhbl4;tlEP-=?gD}OAV#DV
zlq%K%Y{%fVj@9C$(mDkdU#$hE$cTziEwpOj2P2l!Db*s~AlUwJ{L!7+z4zREzVrCb
zIkRQjq`2As3;kIv)@)6@GMQN+&+9jx`KEdORmv<2XjM9$LYU|Rl*Cwwk<ep+21m28
zWDGSHZfU_{SS;^+i!Pl`Ph1Zh2%L+0bhvih#-LfOn78aU)R2SGfF8@XSmo@Yre-!^
zG0NF#qC_asrohaW_#zTZDN52AigFAxBm1p2K#Uz`4B!}z0(LytO2KwHd%`Zv>^;XI
z8<<d`bL8w7L8T{Z0R=%~fQT#R7$BYykjS_^kys*=tOodu3_?<n4{;zFEE2#FADDdD
zj5pF~f|Hf%Nnea4XPar-27_QhK>@cwz$M6RkSCMLK!^|W`5Z=rLls(S)XuR|OQ$R-
zG0H$%Y_x^20v?N~p2(x+Y$nndDd4um#FvJx)Fe?1WuP6kfjlk*;<zWT32ll_#{LcC
zmD-f9(1wA@7)9if2BsdSrBh&ryVpDNC^FH&8%PUN6f{>!81it;N^6vIHgm%@T8uE?
zq&HxC6Us60Bp64=6G}KzNCt6CJgL-Z!i)k51Wnm_6<#G(^AM>*t&k!z9#18dDtHWq
zJbo-w6GX+AOkp)vibkylY|6KV@jZ!Ey%q~ANDQS3Qb!QEQ(d4n6Es1Y2^*kLOjI3+
zO0!svL;<zJQ>GVLD>2fNj~Ue@fddmf!<JXXU=#}kdIMj~;R!{0jsOxeB#2QH(_4DI
zQ7jS(M0^o@5^wy!{DDkRpr={>(>zm0Oh<aQFGqn9UJesxWhRJZM&;Vq*Y>hlUX2<h
zqO<o5*0d$e+Zc9z$Mu}n#PR`0*|PfyS5!q+3xjtq3W_b~@3fA7;8#~FUte$jn8V(J
zHsJdn9t{n8J`E2k`nG(qt}S#6lABu5>uffERU^xGx8I9a{O$~V*VG>77Enu?d!uGu
zbw$O^RK@5W>A;PsRM9}=fj^fu`#yGeUOqc>V}qoFrAAV8r5%3b7lKrdS<=?#Xk^<h
zpWW-n+K`yA<&MoCW#$de4X@mFDOGDa^XqIik|mJlP)SRAgYzBbt}E`0;90vixq>sa
z4YI&HC8>R3caNFRP8%uR=&Fc3m6S2<5gIZuT~v#oKsHqStg}BLL%Q<zx5Um2n~}#o
z)g4iF|FmC){k*lhv*L(<gJaBnFY{*pz>qqpYDasG9yEjB6hG=5iheWd0;l6#e|hn0
z-RAnFFE5Xr&sS?z$=z`QX70gayl($H%Z~T#!X>NX{f5STR%maOe2B$V3kUkaBj4Xw
zF0OCAILDb;5^Bpp*0hJn3(pKAz)ulTRpekBb@@T6>tMj#>($#eLP5fTc;ISueOO#1
za$M`>gqx22J^0kt>LPl}?xd}JHlllC53;RHe_r-^xbi{e+is_N#Bto^%camGi>Ux*
z<>8!dKms}56QMiYmA0*>s^kZ+{t-mAw?DT1eABZ(ra$$*SlH!TxyV6smHt8AjaP5&
zSsOT?ZH=9CP6G`MH`cqlHaL9d1MqM2Djd$N=(P7%v>$rx1h;c<H+p4e6yN<W+ZHGs
z{&8J*8o6rp!t&w;Cwp%8vCfS@?8vT_NFKTCGQP-7{#o`!#|`e=(-tvYyKn5VcjRcq
z?M<JpN;x{?7me%FfWQUeqq~<6ZLK{`)EvqRERW}Z($}IS;Bd#%zB#=kxtC7dc;79)
u+d>@e)U3TW9=X@o(><Z1r+g3kzQO9YY;9=TnzG6Bx6r7PlqX}ecK!oE0e;v3

diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_niu.png b/OsmAnd/res/drawable-xhdpi/map_compass_niu.png
deleted file mode 100644
index 05f8351357ebd657d2ecf06776ffceb57782ccd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1421
zcmbVMeM}o=7(ZyFj?XTlfvN0G$FePWy^qqbqm`Dnj1r0+G=j@wxa+;89kf@jM_Za0
z=*WN>w&{pVwh%-Y6EsYt!D!;*$ZVD{$7GY3WzndZ7(#{!bMqrOd<zu)gX|A4xqIK|
zeV^a+@q3=<PPpn1=4J27#xN|;QDbXBE17y9&qCj(%s>0lQY_h<rAEOkMOhJI7GB^W
za0J*^*Z^6+t78fpF-#WmyPKtEXC31a0xCA8qlyJW2#sOJ%2<f?v_T1Qu+<+lDVILG
ztOS1Eq-@eSNoU9keg2xb2pi+|Zcn_;W8jsQ&jVwOK?VX)VnHm>9t<-vlXBfIgZ8Oo
zLJ8JYq&AasBdBJl3s?ma0*y+Gdq}Dr=nN`KqtzL7&jA|A1gR%z5+@CeM$M2k*nE`8
zo5*{a23z%}FC>|iK1m8O1QCr!RZ+D{5L*e#U@#CQP0%!sH1Kd&P-0_vFuW&i!3M(~
z(I1lhLJ*`ZvYgN<nUpBfjT8bQr*q42FuX|=qKt^KA%aqoL?DpLYh61mHNbzv*j792
z?g~Mo0fvQ6(Sz#Y-IE3*?jG$ZrHG<oUJ(7LC~Uh;@N@=XP;%HzN_3;*{X9c^IS=H#
zEbgIn5I0ceI$Td0NZd>5^}HAIY8^?Y?QDm)>n&Dm6-`?876V1u%k@?YQAp8Ms3sOW
ztxIDa!LY;zJuvOtk9==nsp>~!8LJ3cNf6zF(4OuBmrsy{uulj9t98BVV1JW8$P3Z%
zfmE3`vbI6dAAx+eC<MSd&y0VY7<jE(&3R}oPL*poTuqiE611!r^%lqRT8&1np*6})
zJpX_BBT!I8s#*TiJn19Uk*V$0C?H{Lm|zf1kcdX*;rOL@Ff8Mu!)9^E?r^JXYn5NP
zvg&fJ&kV*}Ml*8uo`3VDb3YFKjLp4k9?nj#g$|ryB1dPgnq`W886Cg4>Z-1qkL1En
zGCy2#tzcz}uPn7A-<pk24;1&mD!-PvjXAIH9QeBLn0%t=)2#j@I>ncH-U8A(lwXnG
z_447;y+`9fK7j8S>*zgO*Ly=&J9DeAXeK8~_fE-1OR1d0cNDTe-dd2Kl$#w_&e=>O
z=3%nP2p&tC_=QCoH<frWDS@Xz;|E~kVtMGK0sOjq{+s<jxt3l(R47X%5``5lfB$v=
zf{Cu3>@Hn>V!&B5d#`)c)RTL=C-&sT+q*t`g|mYZ-E75u%S_*Qua&$pe>_swKQ5m?
zyL)Ug@x9M^*I=ENee7FRfEy*XCG(kci_I&&H(kq<-M)&o;xk1R_&pg;FPDK+S#y_b
zxNEa_kKepd$Y4p_$Fb&NjoXN2PP<Nz{(hxzQ2wxL=vLdrD#;rsvFYo}v%b!Jz8iCo
zM+#s;59Yh{ThjFa8#}RcM{=qEJ-PXZ48^|Fr)mcy3kOZ)LgG-tV7%u%1}3r32djr)
Te72=N^@DWS>uv8>wH*5gFMjYp

diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-xhdpi/map_compass_niu_white.png
deleted file mode 100644
index b77d248b8e5cf252052bfeff652c3a7d61589325..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1421
zcmbVMeM}o=7(Xad2JOJ8OQ#DQ2e{$9-d(x&+Ow5HKei%;4#;53LUz4-OAEADt_Lms
zWAb4J+r(rpG1)@c$fBajW|l0@M3*hIBjBcM+?)g#qiA$4>I`PMB}9A+6#awj4==fU
z-{*aw-}C&QuRG+a+o8^VHWxt<wQHxn0j^}~&B=z}=FCS!aM>(7TI5F2Cr3F6AXS3s
z1*j{?wSfk}3B6s@z>FY@o<LKJ+~Tffc`>NvQaajLFbvTMVy=vZIlcqPs28*aLKf`)
z$CofPAXu<wy_<B0ZNMMc8J9p~ysn9lckm_wt9%(X$5?0}2xJb81v^6#HfF(=?Xqy6
zIwml5Sw-%!U@N3r+#b{>N&wYs4LDCyG|HH?l-|IYm={qUlnK&E=t!J2vHA*@)S;^n
z2E9pwk8Q9!SA9Xrg85}R%o0R28r4QCw4&5TP$rX!Aa#UJheHiK(i@Vw7#@n0q%GJ%
zgqH$gIUt76lts=fcFPtFGF=HF7<RkY42L4CiGnF3VqBP@v?LJ>rs7)Gj>rw*UmELb
zN1A%WfM@^_v0LI{J$xl;FwEWK9i<c@8@65wz@l)Sc9HK6f{^U8TQGQ|6#@dQ^LcsT
z^>H{)F#tDFG=m#S6N&pMqfzhyp@JdFw4L?v2CAB*E1U)gL)$3IK^tj<!$CVK%E{;%
z6Xi@}U7?7~g?Nzm9e}=9vHHhiS(^knS(KVYu`}HT9=|Ay5x*ElZMNmAquZJTAwi5r
z%2Q=piP{dNKo1a{k{Cpn^UMa;<G|^818wASy@Ax@dN0kv_(=vg(F}~7({Vc5hppm;
z|C>Jok|I*g@}K5OAHj}HZP!Kt3TwjzLU4j4I4Uok^?r>Y8E0Jfs;1bicX4T{@>5TC
zt;)9L_4xi%8F^(VPVPDW{jr~rx%aH2xrwE4`I~G{dvemMDA=0O^}DCGdeXX21ukTs
zoA=Bk+Y4?~)r{S-nx7lqJakz3S^o^;zW(I!&4UBV^L-y>5A9<LuBm<br0v+omp1mc
z?kz2AkE6<Ae8WW7;9IqWUnpvlUmnyX^AftjX~n5hDsS&>f#Tu#J>`hf>bi2=ZW*(V
zk{UDmM8YE6`%U4U?q9epqnpsi576^x=<tXM{iEpa?QK7J?jPOtw4&|C*xR3c)z)dA
zEjgXFxZ_G?|IBN4%aU?dG1aFYZm!z?e(^V3cW2G@+AcO0Wd&!{zwA2H>c1dO#rr~!
z`ezFtj@(X+RopUrj!fof%>6q4W4{*t_KmVijry7V#i0-XJXw6`+)Z6&5_{@W=A0k>
z`$*|KwV$_YEH&c_>z#q;H)SXG*sdzjr0PLVoamg2eMivc7oFGgZIcRB^7@wgk=;LA
z7nIhk?SFX|ket5BSL#(Dzwd<RsCDtcL>$Q~M7rkhP9*&A9=N4AU8s3*c|tj{0m)P$
X#U0Mkq7Lt?sUM`vQD;9}y?@{z6tL)^

diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_white.png b/OsmAnd/res/drawable-xhdpi/map_compass_white.png
deleted file mode 100644
index 63c12217009fb6d20193b16805d066a334704327..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1695
zcmbVNeM}Q)7%#Q0e7T{3;M8#(#8|PtyV7q!k$y-Gg$fmFWW?+B3JtVZt_Lm36cDDu
zaN;yhD5%@~z)VHs7!Dk|WkY9lZe%LRfas7QnxQg5Bym>+w?B-3?2^0pect!^J<sp?
z%I(x8ub$)ko-c#Jn4?KlrqV0ydA&LGH-q_nJH0HRR0b-IFjG#H#2Kqhgb@ccRx}$=
z#ZgmH{uMly!I)KO(Hkg(Hc5^VRzB*{;k&GM8qHwDu5{T^EElH$Bc5%s#esjdwu6Ah
z6bELAw6NB$z;i5#n@BuuQ?ef0l#9ts;K~(1tV>QCu;LU7xU6|LhujqhPT7^yd(SZh
z0#hnfZXEcEltHTl6a<L_BEFc1!H5u$$oPmzERji;0|HuxU@0Vkd9X|_ik8CyVEO@R
zZ=}gAPgSa?ebG`Jm_t!^IRrVKPQEjmPmtLVB9qA=SO5tGJX(Y2D6&zgi)V90%vez3
z4ve(eDGOl(JQh(SQ9#9kG}BihSnXQvYr{6jbfV~#K`zt|A$%CJT0L=1X*;M?{9hVx
z)OP5L>^PK)JBR`jqw8Ugm;uwdd%Gi#BF#pgLR#pepm|CHE3o1=N~4Se=^MVuVv-BY
zMhrKaQ67d!aGneiN_bLO2J_5_RBAHgrf3Na&)9hrUW_Eb!f3TXB@rqRL?x68#VVCh
zjUZ}?NFqbjGgytyL7_GbpYd&>eNSVNw_@cA5=SY5)DuMBOc&^K2#Rpz5OzSJn5sIk
zG{a&u5l#o!Q>Ir@D{<0Nh?~?TVFjl0EVsOg11iGALMg@*iD3~>WE7%w{IG;46H4gF
zQ2{Ctn!#zj>Hp>rqDeuXX8BL^%pB1j>Dj&>1zLDLOt_7nAd()HV(&d;3<k4Zqg<tT
zbw8|4Nz|_m`l&BzS7S~3j>8<}SCAXx!`<<<-{%$H;jFvrqx12-!JOKA2L)@uxmCbf
zEz4G(6MQZwygamJ_xBZgzeWH&4ydjTI{UqE4cD7{M|(dUE1SJ#{Cd&Yllxfjg)w)u
zI`dXRUh{G6{D7-|<VbV()scmVqB<|(#FFX>PIAd`e@pdg9c%Py!O9ouK2r9H@d@vo
zCe6k9H;x(n)^1=4xA}4l1B6`w5E7ZzGwg+Qvfb>*L1WKK%daqf<5$-r^+2EAD<s}h
ziwyL)?PONQZ~h27U7FCz%Jga#EZX4ToitC!<QKUe2P#6tOR{!8dVerzlWTw(+%(&L
zm9#}c4|HtZ3HSbip5oqgMPO6dxyiw&fyEaqz(bO{vc$8Y$3nZ=`m)XykIJ>~hn8S_
zXGe78&qK{(FVUgiLHAdseqlVOjh$J>xwCIvKB;@BdK<Prw(kD#Cx_SMOmP0Z@M5VG
zXuGW$`k}Sw(hYDUvu(FAOaAWMUY2t6J4*_D3^An{toF*7xd#jp(&gh(FPAE21;TUG
zM+{-k$lp$$&*DDwZ}Ynsc{Gq(KN8gvQF98*k003|RCdniGj__ChCMNX%kKDod*rtF
zcz{{FrYe8c$i1Eex~>IH86$(iRqI<zWI&kz;-13+);eQdF=IuYuI3L;JG*^vOc2>&
z{HFgU)0xEOwwH!;Z(gtWJ-fK_Nq#`Fq%kT#WHO-mfi80(ccL||Wp&tOgT=b<;KumM
z4_MoS7FT&~srYzayg2E6Lx0+_yCSGx^o443-!H<ODPCKH8Vk>W*|m~&jIM|g?vEEf
z=|9s~QQpU#UtisReMe)*o+0MthO!0RXAPf<J2+ljgNM$zw=Cq9<oPE({(A%8u&9pJ
yk}%YD<-2vv%UNXe^JN#ar8U=Hru%fIvqKrX4qHcwQQt(*FGHhBR-Q`OSoROgMRWZC

diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass.png b/OsmAnd/res/drawable-xxhdpi/map_compass.png
deleted file mode 100644
index f6ab0bcc4f07f3e8b9cc9e269522a3c62c498bb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1979
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

diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_bearing.png b/OsmAnd/res/drawable-xxhdpi/map_compass_bearing.png
deleted file mode 100644
index 639449d1946ba3e710135dbd41cfc7d3f67864d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2032
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

diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-xxhdpi/map_compass_bearing_white.png
deleted file mode 100644
index ec3ad49afdab0092dcb8b8935ee15c3cd69da18a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2032
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

diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_niu.png b/OsmAnd/res/drawable-xxhdpi/map_compass_niu.png
deleted file mode 100644
index 1e039c7f47d6fd0c5089c08b52ed4fa115c9ac27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1655
zcmbVNX;2eq7!GOxqo|{Z;Iy(Xj`bkf&7F+|8<GG~gBn1of@QP2fe4#THwy`|h>aJb
zBZp4af*PcZIHF_GQLIw6t&Rs(R634!R4f)-#Q`a$f`oR%Vf(}BkM4ZC-}OH4`@Gle
zwq*%%LA>ca4u=z@kJlR6Io|gM`m^8UmnY-cDU8vjFo~3zaiBE8QR9?}0Q4l9K^O@X
z&->&W5yjz*&b1_^Fe!#5N{k`}s82@VByB93!--nxw4qoQ!2l*A!(vr|9p^59fCX29
zE2Re5VABwpmUtIUB)SrkFjp3a;NZe&Aj+v^6_5mj0!}j9YF9c{;GkY5yY?MJATTJx
zWU0U*QYnUIfQF(8Kq`>&F<2-8<cL5hmB|r#Bp_n<5UhYiFds&gQn3;i0mBc-TBC8Z
z(x{Ccw#DvLU?#)Zln~@_I0O!{fTA-XA%Y+fEP_NLJ}beu=UExl$+y}gMl@&%J4Rb<
zjD@lSK8>h}%3)L>%XG*E(q=HcRcy5n2Z{|D<V0<dPyj<D>GNw)+Rhk>e`vf@+MbkW
zBOoJTr*deF&4)Q+1kA?nzYX~WSvJb0w1rIynysa<9FnjydaVj%Zv?mnSBlIgj4+u|
zJ|>hCd_*Xb^A#`x^UXqq0yh)5SPsJ@dftWC#>nI%g&Ni<)QC{1lOP&IipX_Rp;{6v
zg@wWqtlny8P%B1^*tW2?hp<TOe`1vynm`$fPNJynkt$f0Nimc?ld=IC&0yAnIV&wz
zoO0Ob`qDJywU(eQxda|dQzS4LXQkyG9B`RfY{En`zEC1H@x`!&4T20cv$bV1;WDXI
zEEP$?VLbkS;|H;%AYZZkt9V9^*oyQm-?jp~dD~2cmF*y!ZI!JJ`Oi6=QG4`Sb&~Tz
zd-)HGr!Eh@a!b0<T_mY8&I=qndET_Ll1Tz%P3Du$g>D&HyXi}Jpng+KDOh7$-dpO)
z*KdEbRJ&cKAG@Mp!>OB#QVq9msMJNz8uwScdW1a7YdK@P*?9If*4AK;w$2V5b$M@M
zEH_xIW=C~-*Q^BxDRP_Z8Uc@cq&r(P;N8mbiuOKiiGDrdi;H0RSHI+qI=#W$G9jy}
zt0Lg=U%hYqGb=rxp57QYe<#Ul^_01Hy8?4->3*R8<vGuk7I$^SwD)?Fo6Mb&Pb+wx
z=l4E7eK}Y%rYFR<MqK|}xo1Vw`%n7U+b&L1C#OgLoIy1gui7`!-S=T@L8>D-H7BiU
zrY$Sz-bA<mO0GA*_h^bHyu4ff@fDr=-o?_;K4ikzsZ*LK{m$t=FvGiGX8eq;hx=X?
z&R>10aK2mM?itgk3KK2SZ}uoVflCA78`CTylJRRNw-=NT?D)Q{8|d7zC{L8?5<I*e
z#a&(!pg$F#aq@mn?+5hR)U_R+^r@eBH|tWp+~X=!-EQ%*t{bXa^_F(O#1{xzdIjV!
zj&2CXZ>2TGs@twcwq~8!<!+A{*t05x8wTF3@do3?*-5{8fORUD-}AZgM~b(!)&;d0
z=Kfe^8mkOgANpYDXMT^l`J?wlzO3tWUH^0Xtl~0DLCJXa>}2#OtU_?--lZLt$5t$^
z?f$6g(DAr&TXOe>gmrnd2993uIC177vHzP30S(5sYWzstl=OogP*L5R)?Jmyrl0>K
zt)#i?WXs{ohWifn=H`eFt{#7m?RJ0r;&uj4^vn^j>RMCsbX<Lmy60+tlY)EyZdKO>
ztlCrJ>fY{d+?RNJegEXu_1`s?E+}-*862U!LjdoP=g#$TKYz}u1E@4%ofq`|3iP@J
J?eUm&_uo!6d}jav

diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-xxhdpi/map_compass_niu_white.png
deleted file mode 100644
index e1452ce13f44c69fcf8681b1baedf0171ee9e07f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1653
zcmbVNc~BE)6i<Z!1|3jQYzuT}ZKsg3+07;)hXmXZj!+{Zz(_q=vKzAv$;Rwrf_N3A
zR@w?Z)S|X>jCkQOXsgu<TB~BAAZo{p5j#|21jP&MMd=2K?H`VRbZ2+J?|u7z@BQ92
zyV@`#d92_K0guNUt4q-uxi!V}1o(09tXun%x#e{>F`Lbx&8!P|l01x{b4fsF!xxZ7
z5+@24o+e{?JfB5WW;UCxpRO{|HWBX85xH#+4$b4m#=9N3$x5<7F1diRtHJ)mjUYe~
zYH+4ZkLVo<q=iaZ>?AW5&&V__wwja#7#|13x>cM38_D8;+m>f%RBkmmY*)qYJ;yKz
z46CqKHTaxVw%!0F&`uJNiDDoVB9;PjrARD`kt^lV0LsZQqJU8ZLX;|*M1`Qh$OUrV
zoP=3r)FzGi;v_X_VOfU?hFva~$R!cc&IPbosZ_!U3Zp2*X+TVYoyFadotfgbpd}fT
zlX9>WZ3jFS@mxBeRf8PU=ONe}di@K-c4j0|T*_cK?tsN21h&~caSdxTtdabe#!I!C
z%mN1q8%c)Fcbd3*n5THbT<%`&$fL-yQKdO4t|)k(mNw<vNIR?3szL6Hh@c1+YR)y0
zxn>+PiRC1u6ielh0#PE6S*%bHW|EM|5yWffWq6rFEKwpFaiUzBAQmS|HF6D#VH!+>
zieqG`ROZF%><o+BO{CX1#rYn=BCo`%5}YK?(#}kp&hvJG!9ue%W1$^DLc(y>fykMZ
zouFMzl&4J3qt=p6Y7t2!IcXa(oM#pF5)LuA%oHP4m>^jUB7<bPQk;t)kwZ$UoQoVs
zaa3vsNASe|%^%E>f<4XhpXTu%aUJQ|z8D2gcri?*otq#hH!86{(0m?m)LNYu%XDAv
z+t~d6#PqOJZQq{<YU-Q59Iq)V+JB<F91x{8S=zy0D)k%Zm45?(B{?BRU!kb4ihrbL
z`II>U>%o$U<<s`xerMOo{<6ZAW7;aFD!Yy_t$zh>E@8~ACxRr6Q@a;3_+;V9O#)#h
zAgBfe!p^$1efRh5f)>I*2HZGyMG^XYTZ=iv(9-AUIx2SrMBf=V`#as<(S1J0>#%0V
zZ_~5h{<t$5tR&ChG!!=5zZRRwkCF)%)j6I42X7p%?7CLBWofYVsc@TLN10;l_*mif
z1GXss=PN!2TLY&x(nYh5U7y??^wD5Lzz)9*aeQI%vh%_v!EAWgqq5#LE8g23_~9s@
zod^G(WMQ+;oNb<eUHIhUw#LU!k>DnO)r6kzNJamK%9AVoD-R6xbdJXEDLT%TB^xh|
zi8u)Mgelf(8owQP{Ojofm-)AAFAga#R*=|)9Bb*|g_~_D5EV2kZRcn2p4!rVFZ{QR
zV17Y)=BI4j=J{VO2Lp;)u3~=(p0#I$>IOm&J^bXfvDKQDeH$N(5<%`m>&{L3Ao^_m
zpOO^pVF&M42(hLGZSc(xA>O(hf1y6IDYzmjyc#GZYBc`*OTFz9LmHNPL=v{%hV1!u
zd&JsQgZz=*V)c<P4Sm3$vv+^<&EC<S*7DfY+CdEUEvPQN64Awe(IB|`=H(x#)md?Y
zv(60ktg4z@o0zm@Xv0vQU}~Subt$T|vv^+QePjLkno~J@`r*?0r(MNWwm^5+VPJdm
z+-qB_)OY3@!~;!**!YSk?i8$jz_O;O<#Bj=*-xQwKlT-+m#fiusUCayVB63A*-??z
z5rfqL6Su=1zf2e1f!}Bf*J2^V_ZWV9FhAW;K&G#Fjd!;JmmOW(R_yr^=n`jWcWZKr
F{sAjdYM}rC

diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_white.png b/OsmAnd/res/drawable-xxhdpi/map_compass_white.png
deleted file mode 100644
index b10a7c7aea90c8a4812ab00bcb5a82d810c44ce4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1978
zcmbVNeNYo;8s7jZXr*E~qkK55K}8&rY`#dc5J^Zt;x!2gcye4pm(9jRNH%0QBnYt)
zPixhl*eh*qX^H2dfZ|!j@x+SPQe>bs;5llKUO|f=C?KU?6{zTK5bXWo^pD$_-S>Uo
z_xF3gpV_xEHETlWM$QEQAXJs1)KhDQ{|$MG`mP%}wT4<E$g~_X3pbKZ#Et=S173iE
zDhsj+(_@ICw73IH27tg4b9N4yqkauWaSI#qW7sZ>jbZ~pa*E4_poJI-7GRsqRw;Az
z+yy3RHb|N4g=$D`Q(z`@#uhu4wMCPSZYe}124>1?FxdrD3M?3jfG$gsm4IDR=Codz
z+WU_=OmG@P7D}1VoXSyWf(qP@fkJj73x&7>P$Xe<g^41GC;{YAG6xcKcn}Mcz(PI@
z@xYmfNm;WSjIdsrK4XiLq)Zb@+F%aH>2$K4d^T?1#NkRL5)Q=U@OUf=!6HhnB;sOO
ziP%{UN{m45W*ce7t)O2cQh+;1DU<T_SqK)JTK!zHm6%Bsl`@VCv2nO;h-0z%<C;bj
zq#paljTfSc>{1)X(PISeu%lExjIpz1DtEtb$Pc8vfwgusRTQL1iK7k+W+hchDU-Tk
z8_WinXDmRm0wcmgxgv}u;R-}7F(iRlMy^<FFk%M22!dwyyofIpbNLcTu1pgN6kKka
zAXSvglgm@(sXT6?kS7q%a#dD>M64(_YuilOp5ZEfl?yBE7((LqY#c9|?Sf1bPU3_K
zw}A@9bk)I?>&;dJ?j+*<WqKC160@62FhjZ>w}8`mhRrYVArTRxi2^ao5+*`Imass8
zQ1L?|mP8<;B1d=#Phe!u@D2ZO{y3CV9DlR?PxH(kQ61^uJ|6{2cs@*+m6{+sH7YtE
zBY>K~UX@aw?dlz_#!YYQqT9RAw;J~t7rd9VU_q@_*BN!QEkCSO&e(rbtN54jeqvV<
zF&f5Nfiw0mQZCKkwdmbNN2~O^^%;!D_{i4VlT-Jc{A+~oyz^1@ol;+^?{6)RnmbP4
zX!YtxXYW+^6F$b;6@TuE?EiwXjc%aTH|b6WxN}Zsq<;`JC~J{-)|5m{1U1sr<b}i9
zt_hX3w!4v6Q<Mc*g1<i8O~}4Y@LouKg%pqU>6&rcwkw_$N4{$vnqq{ZS#&V$-|u<@
zHwRVO%9r1qpWrR^vLZT*=wFAf@)jL_aO3hDUVue!>^wQVc~#6}+0vel=%FUvc^Qx!
z+$k*n!)rh74Hm%rxV1a(MTMH;Ot(XZe1Dm|7!WzXp_`vBZR5V$Bk%cZGP-dpH=L#p
z9I5(EVN4r;ZrI^@ZSNE;Ja?et?=%z5bn4~@i}99tkH#~1S^Jl+;&6Z!xNg<%Jk{7~
z`XB4%sl`vj8?wTxJXg0fchl19mW%)k^_#EnJe^sVOY5aK*yd!?Pag^O>gU9_W#}vQ
zdBBo@s<ZP#zTI;dFu|tz4=y&;yEg=G4p>+kRJW`55zD*7yXto1I$cWnoRz-M`ZvA&
zRetr_q_j(y`<CWjIvymg{AP4vh3lZbX0_b)!`(CB@{r#S6H)DNj;xuQ3@>}B`TH-%
zn{<%x_1dlDC5%EKbY=AoCI1R=dUVMAWJz7#iS&l|PFy|k`51BzcjTxBTGq$3FZv3t
z%1b{=#tosnAO5fon4AY62en57)z`;Atk1KYoOs|By~=kdT=;09wZwP#Ve>$+dqDHM
zjD8pUYS;K^`Mo-6BXBS;&_R?(<vhfrVzc`?n(LPwj`c1ZsQIw_mfKN1)}M4upOhPr
zS{BsYK8Bqd*!JXBbicbtA$lk2%FePM711@O?qi<En#3<(?>*!U>>+xV|4G|4)cn?C
zP04}pBWWQcA%juvcbf1N2DvxuNz%_x4J{8necOHZa!p){GEVHvOg;qEUi>Kkb8!`%
zB-nra<74X~wt4>G9xyy+>*TR*W7_>fU34t%pu>|-l)IjU^(WuIKK^MR{r#VZVDE;C
zz0ukeee|~%d^Ts?41-NkUN&u6T<ee5q=QG}Jdm)i<5NwxW9^MNnMo@<b1I=M_&?tq
z+PbBA-wyQB#+|(F74iKp8AtYUL?@{~D+^d#3r<CENSXM3CG97Vrnvk_M~q2k8b5=^
zT)yuvc>LYvf6ylHRh||7)BW<UVdmg+_tvy)T>+C$c;78(D)^PKUUlR?>qMP4!SM9W
k1FN-_)MQ1N-UwO@5W$~BH?&`W<o}zh(lpBBsT(W)3&v^(82|tP

diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 2fda1e16fb..e84811c376 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -1316,7 +1316,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 			int iconId = menu.getRightIconId();
 			int sizeId = menu.isBigRightIcon() ? R.dimen.context_menu_big_icon_size : R.dimen.standard_icon_size;
 			if (menu.getPointDescription().isFavorite() || menu.getPointDescription().isWpt()) {
-				sizeId = R.dimen.favorites_icon_size;
+				sizeId = R.dimen.favorites_my_places_icon_size;
 			}
 			int iconViewSize = getResources().getDimensionPixelSize(sizeId);
 			ViewGroup.LayoutParams params = iconView.getLayoutParams();
diff --git a/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java
index 1a59ddebf0..1e74a054b0 100644
--- a/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java
@@ -206,7 +206,7 @@ public class FavouritesLayer extends OsmandMapLayer implements ContextMenuLayer.
 
 	private int getSmallIconId(String layer, int iconId) {
 		String iconName = view.getResources().getResourceEntryName(iconId);
-		return view.getResources().getIdentifier("map_" + iconName + "_" + layer + "_small"
+		return view.getResources().getIdentifier("ic_" + iconName + "_" + layer + "_small"
 				, "drawable", view.getContext().getPackageName());
 	}