From f2019314a66b936df8be90221db4412382753eca Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Fri, 5 Feb 2016 16:09:45 +0300
Subject: [PATCH 01/18] Map markers storage

---
 .../src/net/osmand/data/PointDescription.java |   1 +
 .../src/net/osmand/plus/OsmandSettings.java   | 368 ++++++++++++++----
 2 files changed, 300 insertions(+), 69 deletions(-)

diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java
index d0c3b2eb79..4bd1cc441a 100644
--- a/OsmAnd/src/net/osmand/data/PointDescription.java
+++ b/OsmAnd/src/net/osmand/data/PointDescription.java
@@ -38,6 +38,7 @@ public class PointDescription {
 	public static final String POINT_TYPE_MY_LOCATION = "my_location";
 	public static final String POINT_TYPE_ALARM = "alarm";
 	public static final String POINT_TYPE_TARGET = "destination";
+	public static final String POINT_TYPE_MAP_MARKER = "map_marker";
 	public static final String POINT_TYPE_OSM_BUG = "bug";
 	public static final String POINT_TYPE_WORLD_REGION = "world_region";
 	public static final String POINT_TYPE_GPX_ITEM = "gpx_item";
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 29d93817db..7df5f81a9c 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1472,8 +1472,19 @@ public class OsmandSettings {
 	public final static String START_POINT_LAT = "start_point_lat"; //$NON-NLS-1$
 	public final static String START_POINT_LON = "start_point_lon"; //$NON-NLS-1$
 	public final static String START_POINT_DESCRIPTION = "start_point_description"; //$NON-NLS-1$
+
 	public final static String INTERMEDIATE_POINTS = "intermediate_points"; //$NON-NLS-1$
 	public final static String INTERMEDIATE_POINTS_DESCRIPTION = "intermediate_points_description"; //$NON-NLS-1$
+	private IntermediatePointsStorage intermediatePointsStorage = new IntermediatePointsStorage();
+
+	public final static String MAP_MARKERS_POINT = "map_markers_point"; //$NON-NLS-1$
+	public final static String MAP_MARKERS_COLOR = "map_markers_color"; //$NON-NLS-1$
+	public final static String MAP_MARKERS_DESCRIPTION = "map_markers_description"; //$NON-NLS-1$
+	public final static String MAP_MARKERS_HISTORY_POINT = "map_markers_history_point"; //$NON-NLS-1$
+	public final static String MAP_MARKERS_HISTORY_COLOR = "map_markers_history_color"; //$NON-NLS-1$
+	public final static String MAP_MARKERS_HISTORY_DESCRIPTION = "map_markers_history_description"; //$NON-NLS-1$
+	private MapMarkersStorage mapMarkersStorage = new MapMarkersStorage();
+	private MapMarkersHistoryStorage mapMarkersHistoryStorage = new MapMarkersHistoryStorage();
 
 	public LatLon getPointToNavigate() {
 		float lat = settingsAPI.getFloat(globalPreferences,POINT_NAVIGATE_LAT, 0);
@@ -1521,92 +1532,311 @@ public class OsmandSettings {
 	public final CommonPreference<Boolean> USE_INTERMEDIATE_POINTS_NAVIGATION =
 			new BooleanPreference("use_intermediate_points_navigation", false).makeGlobal().cache();
 
+
+	private class IntermediatePointsStorage extends MapPointsStorage {
+
+		public IntermediatePointsStorage() {
+			pointsKey = INTERMEDIATE_POINTS;
+			descriptionsKey = INTERMEDIATE_POINTS_DESCRIPTION;
+		}
+	}
+
+	private class MapMarkersHistoryStorage extends MapMarkersStorage {
+
+		public MapMarkersHistoryStorage() {
+			pointsKey = MAP_MARKERS_HISTORY_POINT;
+			descriptionsKey = MAP_MARKERS_HISTORY_DESCRIPTION;
+			colorsKey = MAP_MARKERS_HISTORY_COLOR;
+		}
+	}
+
+	private class MapMarkersStorage extends MapPointsStorage {
+
+		protected String colorsKey;
+
+		public MapMarkersStorage() {
+			pointsKey = MAP_MARKERS_POINT;
+			descriptionsKey = MAP_MARKERS_DESCRIPTION;
+			colorsKey = MAP_MARKERS_COLOR;
+		}
+
+		public List<Integer> getColors(int sz) {
+			List<Integer> list = new ArrayList<>();
+			String ip = settingsAPI.getString(globalPreferences, colorsKey, "");
+			if (ip.trim().length() > 0) {
+				StringTokenizer tok = new StringTokenizer(ip, ",");
+				while (tok.hasMoreTokens()) {
+					String colorStr = tok.nextToken();
+					list.add(Integer.parseInt(colorStr));
+				}
+			}
+			return list;
+		}
+
+		public boolean insertPoint(double latitude, double longitude,
+								   PointDescription historyDescription, int color, int index) {
+			List<LatLon> ps = getPoints();
+			List<String> ds = getPointDescriptions(ps.size());
+			List<Integer> cs = getColors(ps.size());
+			ps.add(index, new LatLon(latitude, longitude));
+			ds.add(index, PointDescription.serializeToString(historyDescription));
+			cs.add(index, color);
+			if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
+				SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
+			}
+			return savePoints(ps, ds, cs);
+		}
+
+		public boolean updatePoint(double latitude, double longitude,
+								   PointDescription historyDescription, int color) {
+			List<LatLon> ps = getPoints();
+			List<String> ds = getPointDescriptions(ps.size());
+			List<Integer> cs = getColors(ps.size());
+			int i = ps.indexOf(new LatLon(latitude, longitude));
+			ds.set(i, PointDescription.serializeToString(historyDescription));
+			cs.set(i, color);
+			if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
+				SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
+			}
+			return savePoints(ps, ds, cs);
+		}
+
+		@Override
+		public boolean deletePoint(int index) {
+			List<LatLon> ps = getPoints();
+			List<String> ds = getPointDescriptions(ps.size());
+			List<Integer> cs = getColors(ps.size());
+			ps.remove(index);
+			ds.remove(index);
+			cs.remove(index);
+			return savePoints(ps, ds, cs);
+		}
+
+		public boolean savePoints(List<LatLon> ps, List<String> ds, List<Integer> cs) {
+			StringBuilder sb = new StringBuilder();
+			for (int i = 0; i < ps.size(); i++) {
+				if (i > 0) {
+					sb.append(",");
+				}
+				sb.append(((float) ps.get(i).getLatitude() + "")).append(",").append(((float) ps.get(i).getLongitude() + ""));
+			}
+			StringBuilder tb = new StringBuilder();
+			for (int i = 0; i < ds.size(); i++) {
+				if (i > 0) {
+					tb.append("--");
+				}
+				if (ds.get(i) == null) {
+					tb.append("");
+				} else {
+					tb.append(ds.get(i));
+				}
+			}
+			StringBuilder cb = new StringBuilder();
+			for (int i = 0; i < cs.size(); i++) {
+				if (i > 0) {
+					cb.append(",");
+				}
+				cb.append(Integer.toString(cs.get(i)));
+			}
+			return settingsAPI.edit(globalPreferences)
+					.putString(pointsKey, sb.toString())
+					.putString(descriptionsKey, tb.toString())
+					.putString(colorsKey, cb.toString())
+					.commit();
+		}
+
+		@Override
+		public boolean insertPoint(double latitude, double longitude, PointDescription historyDescription, int index) {
+			return false;
+		}
+
+		@Override
+		public boolean updatePoint(double latitude, double longitude, PointDescription historyDescription) {
+			return false;
+		}
+
+		@Override
+		public boolean savePoints(List<LatLon> ps, List<String> ds) {
+			return false;
+		}
+	}
+
+	private abstract class MapPointsStorage {
+
+		protected String pointsKey;
+		protected String descriptionsKey;
+
+		public MapPointsStorage() {
+		}
+
+		public List<String> getPointDescriptions(int sz) {
+			List<String> list = new ArrayList<>();
+			String ip = settingsAPI.getString(globalPreferences, descriptionsKey, "");
+			if (ip.trim().length() > 0) {
+				list.addAll(Arrays.asList(ip.split("--")));
+			}
+			while (list.size() > sz) {
+				list.remove(list.size() - 1);
+			}
+			while (list.size() < sz) {
+				list.add("");
+			}
+			return list;
+		}
+
+		public List<LatLon> getPoints() {
+			List<LatLon> list = new ArrayList<>();
+			String ip = settingsAPI.getString(globalPreferences, pointsKey, "");
+			if (ip.trim().length() > 0) {
+				StringTokenizer tok = new StringTokenizer(ip, ",");
+				while (tok.hasMoreTokens()) {
+					String lat = tok.nextToken();
+					if (!tok.hasMoreTokens()) {
+						break;
+					}
+					String lon = tok.nextToken();
+					list.add(new LatLon(Float.parseFloat(lat), Float.parseFloat(lon)));
+				}
+			}
+			return list;
+		}
+
+		public boolean insertPoint(double latitude, double longitude, PointDescription historyDescription, int index) {
+			List<LatLon> ps = getPoints();
+			List<String> ds = getPointDescriptions(ps.size());
+			ps.add(index, new LatLon(latitude, longitude));
+			ds.add(index, PointDescription.serializeToString(historyDescription));
+			if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
+				SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
+			}
+			return savePoints(ps, ds);
+		}
+
+		public boolean updatePoint(double latitude, double longitude, PointDescription historyDescription) {
+			List<LatLon> ps = getPoints();
+			List<String> ds = getPointDescriptions(ps.size());
+			int i = ps.indexOf(new LatLon(latitude, longitude));
+			ds.set(i, PointDescription.serializeToString(historyDescription));
+			if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
+				SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
+			}
+			return savePoints(ps, ds);
+		}
+
+		public boolean deletePoint(int index) {
+			List<LatLon> ps = getPoints();
+			List<String> ds = getPointDescriptions(ps.size());
+			ps.remove(index);
+			ds.remove(index);
+			return savePoints(ps, ds);
+		}
+
+		public boolean savePoints(List<LatLon> ps, List<String> ds) {
+			StringBuilder sb = new StringBuilder();
+			for (int i = 0; i < ps.size(); i++) {
+				if (i > 0) {
+					sb.append(",");
+				}
+				sb.append(((float) ps.get(i).getLatitude() + "")).append(",").append(((float) ps.get(i).getLongitude() + ""));
+			}
+			StringBuilder tb = new StringBuilder();
+			for (int i = 0; i < ds.size(); i++) {
+				if (i > 0) {
+					tb.append("--");
+				}
+				if (ds.get(i) == null) {
+					tb.append("");
+				} else {
+					tb.append(ds.get(i));
+				}
+			}
+			return settingsAPI.edit(globalPreferences)
+					.putString(pointsKey, sb.toString())
+					.putString(descriptionsKey, tb.toString())
+					.commit();
+		}
+	}
+
+
 	public List<String> getIntermediatePointDescriptions(int sz) {
-		List<String> list = new ArrayList<String>();
-		String ip = settingsAPI.getString(globalPreferences,INTERMEDIATE_POINTS_DESCRIPTION, "");
-		if (ip.trim().length() > 0) {
-			list.addAll(Arrays.asList(ip.split("--")));
-		}
-		while(list.size() > sz) {
-			list.remove(list.size() - 1);
-		}
-		while(list.size() < sz) {
-			list.add("");
-		}
-		return list;
+		return intermediatePointsStorage.getPointDescriptions(sz);
 	}
 
 	public List<LatLon> getIntermediatePoints() {
-		List<LatLon> list = new ArrayList<LatLon>();
-		String ip = settingsAPI.getString(globalPreferences,INTERMEDIATE_POINTS, "");
-		if (ip.trim().length() > 0) {
-			StringTokenizer tok = new StringTokenizer(ip, ",");
-			while (tok.hasMoreTokens()) {
-				String lat = tok.nextToken();
-				if (!tok.hasMoreTokens()) {
-					break;
-				}
-				String lon = tok.nextToken();
-				list.add(new LatLon(Float.parseFloat(lat), Float.parseFloat(lon)));
-			}
-		}
-		return list;
+		return intermediatePointsStorage.getPoints();
 	}
 
 	public boolean insertIntermediatePoint(double latitude, double longitude, PointDescription historyDescription, int index) {
-		List<LatLon> ps = getIntermediatePoints();
-		List<String> ds = getIntermediatePointDescriptions(ps.size());
-		ps.add(index, new LatLon(latitude, longitude));
-		ds.add(index, PointDescription.serializeToString(historyDescription));
-		if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
-			SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
-		}
-		return saveIntermediatePoints(ps,ds);
+		return intermediatePointsStorage.insertPoint(latitude, longitude, historyDescription, index);
 	}
 
 	public boolean updateIntermediatePoint(double latitude, double longitude, PointDescription historyDescription) {
-		List<LatLon> ps = getIntermediatePoints();
-		List<String> ds = getIntermediatePointDescriptions(ps.size());
-		int i = ps.indexOf(new LatLon(latitude, longitude));
-		ds.set(i, PointDescription.serializeToString(historyDescription));
-		if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
-			SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
-		}
-		return saveIntermediatePoints(ps,ds);
+		return intermediatePointsStorage.updatePoint(latitude, longitude, historyDescription);
 	}
 
-	public boolean deleteIntermediatePoint( int index) {
-		List<LatLon> ps = getIntermediatePoints();
-		List<String> ds = getIntermediatePointDescriptions(ps.size());
-		ps.remove(index);
-		ds.remove(index);
-		return saveIntermediatePoints(ps,ds);
+	public boolean deleteIntermediatePoint(int index) {
+		return intermediatePointsStorage.deletePoint(index);
 	}
 
 	public boolean saveIntermediatePoints(List<LatLon> ps, List<String> ds) {
-		StringBuilder sb = new StringBuilder();
-		for(int i=0; i<ps.size(); i++) {
-			if(i > 0){
-				sb.append(",");
-			}
-			sb.append(((float)ps.get(i).getLatitude()+"")).append(",").append(((float)ps.get(i).getLongitude()+""));
-		}
-		StringBuilder tb = new StringBuilder();
-		for (int i = 0; i < ds.size(); i++) {
-			if (i > 0) {
-				tb.append("--");
-			}
-			if (ds.get(i) == null) {
-				tb.append("");
-			} else {
-				tb.append(ds.get(i));
-			}
-		}
-		return settingsAPI.edit(globalPreferences).putString(INTERMEDIATE_POINTS, sb.toString()).
-				putString(INTERMEDIATE_POINTS_DESCRIPTION, tb.toString()).
-				commit();
+		return intermediatePointsStorage.savePoints(ps, ds);
 	}
 
+
+	public List<String> getMapMarkersPointDescriptions(int sz) {
+		return mapMarkersStorage.getPointDescriptions(sz);
+	}
+
+	public List<LatLon> getMapMarkersPoints() {
+		return mapMarkersStorage.getPoints();
+	}
+
+	public boolean insertMapMarker(double latitude, double longitude,
+								   PointDescription historyDescription, int color, int index) {
+		return mapMarkersStorage.insertPoint(latitude, longitude, historyDescription, color, index);
+	}
+
+	public boolean updateMapMarker(double latitude, double longitude,
+								   PointDescription historyDescription, int color) {
+		return mapMarkersStorage.updatePoint(latitude, longitude, historyDescription, color);
+	}
+
+	public boolean deleteMapMarker(int index) {
+		return mapMarkersStorage.deletePoint(index);
+	}
+
+	public boolean saveMapMarkers(List<LatLon> ps, List<String> ds, List<Integer> cs) {
+		return mapMarkersStorage.savePoints(ps, ds, cs);
+	}
+
+
+	public List<String> getMapMarkersHistoryPointDescriptions(int sz) {
+		return mapMarkersHistoryStorage.getPointDescriptions(sz);
+	}
+
+	public List<LatLon> getMapMarkersHistoryPoints() {
+		return mapMarkersHistoryStorage.getPoints();
+	}
+
+	public boolean insertMapMarkerHistory(double latitude, double longitude,
+										  PointDescription historyDescription, int color, int index) {
+		return mapMarkersHistoryStorage.insertPoint(latitude, longitude, historyDescription, color, index);
+	}
+
+	public boolean updateMapMarkerHistory(double latitude, double longitude,
+										  PointDescription historyDescription, int color) {
+		return mapMarkersHistoryStorage.updatePoint(latitude, longitude, historyDescription, color);
+	}
+
+	public boolean deleteMapMarkerHistory(int index) {
+		return mapMarkersHistoryStorage.deletePoint(index);
+	}
+
+	public boolean saveMapMarkersHistory(List<LatLon> ps, List<String> ds, List<Integer> cs) {
+		return mapMarkersHistoryStorage.savePoints(ps, ds, cs);
+	}
+
+
 	public boolean clearPointToNavigate() {
 		return settingsAPI.edit(globalPreferences).remove(POINT_NAVIGATE_LAT).remove(POINT_NAVIGATE_LON).
 				remove(POINT_NAVIGATE_DESCRIPTION).commit();

From ac59d43c22e1bde286a75a6e24a4b0f36e7b4438 Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Fri, 5 Feb 2016 20:37:37 +0200
Subject: [PATCH 02/18] Add Markers icons.

---
 OsmAnd/res/drawable-hdpi/map_marker_blue.png     | Bin 0 -> 2176 bytes
 OsmAnd/res/drawable-hdpi/map_marker_green.png    | Bin 0 -> 2172 bytes
 OsmAnd/res/drawable-hdpi/map_marker_orange.png   | Bin 0 -> 2186 bytes
 OsmAnd/res/drawable-hdpi/map_marker_red.png      | Bin 0 -> 2154 bytes
 OsmAnd/res/drawable-hdpi/map_marker_yellow.png   | Bin 0 -> 2187 bytes
 OsmAnd/res/drawable-mdpi/map_marker_blue.png     | Bin 0 -> 1772 bytes
 OsmAnd/res/drawable-mdpi/map_marker_green.png    | Bin 0 -> 1762 bytes
 OsmAnd/res/drawable-mdpi/map_marker_orange.png   | Bin 0 -> 1764 bytes
 OsmAnd/res/drawable-mdpi/map_marker_red.png      | Bin 0 -> 1721 bytes
 OsmAnd/res/drawable-mdpi/map_marker_yellow.png   | Bin 0 -> 1767 bytes
 OsmAnd/res/drawable-xhdpi/map_marker_blue.png    | Bin 0 -> 2511 bytes
 OsmAnd/res/drawable-xhdpi/map_marker_green.png   | Bin 0 -> 2498 bytes
 OsmAnd/res/drawable-xhdpi/map_marker_orange.png  | Bin 0 -> 2535 bytes
 OsmAnd/res/drawable-xhdpi/map_marker_red.png     | Bin 0 -> 2455 bytes
 OsmAnd/res/drawable-xhdpi/map_marker_yellow.png  | Bin 0 -> 2511 bytes
 OsmAnd/res/drawable-xxhdpi/map_marker_blue.png   | Bin 0 -> 3255 bytes
 OsmAnd/res/drawable-xxhdpi/map_marker_green.png  | Bin 0 -> 3261 bytes
 OsmAnd/res/drawable-xxhdpi/map_marker_orange.png | Bin 0 -> 3274 bytes
 OsmAnd/res/drawable-xxhdpi/map_marker_red.png    | Bin 0 -> 3213 bytes
 OsmAnd/res/drawable-xxhdpi/map_marker_yellow.png | Bin 0 -> 3262 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/map_marker_blue.png
 create mode 100644 OsmAnd/res/drawable-hdpi/map_marker_green.png
 create mode 100644 OsmAnd/res/drawable-hdpi/map_marker_orange.png
 create mode 100644 OsmAnd/res/drawable-hdpi/map_marker_red.png
 create mode 100644 OsmAnd/res/drawable-hdpi/map_marker_yellow.png
 create mode 100644 OsmAnd/res/drawable-mdpi/map_marker_blue.png
 create mode 100644 OsmAnd/res/drawable-mdpi/map_marker_green.png
 create mode 100644 OsmAnd/res/drawable-mdpi/map_marker_orange.png
 create mode 100644 OsmAnd/res/drawable-mdpi/map_marker_red.png
 create mode 100644 OsmAnd/res/drawable-mdpi/map_marker_yellow.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/map_marker_blue.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/map_marker_green.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/map_marker_orange.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/map_marker_red.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/map_marker_yellow.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/map_marker_blue.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/map_marker_green.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/map_marker_orange.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/map_marker_red.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/map_marker_yellow.png

diff --git a/OsmAnd/res/drawable-hdpi/map_marker_blue.png b/OsmAnd/res/drawable-hdpi/map_marker_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..62d6e982178d03a31f4fbd23cf64623dc24363a9
GIT binary patch
literal 2176
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
O1YB1iPOVEw@_ztj)po)F

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/map_marker_green.png b/OsmAnd/res/drawable-hdpi/map_marker_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..13e27c9494e02aaca941f9ab64eaa10f1897ce80
GIT binary patch
literal 2172
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
Gaqz#!r*^9V

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/map_marker_orange.png b/OsmAnd/res/drawable-hdpi/map_marker_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..d797f9f9e359471d8d5f13facf0b69cee55d93e8
GIT binary patch
literal 2186
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
SW6Slw13zy*r|ECeS^ojEZE+<4

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/map_marker_red.png b/OsmAnd/res/drawable-hdpi/map_marker_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ef9cdb3ac1fc4e038c913b5b6903b4593232ce0
GIT binary patch
literal 2154
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/map_marker_yellow.png b/OsmAnd/res/drawable-hdpi/map_marker_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6715e40614243b4c61ccc2216a84c4e72db1cb62
GIT binary patch
literal 2187
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
P{T{e+Jvb#hgJS;+Lmq%m

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/map_marker_blue.png b/OsmAnd/res/drawable-mdpi/map_marker_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa798cef83ef89a91fc3d2e132d87758224a4fdb
GIT binary patch
literal 1772
zcmbVNX;2e)6kkyk5Uc$l*Jxd$s2s`e=44lbKteDXK@1c^?WoJ{A}J&rcNY@C3lR}T
z1w<6IMZ|*DB2yg|t9TSOS~ZF?tssn5TMw$#t6r_x4T9|l#}D0^-S<D<@4er<W{czF
zVn%uRc>n+~N;^ZX=jBBH6}b)PzuRNB74gECi#BixbQ)*H848Fb=~N2Tn(zgbp2EqT
zg=eWS02rEWOf+zY*qInXn?$%%M`SZucr*ZnO}ANaB7@?<RBD0ItQ7ol_?Q4Rl1f3c
zEEbNnsHk+~j9i9F$c;-Rax(~&6ig2X!)zFDz(jF4XftJ+S<I#s^xMVwweuJffc+|5
zhEnjBlp!`ARM89t%0zM@fglK|Kt+fwR3eszfMOVtK`;s-un<Nt1jfWLIPeH~Zw#4+
z>D8J6U;IufNar{U20>P<Rb-WjXl4O~pePE#Vn{3&@)|-m$IRh2p_!dHXhBV}1Y@*t
zM%oNIE#j$k7N->OOy7oJvc$%|Gi+uD62+$svf&m85y6nj<czCdo8|P>zck*f%_inp
zC`eDSbQVMK^+=mI2<CJ5VMk6yo((pOG4e&hGu1SaWunZSR;?89HzLwVVscn2R!~H!
zP!fuWg(M*j6{1p^Tu7mzs8}XdC={@C(9Zkts8k|Wh&6~xCE=?PEen-LNl`>CiBw0)
zVN|Rb#A?kfhnop%(6^EIJ%EKjh{aS4g>y8MNYj~vT@as6b2OVyTR@enzv|%BWTTm+
zt!$vPOmCxBQ;ad2A~g(c0{iof8Q;S}LZGPxLLovNQKSh|DJdch#R*bKA*n=Knnb2R
z6%xS!p8UW0gLqPqvswPrJcCDkM>?19MuFeF8z#!kPY}b8%D8rSnx8;VtvWK%)_K1w
zZ$`rGarULpdv|RS?ceAd;#oVwH83i`Gw5z)eM{fnV;5cpZ+|rfcFS{%gf6{m@NO%}
ztnaIH&F?7icw=}y+qZb5Ur=zJ!TcmY`9OE~QG0f4S^HD7^-b4=Md+Qr-VR66lWEsm
zeQ%K|^=I*YjV;BehvaNCT|YOcQycxXS78sUtPvb+s6A1&`X@hm%G`_AN~|{QGFZPH
zaa#_zJ-UCyvEJ+I_`UOcT;fMnG|JA`0K?XLb^2B;%+#j1E?gN7d>S$N0$veuD82aw
z__}L}EHCV0QbGF^V592DZCJNL>|MIFd!b(lTH}2_C3{5Rfd=^$SB?8J7#yB7?06EO
zT)Dd3rEZw+w9c+;4!n5;lQ|ORv5ttVUB|vmPCrOovBqpw%*oq)))BnfGPm>U<;L?l
zEdW-cYTtp*tay?%A%1J}g{>pDb&qL6&(CvQWAf3aN_2EYfHuE4$lq?4ZYrG$w4PB^
z|M|?zw;Sp{{!P@6_n7^KvcenD6RM{9O>OzBwuZdtsow<npMKoYe8S>iCJyhaD{<5V
zue{5!HNV?`;r5K_!O7ywd7qTMT)cR*cgxx{i7r1VH#F&83GVQjzxPzGsD)-dw5cCN
zXKLWUuhv(*ygfXl<JXuWZGP+Zvqoxs`gFISUCWF%_{K$K0q*vU>+av7Cr1`ZgFZqF
z+s8(%dX&BW;k+VF-WqV>*4=rU9x1q}7~9h4zJXl|u``t4+tYeVn@<4b*Pj)geBhD4
zAwg2QS^kiVyR>8Ov@D<TnxZzG>lc12Z#93u(<66m)`OGmq?+CCo|8M59oQ|tp8NRa
zuHR0T#FbCFc`3YAa&F&qpM&9TaHga0aIlxK3%M9o9+Hq1vCX?YBICuF@jCa?vOD+k
z?J?`tU3|Sa<W5HRm60x|{nsRVef05-pG!wK-Kl4G1~e?2vWPNNRmZRUb}hU2Om(Gh
z^3Yj*^H&Xb8S=%Gb(anu&G#?qDBPG+9q;ojMne|#7U*hEmAXETQpS(uM%`L6DVJK}
a4g<Tvkey@hHah=nfHpc#y(en^@_ztdwx<37

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/map_marker_green.png b/OsmAnd/res/drawable-mdpi/map_marker_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a7d5d4a36d49e32db57b7053fc2fd762e5aa8c4
GIT binary patch
literal 1762
zcmbVNdrT8|94{gcd58#+>V(}2Oa}CE?ez&2`T#6ahNU3HO=z!IT4{TwJ#4{D6i{M#
zjG;!w$0#C-Oo?J-4kAXX;--MZ7_F((ks*Spfw|$vbXNqoKa79ulDqHk@%?<h@7&I`
z)FfZ8<z55=!B?_cEW>3e{!%;_;NQlih6-FP!xFNvbX1L56effqP@zf$kmwb8hzwDv
ziVChFu>^wqCapXR%aW$>U{p_0xO6C1y%9$f2(fWiqXN!HFhGgqX$^eRv(9c3pjGin
z>zGoS)F?tU+SSD-B)vFQ4j1RcTooy96%cFX;RJdFQvg=I&S2(Q`J@?M9=>)RQ%S&#
z3YO0&y>Ti_ng)na69O<PEHVs&Ai(BQKqiMlXGQ~b8px#5xKxlvrhz<=#-r1K*@uK%
zGpW=(nK*IQ7QW+?G#F;&QK=S-g<@e)P*WZi<Z`)G8l6g~lW`5QxyXPitYm{ZbdEuc
zm|>IFh-py+;9^uL(L#(*!aaQxg5D^Vz9lx8XA^~|jA~UFsUU?$)$3hx&1jo38S<|i
z@6<NSi;M_WhM3Vp6O7kG9XbcbbN7BjE=AlM-e)E)UKE8+jKYO_#DGb}d=h>`QE62?
z77e1a5tu_}a6md)1w$M%7h<x=2$#d9Ga)vcO@rom-i7BvVj7(W2}L3XUX27Mhb4r#
zpqL>L3t2QSojr$@7|fW$03&m@wYcqBtl+&^p2&nKFw`VRQQce@q-jtLHEU2KAQH_~
z9f(+`HK<UF`BPV!-b5`%OxjI|D$#`Mftft>wD0hN0dtiwh=61T$X1h;2n3Qj3Rp!(
zKqahJGni~Hn?ahztNw5PsJK&9SF`-5dFGDrj&v>Gjsm`UJ4}cHpCA)HDs8=<8}SL8
zClL$eR>zb5Ycv4@;?-`a?woX&!*RmbE|2s|h{)3TdpUk7ORlu~#}Z#W5G<Z=E0v#?
zJ@*(t8EJjqaPoHLN<s4a9Iid&R!G;`4Bemhfn%(FXNsy`w`AuxXzHb(><yk`wEx_v
zF1h>cFTeJkcH)ul_0k&`J{XA|@WGmf9UTJtfMYDF?r>C_e~i=VY-zN#)ZE#e)7l;o
z8SbVh6Du1dqRM`lWSr?_jhsHNBgT)X*);nyBKLgVN$Itj4rRn02-~0Nc5D9K@}3dj
z$BpCFahgBQ-@Vj0@$07Y9RzGi-S(c58<{I?6GN5q0`)1VB!9|Z*wsARKJN&7s}Wd~
zx$t5L;e~Kd_O_cJ%C4keO}9oo?V^PCF%FsonYQmrV%jLyc?oe#EcX*1(iZl$eo?TY
zroH%bQH~qtUwK^0NhzIN{)*F99pe{&49MnOukSNgd}Mm$He$@oT{4=ilsMO13%oed
zwSD@_mr&g9n3|rY#|IxxUMas+UPhN%g9E2(J9?E^fGuXLXSiAK$Zf0_4?cSWjko6$
zEdb_y@2m4KbRYZlJh+$s01lB}D72q#m=3h5<ExHMWbepL^Mii>Nnp!9>Q}M1%3zn3
zX4jvs>$bR)rCBd;P~96>2DfYoO3|d+PH(ArTHBfy6t8@IqO&PC%^NyDT07?HbQecB
zQ{}J57JqZ7Q?+cU)6+??3!85@mt6AMq#IsTRQhm_Jh+ZU+$vvIxY}`UaTa&`wy=zg
zW7&fC@5doU3NheHIp`9JP*s>D9Otc_s)_cs4}}YJjYr%^Dh~Yk`N_6c%lJd=re=58
zZ*9iwL({Rt<NZ^9^J`xhT&~e4bp)>64Q?C^EDp%fw5_mtXI7h#{fGObYaa~;#lhdE
z+)1VS5dFN@!qLL=4x7ip`%THcN1Mv>rmsDR_#&RyqNPE#QAyzk5}Gd?%bTI<uE{mn
zW^6QOcty{y$NdpLuR}vOH00S9XjaPYIY({%1KuO6hCS$itF|np5%lrV9*I%F3D;jo
Ml8`DsCCn}T2dG$|(f|Me

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/map_marker_orange.png b/OsmAnd/res/drawable-mdpi/map_marker_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..954910e457056cb547afca649885579cded40356
GIT binary patch
literal 1764
zcmbVNYfuwc6b@nm5vf+xfXZxwQne(zn|A_1AOS)(5CYazMc8Z>2qf9CSxiE8kcuEw
zi#mg?Vi6GwG6htMh}x+It%xJOh9X$7qM}8Vwmy)GZ8r$EKOBE_XLip$_nz;Z@1DnO
zfhsz3n!ArXjYgXmrI4#B=|{b6Hy7$#9$A)832!o7L&o9Bq!l4BTBr`!VnCD;Nx{?@
zqO)h5$AV}y=XLsc4XIHsm!P<jjW}%BHlvwB(`Z3UZDs^b$4EenrRYsk=FrLSnSfp=
zWv=8aA*ES{rRo(~1QwSS9gk+EqhcL%X)q9ElTZ$f7>NKjqrqg6*rd!czY=Qg*an%v
zm<gFKWxgV%QK|qLPGA6^EnuNA3<E+j8|I6+9DV@6fnYuei9r}*L9hgdBpe7Bf0$G>
zLYFL2%Ol2PQJR#QN|I&?2wJUHww24qi4+hPi^U+s0XZBNWx=x8O(bGtnJj)29^{w>
zCG=)ekDCC8M?{Nfl2Rtc^wkxNW~K7AW0Pe(QB=x68)61wHUt`tj(d$+TSztbFO4@^
zTjK3z3{+zlJd;4FdL;WzfT`TQJ&?nYVk3zm^i)w0gB(XQjhKmyl1rJ?30tSvNdyp&
zBg9Y<iz|XTEFH=dvBW&SfQ5-gVh*1t6bd2Ugr7Iz#XK%Y$O)IrWL&Bm;e3%Gj3<WW
z+)#O#01|VA6WAz|g+xp!HW6D-#U97X-inpT2n-={A|A&L6J4N6#Yx<fikktMY^>_Q
zqLq4+4!2qsJIeIx)^d!{ufuc^1a1Vz@+{H6fddy6Yf%`3SqLmlW@#}V%n~7}j)lQm
zG&z~e7m9^k<~UyWfAa@Yq(Dcr{HJ*)wy2JDEMJcTrMw;{%tTEPL5)g=H-|$_;N&QI
zXuPd^aCd?t4xyjhXIZzWl)bk}jSy+7$vdl(yqxE3h@~?W<h8b`;Hha|%}hp>$CLJ>
z;1YwxZ&4LcQC{@U)y=E=w(_E+jM%<&Kb_T@0$(QHXx836R{vGcUe~|&4hP-q7;YT4
z|2@>(A_|X9wO=<pn|oYT=6ydY@!^BU3jcxP<0t=si3X`O+OKwYJ^g-T=0_4n0dI>2
zatWQj%g37j=g0|l7sGvjEUh85X;sUpXNW4H%WG3xZP)0*A5JfxNlV)(zlfCQ5V5zP
zWen8%w)QYC9%DRp3W;Q_wS1YX@L$?6xIU({I<JEDV145bZF*W_L{hoabeA)y+nlaX
zEqh;Or}UhiN3I@u@6k3<-Lh?u<2&blw&(EiY;m1oz-{(R%^7<-FMp)Pevq@Ntxz;H
zbED6Zg2Fv5qb>HDW$pD{MWLtqq3pn+td77#3vPBc-3cn$kR6ev^*Gw62|Gaxejy*A
zAKtlIaN&8iA)>9T^PXqAJNJR`Y7L{nck3*6uGga=^&F>LMfdPHm)r09RHd8=>nSa#
zbw5-z{PG+wX`K<q_Xw6s=Y3F7B2&}r3D-mZA+6^}!4*)Qj+@~9b4XloM@+^iVGlzC
z7Sk^+_iPwmt$)7SbMEK@AS*6*AU8=@r})CP#t@<Lj+Q0Rrc|c&Oo<ZR2~f}9_*-Rn
zLGy>68TP_fzIG(%*}{r;Cv9-TC)ctO&zp5go*Db?OFqu8@NfZURVS`cXXc)6Kjf`g
zKUI`7pLgI~^!$kYD+oy+6W`|D64lbu@_GZZTOaw2Oj0I6mrZLTOTO8~1&__fQF6a(
zi)hWh+ogBAEKhC}o9Kdmo%Q^WPdi5Jw!ru*K5+TM_K@QB+dr>!R|zg%JFweMcofAf
zDb#ihRy4ZN^ZP2DZviuU^ZI|c)$EY5niko*Q}T*`^=(7CQNfOd7Zl|=m7C83O4mtu
zN?%0J@&Ed}`xZCu<A54yFn??7q?-KdGNsCw=ei-+SGMxXQ2L3K{z{rNZEYp{RCD*f
Q632fhDm+?V8<zCxKZ`t{T>t<8

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/map_marker_red.png b/OsmAnd/res/drawable-mdpi/map_marker_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..47ce238ff6271ca5eb2661913a103cb9d8575f61
GIT binary patch
literal 1721
zcmbVNdr;GM9It><P#FjlM1~=F3XY~p+R~;_y*@ySz_2iiY%<a|Erqt}+CU4QY%-AP
z`It-?j-lcqg7d+cx|?`1L<Bbw-BmqB*#Ro3^JHWAI3FxUaQnmCAIn|x{XIUP@B4e%
zl$^A3u4kYpgTa_9kCQ2A8A`tpa~A#Gw{mY8Ef!EQ=~N1-rEIu`V2CxOiU8zBTt_Gf
zTvPDzc_Ny@aLw1Jrc>#O2|_h#gm5PYvK!4bo56@)VK?LIT!I2rgidb~fe%|+K|rq&
zfl6K?oM@I3+4{Ib3z1Tol&UVwRbv`(#d09pE~FJ02?_`7MuW*Jw2Qz=y+V5JJZ6Ky
zB!tQpfv=oOPfP}+q=f)@P$Wx@APB(6AcQC2pu7kGg%KVb#@GnVf)ODC3sD%DdO+Hm
zMWYoeWU*7W=$#16rYN(J&9>QWkc|V879AVGFpLeOY!qeD2$r?LMB#Rp$r?JXK}J~B
z7QLC$lP18a5m%9UlnA6feHDVyoS67pvB^4>C^}_qJ8otp5X?3jopDW~t(1cJ$Bj3l
zt*HfOf~_E|WS&J$*FzgRO{R1A--et(+8g0}7Cl`Q+#n;>c}BuS$z>vtzJWA)jW81C
zqI^OvU~vQp%F?L00v5*QMY0G?fT27tpU;Q6(|X>-$G9>Wg}Jd(DTl5`3{Ma#;bMr4
zBbG@bVGQL@bLA#0g`3pGv~4|Ydx{(LpIo8TLf{l>NhL|cbQdINlN4#qCe46UI$3of
zOsO|%NSig>S*BM}%Lt1;pU}iwNFy+rXQBQLK5*2SN{tW*3rF}`mWtpaECH_8un0t@
z)@nICKE~&OQ+&<;%^#a~itTKce>Kna5#5o_<?B(PH?N0@Fwqlap-1JZ=}A0;;c`tb
z6Q|m*|GsNgwy!woT<iL(&c?SoiZ{f!xif=3<7@Z2FG}_MLvbo#eDQ9#+RYA?cyuPq
zJ~|^f+EI5nOO!3%e8pYl#wvDa*KcN(hA9kSaJi|ur6{F5FeIn^W&#v7`d!qQ*RFkZ
zXJSID^X)ic^!w_<g&JD{GiA1;4bk+siP!j7LoG)$_C0tql6|&Q-Qe-4&*TQCzPos*
z0{;5Q{a=>yo9cpNp&-VfTVP!v(SFEJ@+s`H?BdMtSGsCF9MYNl+x<M-OMSZrg_VI(
zSzgU|T{mn~9Hgo$G>aW;Bx^TZI_Ysm6uIe}dk1GH)OyPp9!>c!N!}yjmoxpVBzTu>
zM8<r4r^Y{TFuD`bDLy;D*4*#2<V8Y%LE^7?yr6fFtzYL-GXMte^cwRYp35Be841`Q
zUlxA*R8P~!k}>A7qY&H?6F!z%c$jf|UdYb_2Wor9R^RBYkBf*T<fU?-!5L*WC6#Df
z*bKhM4rn;zY8L7cl&y2S+4Z?D!d%g}{b7Y6B&dC~ZwON^ys)vN#IomdrlecRsSK^+
zmjn!WdxZ6-i-xJtw70wGY(>tl8cOcy>Gf5e*_y0$8!J7Jb*~bHf^+;E!o(3j{COlI
z;Ev0=qNrQ*s!hJ&gA=~v6WA@JC3(T_-&EshNcr)M>X#l?&!T}Ze0D#2|GxLtEM{|0
zqx8c*iTU=<S&B3lWpnYByuQ0_b~t#8`_QB?1jMY)XehcjzUX1sq2ay{>V6uHZ7JCD
z_(Umm`o`(~(u=$5e|+BjvN-P&v|QJ^7A*p*7WSXSU(_D&fsG4YH*QnbZ+j=l>wt0r
zvtije|8i#Q1XtIWUwy15vl7Omwz{TyHJuGk?+n~?CVg2<tHF`4l~o0!L37uo@qt^9
zLmC?62y0xxtor$%3|==3x<8|=+9kQ3p)b3-mX64CRvh1vQ$N3PyTkXM*R%ECj(0zw
am&I5!^w-#B?$cAwpNTvsNp?h%Rs1(9*Mw^T

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/map_marker_yellow.png b/OsmAnd/res/drawable-mdpi/map_marker_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..554ff72ecb1973ca3cfbbd8375a379dfa368c45b
GIT binary patch
literal 1767
zcmbVNc~BE~6b?lyQHW?AIVyAs6seG8H}|d_4GBoB!3b$Z6ze9tA(12-k|hvC1r-sr
zAc~;vXu(nyJjSzHP_(1SAw(^Tma07*ITVVPI*w?^ZV+t$aQve?v-^I>``-KBHCv=i
znCm&oZxW40^OVQS5-Ax(y=?b)sqdb-RfUxBC1aDxBtlDOp%$Db!3Z@D$c<<ko`|EE
zJ);$mpwV1ydQ~!+teB5z2qPPH>aeqoW(rNCMMP(tQB68d0%|->Z;E6NHJoDtdMuK;
zNT2`}W+|@I$LCn^q?`nmCMR73W6bC%AR-%~3>a||1+t9>lNHI1WRBWJsI~K$!vscE
z$n;3&D^ke{B_Jg%I3QpPSsDm}01?cF1Y#an5DsubNWcMM4g|752!TL^3j$*glk#T4
zv`C^XZp;_8i)89Z(u{C8Sy@@^EFPP%q;Vh^hB+XY!{xFl4VKkzBGGJ?$r?0nL55p3
z7QLC&6DGiE5mghJWF(Vf`YHsYS)q7s*km0`6qPbgHfrWTY>;C#I^!DEwvvhXzck*c
zZB^OLI42Re5}6haRS#{@IGD=a+Z{O-DK^Lgi=HY9YLF3{Oe1b0<+4a7b;HK=7$OAu
zToJAjvv^{N%fd8#F$?Akge)8u!(0JhBocxAaXW9q!+aUY1qD2*lt)z~Rv;F}@L@>C
zlgMI(Aj}nwW923*iJCO{xNkk>dko8cD;AMjaFir0DuOVKcY#tzkc3r7m;tGDwCX_U
zBE1PCvaBCD%k(O08E(<ra4gP37=h6|Bl<UR;AvpB2Erj03W>BVHO_}vVpM~%a7eAu
zYIy<?EaEZ8@Yw&&ABQ5vaW>0;nrHlo>PYAE^(auA*TaOHs0p%AqryMn;Z9B9M7d0&
z%I+T6nHryj`ZRxSwRKNC{H#pJ2ZLSd^<Z&)XiIThC{bUem564LQ+>+iG0Q*fXb6AA
zl%&;`uZmG@+M2q<yUhEJZgDaHa;dOzz3ui-{V&@}!nbzYYz~vdb<N$U5xs`qQ%~(L
z(}o%{j)f-~$}9e;Uw6q(AuU|8JHcaXaj3(;=y}TOg4?Ynj8fl2Jl>L=tOqT~6xGMb
z#d%<e#H#}F>`2OOIto`d&7R`Ae`?#0?`vV2Bo9?~-I=)Nv*8dwH>CjU^pB&LZ<>8&
z{r*P%?DWee1#vYSXe#>S`U{~)yL|T^7r4}&g_4d`CmW>29kqY!^B2AYcx=qyPP;m}
zYT5o^7C5g8J4hZ}|9p=lebK#$8-nJVkol%2do$D@9k;9U(46*3j^pLqIq=ZrJjcDj
z6`lSeUG~GBmmOAKuS?&Aiw_yYmBY7rZm~`3Fl#^_qsA>nD2{4eNl$T^pWsfOyCGTU
z+Le*(eKYWW|IpJ|vViVp&*?h(<wy=!8#FCdT1WR9etbrVgXd<5AJ`51yr&E@M?_`y
zCHI?4Wffj^=%fDDn_o#5AcJMftJjNEp1`GTcFw2Z&@U;qKi{h&J};;gpQ*A1R!nd2
z4di8>6zi~-cGGIQ*IiXP61Zb%b$-AJ_}0cF+@%}3U8c!zoO$ne>qa``Xc(h*?gJsv
zlQby%Z4Kjb)G;2bYR%-@19|Q%o)|`EwKvs8^lVw#*A?<`OZg8p>_AFkje(v&Yo7_o
zQ2Z*}U8PU8`GN0lcF~;oaf)w59?cogl>Yoj%>lm6*K!-#;OT1tCoTvI9AU(F#%@Pn
zu$;*lOrLo?VovG9HvY?enqNc1_qtWF%NX)o)eW)vBf<H$KT+h=yx_3Xv%}<;r60sy
z!WOfy8^1l}?o%1Dppc0UEGb$m-j&{?{3OBUW-gYzvwmSo``L7Es~+0caj|niz2n86
z_{Q@y1)E2tr+Y%<dbaNc2TC{hO*pi+t@;ZkV|rec<Vv-6si^iz%ZnMyX{EAo!>nlG
RU(R2TJT^ggIA;0Ue*nm3n>_#k

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/map_marker_blue.png b/OsmAnd/res/drawable-xhdpi/map_marker_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..744cebf0f7453f5be96f099e5dcddd13bb95cb90
GIT binary patch
literal 2511
zcmbVOdpK148pe#+cIdJrrJ4pCF=p0W%&gI17!2joG)Iy!X4WtnGnyF;(nHZxl#~j^
z4xuQCB)M0+<PvhLQM$+_w4>D7igK1p=ls#L|2S(sYpw6M*89HS_xmo-vkrN<IcaLF
z(oj-T(sX7rSn$&czI@ad!S{_h7v>jwG6yf&Rxw`|!I3~pbe=c>LOF+U0wET};YIFl
zf;K8CA;JZ0FPWF?W-3=4V!@fmSja;{VKyvdBM;?pgCQ9z016a{Xy}RRdNfMFqoKEv
zTyd_U_E3<386|<XM!B)MQNdi0hqkdsZIn}Cfe=W>LCHgeA}Li)Lx0t!!uI@YEE@F{
zA`7OWzXj#x>VdKsOCS`<!V<#;002b>EdUaQfG3%w@Hl{k#erA=hrt0<07u2+P~Q(U
z>`lVsQ&|kh@4ny_4ILztg;KHDh=>S_2!e%J5{Lyr5X9o}SUesBBQVlPk&Gk9h@=J!
z3Jgffl?Xy*0<j1+ugD1yhskJYIMQ!h2nls{{UI!peoqvfGOU~viUlli*pQI<eSJks
zWi05wVf+*=Wk-fWSQaD|he^0_J@^I-WH@*K>}VbcM?-a&2;ib{gbXn^ECdqCoEbDU
z{KbMN;887cL_8VdQZNJxfXDE-L<$BZk}NS0NCELABAHCa5f^lR#wXJO2S<Rxu(v0`
z)o>tD=pchax1-yGprt*LXt}_37D;6s5f@tUEr5N0=i2`xmufG8I5M$>EfxzGy1*ky
zEE7wE#GxpA`>$0;nQRk?c;X1D>3o^K?V15e1mO_RQ6dgOea$mf@RJw_TrhwOKmdjV
zkolMZhzMXP94-$70Rdb-pFkpmWCHp-pZEXf4+{r{oo|-^X`Y2wa7WIYKSlvw{1_%k
z1W%9z9u*@~^a>><)d^<?oh|Qs?IRX0hxEVnUkko|tqXtPHnhHyle@$@#e{N%PT$;s
zqz~vS)K&%<j;R&o{wbz%Tdhq9DMA(g!65Wqb-;c(Bf#<Sz~L!v1Cc>erR(<V`NjQJ
z|85(JsI?pI4ePjETU}Q_xV>beKl(3P%-;Hu7;%JgVUbH=Zo%-)MKv|*l=r`@Qo5h+
z<wqCQ{cGm)iI!K9y)n0AhV(?&t&-Ed>ZvKc8s?~^yPKOz-=3|gSl<1l23uFFL($&1
zO4+^c__>7kk#lWrZDtdVq8$!~&JJFe0#)~CM>S-m4I1{IKc?nekP{YdDjUb|wNeX0
zTEu3bR{~4!9WxZL9y0`_$cMy^$+3r}K6hMw_FE(OBI&_Xp5R-+w^V<_uG|MR<E8_r
z8(q!Mr%q{?1S3uj<x7@XX8ZT-s;bFJ*wZr3++A7uVT<Qd^<AnuUZ*nk%vy)D8wQMD
zy?d$lw(1aDVbPeWi6p7~QR8y4&~EoBTl!;qXPk4}qJ3k^flp11fyzZjQp+Xfswu^O
zQWj%bpw*>^dDkLOdYWbx^V4#&FcA`d;6-0<P+&{s<<$yBnYXl4R&lH50!V%(+^Gn+
zyzQoS<hk&`S#YFN(Yo7v{Zqx8r>97PgdR}$zT%Xy?ex`*ck$iCw%#+&frJl=D$~sS
zsj$^b39QJ(WL-U0VAF1O$34B2TfQSMSw&1fIV(%i|GcKO!1_7qIWu}j&j{O8s`|w!
zqEU@4drQ=Qc0+)aBOZ}GW*}VuXFpv~k#603K_`B8aBMa`u{t^Rw~UUvi4D=V2&P_J
z_ei=6$TCFQxy7cRLz!gXpoaeT2*LV<{~S4tQcJ{)(H!2K-EocG`7+p_%p6TGK1$jM
zw$--_!V;1$uU%8c>f_H`)!fu3(?SNE5bjaCeT?u}i{~OK8?r4x8;{vGk^;(J*j{yX
za~$ymC8*nG#)lBK8Z5U}g<qhscp*{^@8hl46u0=Ce&iFU%YHUF15<t}dGVSrY{3%H
zF+BT8eowd7`xTRkTl7tg1(1$f^Dggv>aS_zEi+Qb<dN#@g_8r<Q}xyJkWDJbJnx&n
zro|jV#GT-jdF1VoCSQR~>oWhmeEpQN1atiZ)z*#g_BTv3NBFp{ri~Zov@DU}N1fbZ
z^`V2O4LV)&PNJN;^|wfopxyWLR<ncmq4H${qkBsS)g=tNj_US#P>O*@naMrAaUk{D
zWEFdf0D5r6czxXC;8>?vqptUJi>Hs|{%u~4;Ite^ur^G-Q<)@sQ1^dX9X6?Y+&5b_
zNX24%!7%fId~K4h$*0#ZJ6E~?Qd@pypS5>XbmzX-arx?}p2n#&;mS4Gu957Wi8{v-
z4W6P$Y+n~Evym>Bqi5KOz9xMq2KzcbKx?Be3AJo)Ce*Ea+x4Y>(W^(<X=k66rRBEY
zD15my9W1T@fP}Km_meIXB}^N%YAd4vEML+)wKY%A%y!tN9o>g(-(<CSA_s6#6g|xO
z`+lb9Y|x6Rk>rHbgTHV&K3nb;&rQ>4wcXEbvN6>i!`e>eA8OW!OU9a`b!R%cX&GIK
zTN6tR!WYwI+8{Kl0dn-s*HzkF>d0X#XXOU3Gx&6c>gewBa<EKsFC^{3wqgAvZ#=dL
z-jHox4Y0EKp2^`?Z<XH6sl2sX^?Wx{r`K%mK}_??6>$}I{tkxBi?@{B)`Y|`YWs{i
ze*OGyT93mC_28a|=sx+TQNy8WgQXe)Akx9a%k114#0Iki-pfu-eYEi{`fHX@F}KFU
zEh(dkGdc9p>IO&p(I={)Eb~pRBERSO5+)}ho|wQG*NC_hr>@qJ@I*OtwWh~ZKK;}C
zqFvL#Tzlc~f226i_J>)Gls295E*^RT+_gBIZ*+&fbI|Z;t<r`=ZI&u7@ijTPFtx@}
zUBB42<WHlo4`M6a>t=*Utyi*LY1@ae>kzri<iD=$9Dn!0pE<E3LpaCZe`302EVbp&
x8$DUJdZDRxdM)wdJ2M77PnuhsKl;TgD?L&zDh<~pADI8ea&~ZIT(<My_aBc)A3y*A

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/map_marker_green.png b/OsmAnd/res/drawable-xhdpi/map_marker_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab67dfbac7ecd82481b73a9fb0a02d67e5b8c750
GIT binary patch
literal 2498
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/map_marker_orange.png b/OsmAnd/res/drawable-xhdpi/map_marker_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebcea8544f5422a9a218ada61eba218a562d8dcc
GIT binary patch
literal 2535
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
ZB#grTkg%)a?Zb&*FSffMtBSEE<v+|%8kPV6

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/map_marker_red.png b/OsmAnd/res/drawable-xhdpi/map_marker_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..0af8e80adfbdafe52fd5071da9d74dd58b008c26
GIT binary patch
literal 2455
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/map_marker_yellow.png b/OsmAnd/res/drawable-xhdpi/map_marker_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..8337466794e184987cbd580534b584d642d5dec7
GIT binary patch
literal 2511
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/map_marker_blue.png b/OsmAnd/res/drawable-xxhdpi/map_marker_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a5015e18937e379e5ae59029f5251110cec0d6a
GIT binary patch
literal 3255
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/map_marker_green.png b/OsmAnd/res/drawable-xxhdpi/map_marker_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..236e007fa6a6fb714363c31084ac926e488ebcd5
GIT binary patch
literal 3261
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/map_marker_orange.png b/OsmAnd/res/drawable-xxhdpi/map_marker_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..bba7856b1c0730c2f0033a8ea2c488a0f56436b2
GIT binary patch
literal 3274
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
U@SZZ4mA?x|dkXoMoqxi=0gY6G4gdfE

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/map_marker_red.png b/OsmAnd/res/drawable-xxhdpi/map_marker_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..06177338b125a377fa70f83bd09757045b2f556c
GIT binary patch
literal 3213
zcmbVPX*iVY8-FdKFv(KZjL9;kF=jJM_Cb+lY=u(B%or217=xim93*logKW_mWQlB%
zq?2f~923fEs7^^_Np&jG;y+r>IUmk-KK$S7df(@M?&tTr@B6uz4{tijeY^4+?KJ=Z
zC_C?P@RF<tB=0c=Imy?a_E<x*Xz?8Vc;4&~UJRK_1MH~mU>ew&Nv6}hXk=<^#2uO?
z0LVl$eEfKRZmt9hn`uT~!I<%x90?l$EN%E4G9`@00|(RS43-sSzWrASm_fCI?8dm6
zyK#uLP{xipF3mg6-G>qvM!{1dHr8NEK0#uDN#l{hd}cT+lEAlue6>rE$SZ0%1pF1k
z3$ucJ3(C)p1SYb%G%&`@0!Bd~5MV6c41vL+keIDtq&WfuH^;*f<}h;v0bx!+nuEVT
z5Q#S~HH6^h;Pl;>WM>5l<?%QKI6NjM#w-S9#^%!D2s|DSH%G#eNSFixi;QLQ$b1+p
za?=kB4zx%Lm%-sN*evjhMRG7Zif09pMEdOtOpcq|Uxrzc-xDQC8Jth%z!7HVa3*u*
zUSH9XJTKbcVf-sP(kGTfgL}~;*->1Iq#hxgevl=(`)@}pKuI(N4=zJe6mqx&n-ayO
zv3Sl7RuIXF8I?gLSeT=cSQ-TfL*Woe7?py?!SHB|1&oHr;gJ|L7K=4U|FH9~d`CPA
zYmdhfi6}`m95HrS2ZWP_9S(&-+oO;~;t#GfE0RZMQD{GWGgf?m<6{4lOCWM-WFDLA
z!)Ay7=mJtGo5zj}Wpltp;@7H!p}QF@Dmx}}^Gcb%-P(c1Wkl1cPFyw<{58)6#=pdX
zqTqum2pR%LMqoo=!89}ih9gs`Fd8D55)y*KVDVTK<U61G|K<-a2@1Z_EdOYpA1X;l
zu84n)f@Jg8Fwt0&3F1mdMVx*^695!yogM6a_~O~(*l-_T^_v4*AI=5ufie?!*~$d?
z2RkqXve&)FY?F6NB`-6ct;KAWOHXw;qTramo*3-YVvjLAs%d(^vMONQUL_2g0V_X|
zYrp5RD2jkepsyz={aI05$Htp1zIoJlW#MK2=l-^Zg9{z`bS|NIxa4+EL5D(yN9i!2
zA7fv$)8$yq(qU3DCc9aeVRSfiN859$*&5mOP0~FweGf(aQ<@w<`T7frUgRg9)ipK3
z_wS>RWo1=7dq(Z~EupWy-(^bcT2B`jg*@+BaOeZ7N5jp{&1c^}_ww>`A5Txa{{DWf
z^}(aFRLHUG(*aX9z@82Pq^tbFcEG2epA-JpEXvau|AD3|P%M@?PdnjXu-~W@XABHF
zT@wSxP4Xh1AWZd_6ziX_md;6hb5jWz1))A58@E1C4wv(h^-B@)?9Qr^bTu!8n%%5j
z3xuzV^3K%pv*790M-!i_+yi=aW{q<JpN*HhZZ$Mtp6LX=Mh7udRAu{B5|R0?pT+R?
zS{GGIab2JEAVKLw-Eh+9;)kzph5~A7l}|HO(<&QQK3*sTkmvT&Zi53#0-VF~Bh$%5
z%NlxG<(3hwZQAKNiR3aeqMvrjWfJ7sq%|?GGC4J7FkNjk(nK7dxK^`0t#T330|j|*
zpa|CK{!)i>@c`ZB<gIO<R#CqD?nS48cJ<6qBM}|$#OOEBwiYJgyLlRThqgVKqr^Vt
zKUA6;LpInCtr9rtKIJTXIoc|V45aVxg4)?Kx((jIeM>n~<?GTE{O~9IZL1y|Yz&gf
zfBML~tex~sCR@fGu30AQWhPI(u-qcR{XD<84^3taEOe}ilOgzddCijaphDWPui;MX
zf|t7+PfVJ|DT`$%q)3w_!DcND`({8yzP2dWe}68aMsG<Wj$V0q2g@jZpHMLvr&M*%
z>Mf_WML$k0u{u=<lHTIyA@x}nS0c=xj=R#?Y6+4Or9U~Jk?3_)&0Jwo-6_W^QL}Fb
z@IkA-TZdYgl)cSCFY9D=9#zno9hPX(lr2;G+sV3;CxInN+2b~&Vp-ej#hu`;==jbe
zUBI`h_G)TxWso~4(Y^BGqf~97K%&*C>UfztwKP2atZZiH;hlH|+rWTnWnR8#Km<3n
zA6kpYcjd3HCE$ri1{<?cvd~o~tsA$9j%5#B%ok;650&SOgxN#BBj@NQ=M+g!9BzSp
z`5({jONkb!B9aDFh{yN0T{XR3BqPV;7DU85#c-?Vm(+{Ktfyd`@c4Vt@peUHalq0Z
zPG#wgn#s90bsj}Ua<+4}a_QMRMVf>Ab-z4K?RIDBpc~4{`0ch{=kkB=a%WvicnvOH
zVi*Hcs~Ew`ym(b@>nD0u@}Qkg&Y|*xPw_{bY_;CaE0)b<tB|B!>}{PDpi)K#rLuyb
z5>I{CWGX=Ot@1J@TRB;y5uu^bP*!lsdbO7DZ_wV7pDtOi@FYhoJXL9z6-%q7jQ*)v
zwfgG&;gK1SN6dI51FiCz`qUH7tNr?tD(qqwB3e5{o2Lxl>KHE5tkp{a6TOTHQSg-Y
zZPll*OBVcFiMJy9Hu-Jj5Q=jKKgr0Z+&px8Y`N@;sP$k`iMoe3MabZ~s>h4dk`Esm
zkR?16yDv94dwRyJ5zoB1I|?1w%-sXb(mPckQ1rev>)S+Y<_`{JIVYWBu!42{<NL0i
zV|M6U%72U%j=m_<*DiRG(HrH%X*=@-9(>j{Vg0Z+P@|z652VNy{_H3v;1}Mohaca0
z7Nb?wJ(KLE0*2c<HAcJsRyx+BEsko)ts9;DRL+;3m;~;}BpDu^A#RG;uz(>3SQ1Vq
z95&CkaM#sQQGLvQ#(8w0OD09nzk77)v9SBr#CRlr@5Veuy?4Vzhzb<#uAM7?_Eio;
z2wi^UEZC@ZR^h15W4Ty)v-XDxLvz8O#2=NXc$ZpzrEgAfV)vTm4ZM3byd7feRGZ8?
zyv68bw0j#df*8^{u7pj{3CcvamE7k%?|V?#Vrsf=F2ML?azMQvyZ7U(t1hj}5p8>|
zN4mWA(}B|5S3O}bs(Mb~3U3$djlDYlFuLG5$3`V+;7q)ae{5%tvxdgx>$qQMK38SA
zSI;!IwM@kG_gkk9))rV#z}Ib+D#9(0#^#0x+DagOM{a4SnG}lkK<GnQ%mbkJW$D2A
z2;Lpt=-&4XkPd9-Kp9RKE;sIZ=yZze`CZ45g@F|i5~3)|+2+fgn!qWSO|t#9TE1PT
z=K@CU#R#RglQNo3;kD}X&FyEdubZzQl4+TF%e#dcnLO*@@3DwUGOD*)R*jqZtcYpG
zMxMH^lu`(#6VZ*=k92J1!*%^%RW>CzGUu>GV0y+Xt?p5$r;cdk7O_dT;5qGaJ12Qy
zU8m}$8A{$e_}XW)R|QHbtslo5Dii~QHe48Y<6HkMjEn<K$pv>Jl}w+2)j%Y&-<GI@
zH9h7nzWXQcg^`ReUp-(qE`O}{;^e0Z(~UJBu7va!kB43<ag2#8($|r0zg4kqbN!q}
zEHdM)zpL@?_xX!C>9_N|eYcy`+Qgj9+RNY^cN3{q4j?*z0eT__FJFta&e06JD9WIC
zhccbC`x5bBbGnNBq+*{sK+?&)-O_VF995MYa5-=?(A6cxcuBg4UdP_nM(+!3u*Br&
zRv5NDU)m}qr%6}Y@uf-KawMj*<;<I~=|eU>X}fy&?pG*1l=ymfQ7-fdyAbZ`Qp#w!
z%iHa$UcNnb==4#}?<~a#xi=rWD4KMIl5O{*#g(doqYv&!6CMmY-I~_<ytv-3kd)96
zG-U$S4^nI3gW^;R>}1*@ecoE1%0yixsUBF~bA3Znf{34$cHxzKT7|6^shTb}$r{_B
z5qpjC{!(ji_gdu}n^n69exESCqWlIm_~pj3v=RW?Yj``pY2oI|4}!C!yF;CQP}2VZ
DW_U=$

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/map_marker_yellow.png b/OsmAnd/res/drawable-xxhdpi/map_marker_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a10d4157db4bf11ebc7a3e748e57ecd83edf859
GIT binary patch
literal 3262
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
T?L*t*ABC3(g?QCH^w56+Byx)9

literal 0
HcmV?d00001


From 201af02431f0cf4499694023e3a5f6ee2461d300 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Fri, 5 Feb 2016 21:41:25 +0300
Subject: [PATCH 03/18] Markers in progress

---
 OsmAnd/res/layout/map_markers.xml             |  14 ++
 OsmAnd/res/values/strings.xml                 |   3 +
 .../src/net/osmand/plus/AppInitializer.java   |   1 +
 .../src/net/osmand/plus/MapMarkersHelper.java | 224 ++++++++++++++++++
 .../net/osmand/plus/OsmandApplication.java    |   5 +
 .../src/net/osmand/plus/OsmandSettings.java   |  32 ++-
 .../plus/activities/MapActivityLayers.java    |   5 +
 .../plus/activities/MapMarkersActivity.java   | 201 ++++++++++++++++
 .../plus/base/MapViewTrackingUtilities.java   |  15 +-
 .../plus/mapcontextmenu/MenuController.java   |   5 +
 .../controllers/MapMarkerMenuController.java  |  74 ++++++
 .../osmand/plus/views/MapMarkersLayer.java    | 159 +++++++++++++
 12 files changed, 725 insertions(+), 13 deletions(-)
 create mode 100644 OsmAnd/res/layout/map_markers.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
 create mode 100644 OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
 create mode 100644 OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
 create mode 100644 OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java

diff --git a/OsmAnd/res/layout/map_markers.xml b/OsmAnd/res/layout/map_markers.xml
new file mode 100644
index 0000000000..885ad6464f
--- /dev/null
+++ b/OsmAnd/res/layout/map_markers.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <net.osmand.plus.views.controls.DynamicListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/waypoint_reached"/>
+</LinearLayout>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 413fa3077f..abd958b898 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,9 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="active_markers">Active markers</string>
+    <string name="map_markers">Map markers</string>
+    <string name="map_marker">Map marker</string>
     <string name="show_polygons">Show polygons</string>
     <string name="underlay_transparency">Underlay transparency</string>
     <string name="find_parking">Find a parking</string>
diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index a7c3c33587..7c6b2c5a28 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -342,6 +342,7 @@ public class AppInitializer implements IProgress {
 		app.rendererRegistry = startupInit(new RendererRegistry(app), RendererRegistry.class);
 		app.geocodingLookupService = startupInit(new GeocodingLookupService(app), GeocodingLookupService.class);
 		app.targetPointsHelper = startupInit(new TargetPointsHelper(app), TargetPointsHelper.class);
+		app.mapMarkersHelper = startupInit(new MapMarkersHelper(app), MapMarkersHelper.class);
 	}
 
 
diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
new file mode 100644
index 0000000000..1fd859c3b2
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -0,0 +1,224 @@
+package net.osmand.plus;
+
+import android.content.Context;
+
+import net.osmand.StateChangedListener;
+import net.osmand.data.LatLon;
+import net.osmand.data.LocationPoint;
+import net.osmand.data.PointDescription;
+import net.osmand.plus.GeocodingLookupService;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MapMarkersHelper {
+	private List<MapMarker> mapMarkers = new ArrayList<>();
+	private List<MapMarker> mapMarkersHistory = new ArrayList<>();
+	private OsmandSettings settings;
+	private List<StateChangedListener<Void>> listeners = new ArrayList<StateChangedListener<Void>>();
+	private OsmandApplication ctx;
+
+	public static class MapMarker implements LocationPoint {
+		public LatLon point;
+		private PointDescription pointDescription;
+		public int colorIndex;
+		public int index;
+
+		public MapMarker(LatLon point, PointDescription name, int colorIndex) {
+			this.point = point;
+			this.pointDescription = name;
+			this.colorIndex = colorIndex;
+		}
+
+		public MapMarker(LatLon point, PointDescription name, int colorIndex, int index) {
+			this.point = point;
+			this.pointDescription = name;
+			this.colorIndex = colorIndex;
+			this.index = index;
+		}
+
+		public PointDescription getPointDescription(Context ctx) {
+			return new PointDescription(PointDescription.POINT_TYPE_MAP_MARKER, ctx.getString(R.string.map_marker, ""),
+					getOnlyName());
+		}
+
+		public PointDescription getOriginalPointDescription() {
+			return pointDescription;
+		}
+
+		public String getOnlyName() {
+			return pointDescription == null ? "" : pointDescription.getName();
+		}
+
+		public boolean isSearchingAddress(Context ctx) {
+			return pointDescription != null && pointDescription.isSearchingAddress(ctx);
+		}
+
+		public static MapMarker create(LatLon point, PointDescription name, int color) {
+			if (point != null) {
+				return new MapMarker(point, name, color);
+			}
+			return null;
+		}
+
+		public double getLatitude() {
+			return point.getLatitude();
+		}
+
+		public double getLongitude() {
+			return point.getLongitude();
+		}
+
+		public int getColorIndex() {
+			return colorIndex;
+		}
+
+		@Override
+		public int getColor() {
+			return 0;
+		}
+
+		@Override
+		public boolean isVisible() {
+			return false;
+		}
+
+	}
+
+	public MapMarkersHelper(OsmandApplication ctx) {
+		this.ctx = ctx;
+		this.settings = ctx.getSettings();
+		readFromSettings();
+	}
+
+	private void readFromSettings() {
+		mapMarkers.clear();
+		mapMarkersHistory.clear();
+		List<LatLon> ips = settings.getMapMarkersPoints();
+		List<String> desc = settings.getMapMarkersPointDescriptions(ips.size());
+		List<Integer> colors = settings.getMapMarkersColors(ips.size());
+		for (int i = 0; i < ips.size(); i++) {
+			final MapMarker mapMarker = new MapMarker(ips.get(i),
+					PointDescription.deserializeFromString(desc.get(i), ips.get(i)), colors.get(i), i);
+			mapMarkers.add(mapMarker);
+			lookupAddress(mapMarker, false);
+		}
+		ips = settings.getMapMarkersHistoryPoints();
+		desc = settings.getMapMarkersHistoryPointDescriptions(ips.size());
+		colors = settings.getMapMarkersHistoryColors(ips.size());
+		for (int i = 0; i < ips.size(); i++) {
+			final MapMarker mapMarker = new MapMarker(ips.get(i),
+					PointDescription.deserializeFromString(desc.get(i), ips.get(i)), colors.get(i), i);
+			mapMarkersHistory.add(mapMarker);
+			lookupAddress(mapMarker, true);
+		}
+	}
+
+	private void lookupAddress(final MapMarker mapMarker, final boolean history) {
+		if (mapMarker != null && mapMarker.pointDescription.isSearchingAddress(ctx)) {
+			cancelPointAddressRequests(mapMarker.point);
+			GeocodingLookupService.AddressLookupRequest lookupRequest = new GeocodingLookupService.AddressLookupRequest(mapMarker.point, new GeocodingLookupService.OnAddressLookupResult() {
+				@Override
+				public void geocodingDone(String address) {
+					mapMarker.pointDescription.setName(address);
+					if (history) {
+						settings.updateMapMarkerHistory(mapMarker.point.getLatitude(), mapMarker.point.getLongitude(),
+								mapMarker.pointDescription, mapMarker.colorIndex);
+					} else {
+						settings.updateMapMarker(mapMarker.point.getLatitude(), mapMarker.point.getLongitude(),
+								mapMarker.pointDescription, mapMarker.colorIndex);
+					}
+					refresh();
+				}
+			}, null);
+			ctx.getGeocodingLookupService().lookupAddress(lookupRequest);
+		}
+	}
+
+	public void removeMapMarker(int index) {
+		settings.deleteMapMarker(index);
+		MapMarker mapMarker = mapMarkers.remove(index);
+		cancelPointAddressRequests(mapMarker.point);
+		int ind = 0;
+		for (MapMarker marker : mapMarkers) {
+			marker.index = ind++;
+		}
+		refresh();
+	}
+
+	public List<MapMarker> getActiveMapMarkers() {
+		return mapMarkers;
+	}
+
+	public List<MapMarker> getMapMarkersHistory() {
+		return mapMarkersHistory;
+	}
+
+	public List<LatLon> getActiveMarkersLatLon() {
+		List<LatLon> list = new ArrayList<LatLon>();
+		for (MapMarker m : this.mapMarkers) {
+			list.add(m.point);
+		}
+		return list;
+	}
+
+	public List<LatLon> getMarkersHistoryLatLon() {
+		List<LatLon> list = new ArrayList<LatLon>();
+		for (MapMarker m : this.mapMarkersHistory) {
+			list.add(m.point);
+		}
+		return list;
+	}
+
+	public void removeActiveMarkers() {
+		cancelAddressRequests();
+
+		settings.clearIntermediatePoints();
+		mapMarkers.clear();
+		readFromSettings();
+		refresh();
+	}
+
+	public void removeMarkersHistory() {
+		cancelAddressRequests();
+
+		settings.clearIntermediatePoints();
+		mapMarkersHistory.clear();
+		readFromSettings();
+		refresh();
+	}
+
+	public void addListener(StateChangedListener<Void> l) {
+		listeners.add(l);
+	}
+
+	private void updateListeners() {
+		for (StateChangedListener<Void> l : listeners) {
+			l.stateChanged(null);
+		}
+	}
+
+	public void refresh() {
+		updateListeners();
+	}
+
+	private void cancelAddressRequests() {
+		List<LatLon> list = getActiveMarkersLatLon();
+		for (LatLon latLon : list) {
+			cancelPointAddressRequests(latLon);
+		}
+		list = getMarkersHistoryLatLon();
+		for (LatLon latLon : list) {
+			cancelPointAddressRequests(latLon);
+		}
+	}
+
+	private void cancelPointAddressRequests(LatLon latLon) {
+		if (latLon != null) {
+			ctx.getGeocodingLookupService().cancel(latLon);
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index 23c41644d1..4e8b6b828a 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -91,6 +91,7 @@ public class OsmandApplication extends MultiDexApplication {
 	NotificationHelper notificationHelper;
 	LiveMonitoringHelper liveMonitoringHelper;
 	TargetPointsHelper targetPointsHelper;
+	MapMarkersHelper mapMarkersHelper;
 	WaypointHelper waypointHelper;
 	DownloadIndexesThread downloadIndexesThread;
 	AvoidSpecificRoads avoidSpecificRoads;
@@ -540,6 +541,10 @@ public class OsmandApplication extends MultiDexApplication {
 		return targetPointsHelper;
 	}
 
+	public MapMarkersHelper getMapMarkersHelper() {
+		return mapMarkersHelper;
+	}
+
 	public void showShortToastMessage(final int msgId, final Object... args) {
 		uiHandler.post(new Runnable() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 7df5f81a9c..7530e57995 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1574,13 +1574,13 @@ public class OsmandSettings {
 		}
 
 		public boolean insertPoint(double latitude, double longitude,
-								   PointDescription historyDescription, int color, int index) {
+								   PointDescription historyDescription, int colorIndex, int index) {
 			List<LatLon> ps = getPoints();
 			List<String> ds = getPointDescriptions(ps.size());
 			List<Integer> cs = getColors(ps.size());
 			ps.add(index, new LatLon(latitude, longitude));
 			ds.add(index, PointDescription.serializeToString(historyDescription));
-			cs.add(index, color);
+			cs.add(index, colorIndex);
 			if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
 				SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
 			}
@@ -1588,13 +1588,13 @@ public class OsmandSettings {
 		}
 
 		public boolean updatePoint(double latitude, double longitude,
-								   PointDescription historyDescription, int color) {
+								   PointDescription historyDescription, int colorIndex) {
 			List<LatLon> ps = getPoints();
 			List<String> ds = getPointDescriptions(ps.size());
 			List<Integer> cs = getColors(ps.size());
 			int i = ps.indexOf(new LatLon(latitude, longitude));
 			ds.set(i, PointDescription.serializeToString(historyDescription));
-			cs.set(i, color);
+			cs.set(i, colorIndex);
 			if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
 				SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
 			}
@@ -1787,18 +1787,22 @@ public class OsmandSettings {
 		return mapMarkersStorage.getPointDescriptions(sz);
 	}
 
+	public List<Integer> getMapMarkersColors(int sz) {
+		return mapMarkersStorage.getColors(sz);
+	}
+
 	public List<LatLon> getMapMarkersPoints() {
 		return mapMarkersStorage.getPoints();
 	}
 
 	public boolean insertMapMarker(double latitude, double longitude,
-								   PointDescription historyDescription, int color, int index) {
-		return mapMarkersStorage.insertPoint(latitude, longitude, historyDescription, color, index);
+								   PointDescription historyDescription, int colorIndex, int index) {
+		return mapMarkersStorage.insertPoint(latitude, longitude, historyDescription, colorIndex, index);
 	}
 
 	public boolean updateMapMarker(double latitude, double longitude,
-								   PointDescription historyDescription, int color) {
-		return mapMarkersStorage.updatePoint(latitude, longitude, historyDescription, color);
+								   PointDescription historyDescription, int colorIndex) {
+		return mapMarkersStorage.updatePoint(latitude, longitude, historyDescription, colorIndex);
 	}
 
 	public boolean deleteMapMarker(int index) {
@@ -1814,18 +1818,22 @@ public class OsmandSettings {
 		return mapMarkersHistoryStorage.getPointDescriptions(sz);
 	}
 
+	public List<Integer> getMapMarkersHistoryColors(int sz) {
+		return mapMarkersHistoryStorage.getColors(sz);
+	}
+
 	public List<LatLon> getMapMarkersHistoryPoints() {
 		return mapMarkersHistoryStorage.getPoints();
 	}
 
 	public boolean insertMapMarkerHistory(double latitude, double longitude,
-										  PointDescription historyDescription, int color, int index) {
-		return mapMarkersHistoryStorage.insertPoint(latitude, longitude, historyDescription, color, index);
+										  PointDescription historyDescription, int colorIndex, int index) {
+		return mapMarkersHistoryStorage.insertPoint(latitude, longitude, historyDescription, colorIndex, index);
 	}
 
 	public boolean updateMapMarkerHistory(double latitude, double longitude,
-										  PointDescription historyDescription, int color) {
-		return mapMarkersHistoryStorage.updatePoint(latitude, longitude, historyDescription, color);
+										  PointDescription historyDescription, int colorIndex) {
+		return mapMarkersHistoryStorage.updatePoint(latitude, longitude, historyDescription, colorIndex);
 	}
 
 	public boolean deleteMapMarkerHistory(int index) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index 5c2c36fbab..868e0333b0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -38,6 +38,7 @@ import net.osmand.plus.views.GPXLayer;
 import net.osmand.plus.views.ImpassableRoadsLayer;
 import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.MapInfoLayer;
+import net.osmand.plus.views.MapMarkersLayer;
 import net.osmand.plus.views.MapTextLayer;
 import net.osmand.plus.views.MapTileLayer;
 import net.osmand.plus.views.OsmandMapTileView;
@@ -72,6 +73,7 @@ public class MapActivityLayers {
 	private TransportInfoLayer transportInfoLayer;
 	private PointLocationLayer locationLayer;
 	private PointNavigationLayer navigationLayer;
+	private MapMarkersLayer mapMarkersLayer;
 	private ImpassableRoadsLayer impassableRoadsLayer;
 	private MapInfoLayer mapInfoLayer;
 	private MapTextLayer mapTextLayer;
@@ -143,6 +145,9 @@ public class MapActivityLayers {
 		// 7. point navigation layer
 		navigationLayer = new PointNavigationLayer(activity);
 		mapView.addLayer(navigationLayer, 7);
+		// 7.3 map markers layer
+		mapMarkersLayer = new MapMarkersLayer(activity);
+		mapView.addLayer(mapMarkersLayer, 7.3f);
 		// 7.5 Impassible roads
 		impassableRoadsLayer = new ImpassableRoadsLayer(activity);
 		mapView.addLayer(impassableRoadsLayer, 7.5f);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
new file mode 100644
index 0000000000..605990e7e1
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
@@ -0,0 +1,201 @@
+package net.osmand.plus.activities;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.CompoundButton;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.plus.GeocodingLookupService;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.MapMarkersHelper.MapMarker;
+import net.osmand.plus.R;
+import net.osmand.plus.helpers.WaypointHelper;
+import net.osmand.plus.views.controls.StableArrayAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MapMarkersActivity extends OsmandListActivity {
+
+	public static final int ACTIVE_MARKERS = 0;
+	public static final int MARKERS_HISTORY = 1;
+
+	private boolean nightMode;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		getMyApplication().applyTheme(this);
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.map_markers);
+		getSupportActionBar().setTitle(R.string.map_markers);
+
+		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		setListAdapter(getMapMarkersListAdapter());
+	}
+
+	@Override
+	public StableArrayAdapter getListAdapter() {
+		return (StableArrayAdapter) super.getListAdapter();
+	}
+
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		getListAdapter().getItem(position);
+		//
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		getListAdapter().notifyDataSetChanged();
+	}
+
+	public StableArrayAdapter getMapMarkersListAdapter() {
+
+		final List<Object> objects = getListObjects();
+		List<Object> activeObjects = getActiveObjects(objects);
+
+		final StableArrayAdapter listAdapter = new StableArrayAdapter(getMyApplication(),
+				R.layout.waypoint_reached, R.id.title, objects, activeObjects) {
+
+			@Override
+			public void buildDividers() {
+				dividers = getCustomDividers(ctx, getObjects(), nightMode);
+			}
+
+			@Override
+			public View getView(final int position, View convertView, ViewGroup parent) {
+				// User super class to create the View
+				View v = convertView;
+				final ArrayAdapter<Object> thisAdapter = this;
+				Object obj = getItem(position);
+				boolean labelView = (obj instanceof Integer);
+				boolean topDividerView = (obj instanceof Boolean) && ((Boolean) obj);
+				boolean bottomDividerView = (obj instanceof Boolean) && !((Boolean) obj);
+				if (labelView) {
+					v = createItemForCategory(ctx, (Integer) obj, running, position, thisAdapter, nightMode);
+					AndroidUtils.setListItemBackground(MapMarkersActivity.this, v, nightMode);
+				} else if (topDividerView) {
+					v = ctx.getLayoutInflater().inflate(R.layout.card_top_divider, null);
+				} else if (bottomDividerView) {
+					v = ctx.getLayoutInflater().inflate(R.layout.card_bottom_divider, null);
+				} else if (obj instanceof MapMarker) {
+					MapMarker marker = (MapMarker) obj;
+					v = updateWaypointItemView(edit, deletedPoints, app, ctx, helper, v, marker, this,
+							nightMode, flat);
+					AndroidUtils.setListItemBackground(MapMarkersActivity.this, v, nightMode);
+				}
+				return v;
+			}
+		};
+
+		for (Object p : objects) {
+			if (p instanceof MapMarker) {
+				final MapMarker marker = (MapMarker) p;
+				if (marker.getOriginalPointDescription() != null
+						&& marker.getOriginalPointDescription().isSearchingAddress(this)) {
+					GeocodingLookupService.AddressLookupRequest lookupRequest
+							= new GeocodingLookupService.AddressLookupRequest(marker.point, new GeocodingLookupService.OnAddressLookupResult() {
+						@Override
+						public void geocodingDone(String address) {
+							if (helperCallbacks != null) {
+								helperCallbacks.reloadAdapter();
+							} else {
+								reloadListAdapter(listAdapter);
+							}
+						}
+					}, null);
+					getMyApplication().getGeocodingLookupService().lookupAddress(lookupRequest);
+				}
+			}
+		}
+
+		return listAdapter;
+	}
+
+	protected View createItemForCategory(final int type, final int position, final ArrayAdapter<Object> thisAdapter, boolean nightMode) {
+		View v = getLayoutInflater().inflate(R.layout.waypoint_header, null);
+		final CompoundButton btn = (CompoundButton) v.findViewById(R.id.check_item);
+		btn.setVisibility(waypointHelper.isTypeConfigurable(type) ? View.VISIBLE : View.GONE);
+		btn.setOnCheckedChangeListener(null);
+		final boolean checked = waypointHelper.isTypeEnabled(type);
+		btn.setChecked(checked);
+		btn.setEnabled(running[0] == -1);
+		v.findViewById(R.id.ProgressBar).setVisibility(position == running[0] ? View.VISIBLE : View.GONE);
+		btn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+				running[0] = position;
+				thisAdapter.notifyDataSetInvalidated();
+				if (type == WaypointHelper.POI && isChecked) {
+					selectPoi(running, thisAdapter, type, isChecked, ctx);
+				} else {
+					enableType(running, thisAdapter, type, isChecked);
+				}
+			}
+
+		});
+
+		TextView tv = (TextView) v.findViewById(R.id.header_text);
+		AndroidUtils.setTextPrimaryColor(mapActivity, tv, nightMode);
+		tv.setText(getHeader(type, checked, ctx));
+		return v;
+	}
+
+	protected String getHeader(int type) {
+		String str = getString(R.string.map_markers);
+		switch (type) {
+			case ACTIVE_MARKERS:
+				str = getString(R.string.active_markers);
+				break;
+			case MARKERS_HISTORY:
+				str = getString(R.string.shared_string_history);
+				break;
+		}
+		return str;
+	}
+
+
+	//LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
+	//int dist = (int) (MapUtils.getDistance(marker.getLatitude(), marker.getLongitude(),
+	//lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+
+	protected List<Object> getListObjects() {
+		final List<Object> objects = new ArrayList<>();
+		final MapMarkersHelper markersHelper = getMyApplication().getMapMarkersHelper();
+
+		List<MapMarker> activeMarkers = markersHelper.getActiveMapMarkers();
+		if (activeMarkers.size() > 0) {
+			objects.add(true);
+			objects.add(ACTIVE_MARKERS);
+			objects.addAll(activeMarkers);
+			objects.add(false);
+		}
+
+		List<MapMarker> markersHistory = markersHelper.getMapMarkersHistory();
+		if (markersHistory.size() > 0) {
+			objects.add(true);
+			objects.add(MARKERS_HISTORY);
+			objects.addAll(markersHistory);
+			objects.add(false);
+		}
+
+		return objects;
+	}
+
+	private List<Object> getActiveObjects(List<Object> objects) {
+		List<Object> activeObjects = new ArrayList<>();
+		for (Object obj : objects) {
+			if (obj instanceof MapMarker) {
+				activeObjects.add(obj);
+			}
+		}
+		return activeObjects;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index ecd6adbf45..07d7ad6e5f 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -53,6 +53,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 		app.getLocationProvider().addLocationListener(this);
 		app.getLocationProvider().addCompassListener(this);
 		addTargetPointListener(app);
+		addMapMarkersListener(app);
 		app.getRoutingHelper().addListener(this);
 	}
 
@@ -67,7 +68,19 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 			}
 		});
 	}
-	
+
+	private void addMapMarkersListener(OsmandApplication app) {
+		app.getMapMarkersHelper().addListener(new StateChangedListener<Void>() {
+
+			@Override
+			public void stateChanged(Void change) {
+				if(mapView != null) {
+					mapView.refreshMap();
+				}
+			}
+		});
+	}
+
 	public void setMapView(OsmandMapTileView mapView) {
 		this.mapView = mapView;
 		if(mapView != null) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
index 49924b84f9..532cdc6698 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
@@ -11,6 +11,8 @@ import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
@@ -24,6 +26,7 @@ import net.osmand.plus.mapcontextmenu.controllers.GpxItemMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.HistoryMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.ImpassibleRoadsMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.MapDataMenuController;
+import net.osmand.plus.mapcontextmenu.controllers.MapMarkerMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.MyLocationMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.PointDescriptionMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.TargetPointMenuController;
@@ -101,6 +104,8 @@ public abstract class MenuController extends BaseMenuController {
 				menuController = new OsmBugMenuController(app, mapActivity, pointDescription, (OpenStreetNote) object);
 			} else if (object instanceof GpxDisplayItem) {
 				menuController = new GpxItemMenuController(app, mapActivity, pointDescription, (GpxDisplayItem) object);
+			} else if (object instanceof MapMarker) {
+				menuController = new MapMarkerMenuController(app, mapActivity, pointDescription, (MapMarker) object);
 			} else if (object instanceof LatLon) {
 				if (pointDescription.isParking()) {
 					menuController = new ParkingPositionMenuController(app, mapActivity, pointDescription);
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
new file mode 100644
index 0000000000..aa5e32cebf
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
@@ -0,0 +1,74 @@
+package net.osmand.plus.mapcontextmenu.controllers;
+
+import android.graphics.drawable.Drawable;
+
+import net.osmand.data.PointDescription;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.MapMarkersHelper.MapMarker;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.mapcontextmenu.MenuBuilder;
+import net.osmand.plus.mapcontextmenu.MenuController;
+import net.osmand.util.Algorithms;
+
+public class MapMarkerMenuController extends MenuController {
+
+	private MapMarker mapMarker;
+
+	public MapMarkerMenuController(OsmandApplication app, MapActivity mapActivity, PointDescription pointDescription, MapMarker mapMarker) {
+		super(new MenuBuilder(app), pointDescription, mapActivity);
+		this.mapMarker = mapMarker;
+		final MapMarkersHelper markersHelper = app.getMapMarkersHelper();
+		leftTitleButtonController = new TitleButtonController() {
+			@Override
+			public void buttonPressed() {
+				markersHelper.removeMapMarker(getMapMarker().index);
+				getMapActivity().getContextMenu().close();
+			}
+		};
+		leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_remove);
+		leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
+	}
+
+	@Override
+	protected void setObject(Object object) {
+		if (object instanceof MapMarker) {
+			this.mapMarker = (MapMarker) object;
+		}
+	}
+
+	public MapMarker getMapMarker() {
+		return mapMarker;
+	}
+
+	@Override
+	protected int getSupportedMenuStatesPortrait() {
+		return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN;
+	}
+
+	@Override
+	public boolean needTypeStr() {
+		return !Algorithms.isEmpty(getNameStr());
+	}
+
+	@Override
+	public boolean displayDistanceDirection() {
+		return true;
+	}
+
+	@Override
+	public Drawable getLeftIcon() {
+		return getIconOrig(R.drawable.list_intermediate);
+	}
+
+	@Override
+	public String getTypeStr() {
+		return mapMarker.getPointDescription(getMapActivity()).getTypeName();
+	}
+
+	@Override
+	public boolean needStreetName() {
+		return !needTypeStr();
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
new file mode 100644
index 0000000000..3587f72c73
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -0,0 +1,159 @@
+package net.osmand.plus.views;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PointF;
+
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
+import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.MapMarkersHelper.MapMarker;
+import net.osmand.plus.R;
+import net.osmand.plus.TargetPointsHelper;
+import net.osmand.plus.activities.MapActivity;
+
+import java.util.List;
+
+public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider {
+	private final MapActivity map;
+	private OsmandMapTileView view;
+
+	private Paint bitmapPaint;
+	private Bitmap markerBitmap;
+
+	public MapMarkersLayer(MapActivity map) {
+		this.map = map;
+	}
+
+	private void initUI() {
+		bitmapPaint = new Paint();
+		bitmapPaint.setDither(true);
+		bitmapPaint.setAntiAlias(true);
+		bitmapPaint.setFilterBitmap(true);
+		markerBitmap = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_intermediate_point);
+	}
+
+	@Override
+	public void initLayer(OsmandMapTileView view) {
+		this.view = view;
+		initUI();
+	}
+
+	@Override
+	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings nightMode) {
+		if (tb.getZoom() < 3) {
+			return;
+		}
+
+		MapMarkersHelper markersHelper = map.getMyApplication().getMapMarkersHelper();
+		int index = 0;
+		for (MapMarker marker : markersHelper.getActiveMapMarkers()) {
+			index++;
+			if (isLocationVisible(tb, marker)) {
+				int marginX = markerBitmap.getWidth() / 6;
+				int marginY = markerBitmap.getHeight();
+				int locationX = tb.getPixXFromLonNoRot(marker.getLongitude());
+				int locationY = tb.getPixYFromLatNoRot(marker.getLatitude());
+				canvas.rotate(-tb.getRotate(), locationX, locationY);
+				canvas.drawBitmap(markerBitmap, locationX - marginX, locationY - marginY, bitmapPaint);
+				canvas.rotate(tb.getRotate(), locationX, locationY);
+			}
+		}
+	}
+
+	public boolean isLocationVisible(RotatedTileBox tb, MapMarker marker) {
+		if (marker == null || tb == null) {
+			return false;
+		}
+		return tb.containsLatLon(marker.getLatitude(), marker.getLongitude());
+	}
+
+
+	@Override
+	public void destroyLayer() {
+
+	}
+
+	@Override
+	public boolean drawInScreenPixels() {
+		return false;
+	}
+
+	@Override
+	public boolean disableSingleTap() {
+		return false;
+	}
+
+	@Override
+	public boolean disableLongPressOnMap() {
+		return false;
+	}
+
+	@Override
+	public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
+		MapMarkersHelper markersHelper = map.getMyApplication().getMapMarkersHelper();
+		List<MapMarker> markers = markersHelper.getActiveMapMarkers();
+		int r = getRadiusPoi(tileBox);
+		for (int i = 0; i < markers.size(); i++) {
+			MapMarker marker = markers.get(i);
+			LatLon latLon = marker.point;
+			if (latLon != null) {
+				int ex = (int) point.x;
+				int ey = (int) point.y;
+				int x = (int) tileBox.getPixXFromLatLon(latLon.getLatitude(), latLon.getLongitude());
+				int y = (int) tileBox.getPixYFromLatLon(latLon.getLatitude(), latLon.getLongitude());
+				if (calculateBelongs(ex, ey, x, y, r)) {
+					o.add(marker);
+				}
+			}
+		}
+
+
+	}
+
+	private boolean calculateBelongs(int ex, int ey, int objx, int objy, int radius) {
+		return Math.abs(objx - ex) <= radius && (ey - objy) <= radius && (objy - ey) <= 2.5 * radius;
+	}
+
+	public int getRadiusPoi(RotatedTileBox tb) {
+		int r = 0;
+		final double zoom = tb.getZoom();
+		if (zoom <= 15) {
+			r = 10;
+		} else if (zoom <= 16) {
+			r = 14;
+		} else if (zoom <= 17) {
+			r = 16;
+		} else {
+			r = 18;
+		}
+		return (int) (r * tb.getDensity());
+	}
+
+	@Override
+	public LatLon getObjectLocation(Object o) {
+		if (o instanceof MapMarker) {
+			return ((MapMarker) o).point;
+		}
+		return null;
+	}
+
+	@Override
+	public String getObjectDescription(Object o) {
+		if (o instanceof MapMarker) {
+			return ((MapMarker) o).getPointDescription(view.getContext()).getFullPlainName(view.getContext());
+		}
+		return null;
+	}
+
+	@Override
+	public PointDescription getObjectName(Object o) {
+		if (o instanceof MapMarker) {
+			return ((MapMarker) o).getPointDescription(view.getContext());
+		}
+		return null;
+	}
+}

From 494ae4b4d08db62f758e576104b57c291548c56b Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Fri, 5 Feb 2016 22:59:57 +0300
Subject: [PATCH 04/18] Markers in progress

---
 OsmAnd/AndroidManifest.xml                    |   1 +
 OsmAnd/res/layout/waypoint_header.xml         |  11 +
 .../osmand/plus/OsmAndAppCustomization.java   |   6 +-
 .../plus/activities/MapActivityActions.java   |   9 +-
 .../plus/activities/MapMarkersActivity.java   | 235 ++++++++++++++----
 .../osmand/plus/views/MapMarkersLayer.java    |  41 ++-
 6 files changed, 248 insertions(+), 55 deletions(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index c0aa8be30f..49648a97e7 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -166,6 +166,7 @@
 		<activity android:name="net.osmand.plus.activities.PluginsActivity" />
 		<activity android:name="net.osmand.plus.activities.PluginActivity" />
 		<activity android:name="net.osmand.plus.activities.ContributionVersionActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/contribution_activity" />
+		<activity android:name="net.osmand.plus.activities.MapMarkersActivity"/>
 
 
 		<activity android:name="net.osmand.plus.osmo.SettingsOsMoActivity" android:configChanges="keyboardHidden|orientation" />
diff --git a/OsmAnd/res/layout/waypoint_header.xml b/OsmAnd/res/layout/waypoint_header.xml
index 40ff101a1a..76b9e2431c 100644
--- a/OsmAnd/res/layout/waypoint_header.xml
+++ b/OsmAnd/res/layout/waypoint_header.xml
@@ -32,4 +32,15 @@
 
     <include layout="@layout/check_item_rel"/>
 
+    <Button
+        android:id="@+id/header_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:layout_marginRight="-16dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:text="@string/shared_string_clear"
+        android:visibility="gone"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
index 4caab396c7..1044dc3449 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
@@ -9,6 +9,7 @@ import net.osmand.IProgress;
 import net.osmand.IndexConstants;
 import net.osmand.data.LocationPoint;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.MapMarkersActivity;
 import net.osmand.plus.activities.PluginsActivity;
 import net.osmand.plus.activities.SettingsActivity;
 import net.osmand.plus.activities.TrackActivity;
@@ -67,7 +68,10 @@ public class OsmAndAppCustomization {
 		return FavoritesActivity.class;
 	}
 
-	
+	public Class<MapMarkersActivity> getMapMarkersActivity(){
+		return MapMarkersActivity.class;
+	}
+
 	public Class<? extends Activity> getDownloadIndexActivity() {
 		return DownloadActivity.class;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 66b5921e26..f26d933829 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -564,12 +564,15 @@ public class MapActivityActions implements DialogProvider {
 						return true;
 					}
 				}).reg();
-		optionsMenuHelper.item(R.string.waypoints).iconColor(R.drawable.ic_action_waypoint)
+		optionsMenuHelper.item(R.string.map_markers).iconColor(R.drawable.ic_action_waypoint)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-						mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.WAYPOINTS);
-						return false;
+						Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization()
+								.getMapMarkersActivity());
+						newIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+						mapActivity.startActivity(newIntent);
+						return true;
 					}
 				}).reg();
 		optionsMenuHelper.item(R.string.get_directions).iconColor(R.drawable.ic_action_gdirections_dark)
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
index 605990e7e1..d6c0d53e2a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
@@ -1,21 +1,30 @@
 package net.osmand.plus.activities;
 
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.Shape;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.CompoundButton;
+import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
 import net.osmand.plus.GeocodingLookupService;
+import net.osmand.plus.IconsCache;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.helpers.WaypointHelper;
+import net.osmand.plus.views.controls.ListDividerShape;
 import net.osmand.plus.views.controls.StableArrayAdapter;
+import net.osmand.util.Algorithms;
+import net.osmand.util.MapUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +43,8 @@ public class MapMarkersActivity extends OsmandListActivity {
 		setContentView(R.layout.map_markers);
 		getSupportActionBar().setTitle(R.string.map_markers);
 
-		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		//nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		nightMode = !getMyApplication().getSettings().isLightContent();
 		setListAdapter(getMapMarkersListAdapter());
 	}
 
@@ -65,29 +75,27 @@ public class MapMarkersActivity extends OsmandListActivity {
 
 			@Override
 			public void buildDividers() {
-				dividers = getCustomDividers(ctx, getObjects(), nightMode);
+				dividers = getCustomDividers(getObjects());
 			}
 
 			@Override
 			public View getView(final int position, View convertView, ViewGroup parent) {
 				// User super class to create the View
 				View v = convertView;
-				final ArrayAdapter<Object> thisAdapter = this;
 				Object obj = getItem(position);
 				boolean labelView = (obj instanceof Integer);
 				boolean topDividerView = (obj instanceof Boolean) && ((Boolean) obj);
 				boolean bottomDividerView = (obj instanceof Boolean) && !((Boolean) obj);
 				if (labelView) {
-					v = createItemForCategory(ctx, (Integer) obj, running, position, thisAdapter, nightMode);
+					v = createItemForCategory((Integer) obj);
 					AndroidUtils.setListItemBackground(MapMarkersActivity.this, v, nightMode);
 				} else if (topDividerView) {
-					v = ctx.getLayoutInflater().inflate(R.layout.card_top_divider, null);
+					v = getLayoutInflater().inflate(R.layout.card_top_divider, null);
 				} else if (bottomDividerView) {
-					v = ctx.getLayoutInflater().inflate(R.layout.card_bottom_divider, null);
+					v = getLayoutInflater().inflate(R.layout.card_bottom_divider, null);
 				} else if (obj instanceof MapMarker) {
 					MapMarker marker = (MapMarker) obj;
-					v = updateWaypointItemView(edit, deletedPoints, app, ctx, helper, v, marker, this,
-							nightMode, flat);
+					v = updateMapMarkerItemView(v, marker);
 					AndroidUtils.setListItemBackground(MapMarkersActivity.this, v, nightMode);
 				}
 				return v;
@@ -103,11 +111,7 @@ public class MapMarkersActivity extends OsmandListActivity {
 							= new GeocodingLookupService.AddressLookupRequest(marker.point, new GeocodingLookupService.OnAddressLookupResult() {
 						@Override
 						public void geocodingDone(String address) {
-							if (helperCallbacks != null) {
-								helperCallbacks.reloadAdapter();
-							} else {
-								reloadListAdapter(listAdapter);
-							}
+							reloadListAdapter();
 						}
 					}, null);
 					getMyApplication().getGeocodingLookupService().lookupAddress(lookupRequest);
@@ -118,36 +122,158 @@ public class MapMarkersActivity extends OsmandListActivity {
 		return listAdapter;
 	}
 
-	protected View createItemForCategory(final int type, final int position, final ArrayAdapter<Object> thisAdapter, boolean nightMode) {
-		View v = getLayoutInflater().inflate(R.layout.waypoint_header, null);
-		final CompoundButton btn = (CompoundButton) v.findViewById(R.id.check_item);
-		btn.setVisibility(waypointHelper.isTypeConfigurable(type) ? View.VISIBLE : View.GONE);
-		btn.setOnCheckedChangeListener(null);
-		final boolean checked = waypointHelper.isTypeEnabled(type);
-		btn.setChecked(checked);
-		btn.setEnabled(running[0] == -1);
-		v.findViewById(R.id.ProgressBar).setVisibility(position == running[0] ? View.VISIBLE : View.GONE);
-		btn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+	private List<Drawable> getCustomDividers(List<Object> points) {
+		int color;
+		if (nightMode) {
+			color = getResources().getColor(R.color.dashboard_divider_dark);
+		} else {
+			color = getResources().getColor(R.color.dashboard_divider_light);
+		}
 
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-				running[0] = position;
-				thisAdapter.notifyDataSetInvalidated();
-				if (type == WaypointHelper.POI && isChecked) {
-					selectPoi(running, thisAdapter, type, isChecked, ctx);
-				} else {
-					enableType(running, thisAdapter, type, isChecked);
-				}
+		Shape fullDividerShape = new ListDividerShape(color, 0);
+		Shape halfDividerShape = new ListDividerShape(color, AndroidUtils.dpToPx(this, 56f));
+
+		final ShapeDrawable fullDivider = new ShapeDrawable(fullDividerShape);
+		final ShapeDrawable halfDivider = new ShapeDrawable(halfDividerShape);
+
+		int divHeight = AndroidUtils.dpToPx(this, 1f);
+		fullDivider.setIntrinsicHeight(divHeight);
+		halfDivider.setIntrinsicHeight(divHeight);
+
+		List<Drawable> res = new ArrayList<>();
+		for (int i = 0; i < points.size(); i++) {
+			Object obj = points.get(i);
+			Object objNext = i + 1 < points.size() ? points.get(i + 1) : null;
+
+			if (objNext == null) {
+				break;
 			}
 
+			boolean bottomDividerViewNext = (objNext instanceof Boolean) && !((Boolean) objNext);
+
+			boolean mapMarker = (obj instanceof MapMarker);
+			boolean mapMarkerNext = (objNext instanceof MapMarker);
+
+			Drawable d = null;
+
+			if (mapMarkerNext) {
+				if (mapMarker) {
+					d = halfDivider;
+				} else {
+					d = fullDivider;
+				}
+			} else if (mapMarker && !bottomDividerViewNext) {
+				d = fullDivider;
+			}
+
+			res.add(d);
+		}
+		return res;
+	}
+
+	protected View createItemForCategory(final int type) {
+		View v = getLayoutInflater().inflate(R.layout.waypoint_header, null);
+		v.findViewById(R.id.check_item).setVisibility(View.GONE);
+		v.findViewById(R.id.ProgressBar).setVisibility(View.GONE);
+
+		final Button btn = (Button) v.findViewById(R.id.header_button);
+		btn.setTextColor(!nightMode ? getResources().getColor(R.color.map_widget_blue)
+				: getResources().getColor(R.color.osmand_orange));
+		btn.setText(getString(R.string.shared_string_clear));
+		btn.setVisibility(View.VISIBLE);
+		btn.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				getListAdapter().notifyDataSetInvalidated();
+				reloadListAdapter();
+			}
 		});
 
 		TextView tv = (TextView) v.findViewById(R.id.header_text);
-		AndroidUtils.setTextPrimaryColor(mapActivity, tv, nightMode);
-		tv.setText(getHeader(type, checked, ctx));
+		AndroidUtils.setTextPrimaryColor(this, tv, nightMode);
+		tv.setText(getHeader(type));
 		return v;
 	}
 
+	protected View updateMapMarkerItemView(View v, final MapMarker marker) {
+		if (v == null || v.findViewById(R.id.info_close) == null) {
+			v = getLayoutInflater().inflate(R.layout.waypoint_reached, null);
+		}
+		updateMapMarkerInfoView(v, marker);
+		final View more = v.findViewById(R.id.all_points);
+		final View move = v.findViewById(R.id.info_move);
+		final View remove = v.findViewById(R.id.info_close);
+		remove.setVisibility(View.GONE);
+		move.setVisibility(View.GONE);
+		more.setVisibility(View.GONE);
+		return v;
+	}
+
+	protected void updateMapMarkerInfoView(View localView, final MapMarker marker) {
+		OsmandApplication app = getMyApplication();
+		TextView text = (TextView) localView.findViewById(R.id.waypoint_text);
+		AndroidUtils.setTextPrimaryColor(this, text, nightMode);
+		TextView textShadow = (TextView) localView.findViewById(R.id.waypoint_text_shadow);
+		localView.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				showOnMap(marker);
+			}
+		});
+
+		TextView textDist = (TextView) localView.findViewById(R.id.waypoint_dist);
+		((ImageView) localView.findViewById(R.id.waypoint_icon))
+				.setImageDrawable(getMapMarkerIcon(marker.colorIndex));
+
+		LatLon lastKnownMapLocation = app.getSettings().getLastKnownMapLocation();
+		int dist = (int) (MapUtils.getDistance(marker.getLatitude(), marker.getLongitude(),
+				lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+
+		if (dist > 0) {
+			textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
+		} else {
+			textDist.setText("");
+		}
+
+		localView.findViewById(R.id.waypoint_deviation).setVisibility(View.GONE);
+
+		String descr;
+		PointDescription pd = marker.getPointDescription(app);
+		if (Algorithms.isEmpty(pd.getName())) {
+			descr = pd.getTypeName();
+		} else {
+			descr = pd.getName();
+		}
+
+		if (textShadow != null) {
+			textShadow.setText(descr);
+		}
+		text.setText(descr);
+
+		String pointDescription = "";
+		TextView descText = (TextView) localView.findViewById(R.id.waypoint_desc_text);
+		if (descText != null) {
+			AndroidUtils.setTextSecondaryColor(this, descText, nightMode);
+			pointDescription = marker.getPointDescription(this).getTypeName();
+		}
+
+		if (descr.equals(pointDescription)) {
+			pointDescription = "";
+		}
+		if (dist > 0 && !Algorithms.isEmpty(pointDescription)) {
+			pointDescription = "  •  " + pointDescription;
+		}
+		if (descText != null) {
+			descText.setText(pointDescription);
+		}
+	}
+
+	public void showOnMap(MapMarker marker) {
+		getMyApplication().getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
+				15, marker.getPointDescription(this), true, marker);
+		MapActivity.launchMapActivityMoveToTop(this);
+	}
+
 	protected String getHeader(int type) {
 		String str = getString(R.string.map_markers);
 		switch (type) {
@@ -161,10 +287,17 @@ public class MapMarkersActivity extends OsmandListActivity {
 		return str;
 	}
 
-
-	//LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
-	//int dist = (int) (MapUtils.getDistance(marker.getLatitude(), marker.getLongitude(),
-	//lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+	public void reloadListAdapter() {
+		StableArrayAdapter listAdapter = getListAdapter();
+		listAdapter.setNotifyOnChange(false);
+		listAdapter.clear();
+		List<Object> objects = getListObjects();
+		for (Object point : objects) {
+			listAdapter.add(point);
+		}
+		listAdapter.updateObjects(objects, getActiveObjects(objects));
+		listAdapter.notifyDataSetChanged();
+	}
 
 	protected List<Object> getListObjects() {
 		final List<Object> objects = new ArrayList<>();
@@ -198,4 +331,22 @@ public class MapMarkersActivity extends OsmandListActivity {
 		}
 		return activeObjects;
 	}
+
+	private Drawable getMapMarkerIcon(int colorIndex) {
+		IconsCache iconsCache = getMyApplication().getIconsCache();
+		switch (colorIndex) {
+			case 0:
+				return iconsCache.getIcon(R.drawable.map_marker_blue);
+			case 1:
+				return iconsCache.getIcon(R.drawable.map_marker_green);
+			case 2:
+				return iconsCache.getIcon(R.drawable.map_marker_orange);
+			case 3:
+				return iconsCache.getIcon(R.drawable.map_marker_red);
+			case 4:
+				return iconsCache.getIcon(R.drawable.map_marker_yellow);
+			default:
+				return iconsCache.getIcon(R.drawable.map_marker_blue);
+		}
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
index 3587f72c73..a861ca7c48 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -12,7 +12,6 @@ import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.R;
-import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.activities.MapActivity;
 
 import java.util.List;
@@ -22,7 +21,11 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 	private OsmandMapTileView view;
 
 	private Paint bitmapPaint;
-	private Bitmap markerBitmap;
+	private Bitmap markerBitmapBlue;
+	private Bitmap markerBitmapGreen;
+	private Bitmap markerBitmapOrange;
+	private Bitmap markerBitmapRed;
+	private Bitmap markerBitmapYellow;
 
 	public MapMarkersLayer(MapActivity map) {
 		this.map = map;
@@ -33,7 +36,28 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 		bitmapPaint.setDither(true);
 		bitmapPaint.setAntiAlias(true);
 		bitmapPaint.setFilterBitmap(true);
-		markerBitmap = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_intermediate_point);
+		markerBitmapBlue = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_blue);
+		markerBitmapGreen = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_green);
+		markerBitmapOrange = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_orange);
+		markerBitmapRed = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_red);
+		markerBitmapYellow = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_yellow);
+	}
+
+	private Bitmap getMapMarkerBitmap(int colorIndex) {
+		switch (colorIndex) {
+			case 0:
+				return markerBitmapBlue;
+			case 1:
+				return markerBitmapGreen;
+			case 2:
+				return markerBitmapOrange;
+			case 3:
+				return markerBitmapRed;
+			case 4:
+				return markerBitmapYellow;
+			default:
+				return markerBitmapBlue;
+		}
 	}
 
 	@Override
@@ -49,16 +73,15 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 		}
 
 		MapMarkersHelper markersHelper = map.getMyApplication().getMapMarkersHelper();
-		int index = 0;
 		for (MapMarker marker : markersHelper.getActiveMapMarkers()) {
-			index++;
 			if (isLocationVisible(tb, marker)) {
-				int marginX = markerBitmap.getWidth() / 6;
-				int marginY = markerBitmap.getHeight();
+				Bitmap bmp = getMapMarkerBitmap(marker.colorIndex);
+				int marginX = bmp.getWidth() / 6;
+				int marginY = bmp.getHeight();
 				int locationX = tb.getPixXFromLonNoRot(marker.getLongitude());
 				int locationY = tb.getPixYFromLatNoRot(marker.getLatitude());
 				canvas.rotate(-tb.getRotate(), locationX, locationY);
-				canvas.drawBitmap(markerBitmap, locationX - marginX, locationY - marginY, bitmapPaint);
+				canvas.drawBitmap(bmp, locationX - marginX, locationY - marginY, bitmapPaint);
 				canvas.rotate(tb.getRotate(), locationX, locationY);
 			}
 		}
@@ -119,7 +142,7 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 	}
 
 	public int getRadiusPoi(RotatedTileBox tb) {
-		int r = 0;
+		int r;
 		final double zoom = tb.getZoom();
 		if (zoom <= 15) {
 			r = 10;

From 1dac5f92d4a0f715280a1550101cd7b702dc50c7 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sun, 7 Feb 2016 10:10:35 +0300
Subject: [PATCH 05/18] Fix

---
 .../src/net/osmand/plus/activities/MapActivityActions.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 9bfed42b40..6b47af84fa 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -570,7 +570,10 @@ public class MapActivityActions implements DialogProvider {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
 						MapActivity.clearPrevActivityIntent();
-						mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.WAYPOINTS);
+						Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization()
+								.getMapMarkersActivity());
+						newIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+						mapActivity.startActivity(newIntent);
 						return false;
 					}
 				}).reg();

From 51aa200990bc94536bb7ed07123acdb0fe3f1851 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sun, 7 Feb 2016 13:22:38 +0300
Subject: [PATCH 06/18] Markers in progress

---
 OsmAnd/res/layout/map_markers.xml             |   2 +
 .../src/net/osmand/data/PointDescription.java |   4 +
 .../src/net/osmand/plus/MapMarkersHelper.java |  32 ++++-
 .../src/net/osmand/plus/OsmandSettings.java   |  14 ++
 .../plus/activities/MapActivityActions.java   |  28 ++--
 .../plus/activities/MapMarkersActivity.java   | 136 ++++++++++++++----
 .../plus/mapcontextmenu/MapContextMenu.java   |   6 +-
 .../controllers/MapMarkerMenuController.java  |   3 +-
 8 files changed, 178 insertions(+), 47 deletions(-)

diff --git a/OsmAnd/res/layout/map_markers.xml b/OsmAnd/res/layout/map_markers.xml
index 885ad6464f..c314497764 100644
--- a/OsmAnd/res/layout/map_markers.xml
+++ b/OsmAnd/res/layout/map_markers.xml
@@ -10,5 +10,7 @@
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:divider="@null"
+        android:drawSelectorOnTop="true"
         tools:listitem="@layout/waypoint_reached"/>
 </LinearLayout>
diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java
index 4bd1cc441a..a0c05bd6ee 100644
--- a/OsmAnd/src/net/osmand/data/PointDescription.java
+++ b/OsmAnd/src/net/osmand/data/PointDescription.java
@@ -192,6 +192,10 @@ public class PointDescription {
 		return POINT_TYPE_TARGET.equals(type);
 	}
 
+	public boolean isMapMarker() {
+		return POINT_TYPE_MAP_MARKER.equals(type);
+	}
+
 	public boolean isParking() {
 		return POINT_TYPE_PARKING_MARKER.equals(type);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index 1fd859c3b2..452d5cc3c9 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -10,11 +10,15 @@ import net.osmand.plus.GeocodingLookupService;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.util.Algorithms;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class MapMarkersHelper {
+	public static final int MAP_MARKERS_COLORS_COUNT = 5;
+	public static final int MAP_MARKERS_HISTORY_LIMIT = 30;
+
 	private List<MapMarker> mapMarkers = new ArrayList<>();
 	private List<MapMarker> mapMarkersHistory = new ArrayList<>();
 	private OsmandSettings settings;
@@ -176,7 +180,7 @@ public class MapMarkersHelper {
 	public void removeActiveMarkers() {
 		cancelAddressRequests();
 
-		settings.clearIntermediatePoints();
+		settings.clearActiveMapMarkers();
 		mapMarkers.clear();
 		readFromSettings();
 		refresh();
@@ -185,12 +189,36 @@ public class MapMarkersHelper {
 	public void removeMarkersHistory() {
 		cancelAddressRequests();
 
-		settings.clearIntermediatePoints();
+		settings.clearMapMarkersHistory();
 		mapMarkersHistory.clear();
 		readFromSettings();
 		refresh();
 	}
 
+	public void addMapMarker(final LatLon point, PointDescription historyName) {
+		if (point != null) {
+			final PointDescription pointDescription;
+			if (historyName == null) {
+				pointDescription = new PointDescription(PointDescription.POINT_TYPE_LOCATION, "");
+			} else {
+				pointDescription = historyName;
+			}
+			if (pointDescription.isLocation() && Algorithms.isEmpty(pointDescription.getName())) {
+				pointDescription.setName(PointDescription.getSearchAddressStr(ctx));
+			}
+			int colorIndex;
+			if (mapMarkers.size() > 0) {
+				colorIndex = (mapMarkers.get(mapMarkers.size() - 1).colorIndex + 1) % MAP_MARKERS_COLORS_COUNT;
+			} else {
+				colorIndex = 0;
+			}
+			settings.insertMapMarker(point.getLatitude(), point.getLongitude(),
+					pointDescription, colorIndex, mapMarkers.size());
+		}
+		readFromSettings();
+		refresh();
+	}
+
 	public void addListener(StateChangedListener<Void> l) {
 		listeners.add(l);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 7530e57995..c5ed649abe 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1529,6 +1529,20 @@ public class OsmandSettings {
 		return settingsAPI.edit(globalPreferences).remove(INTERMEDIATE_POINTS).remove(INTERMEDIATE_POINTS_DESCRIPTION).commit();
 	}
 
+	public boolean clearActiveMapMarkers() {
+		return settingsAPI.edit(globalPreferences)
+				.remove(MAP_MARKERS_POINT)
+				.remove(MAP_MARKERS_DESCRIPTION)
+				.remove(MAP_MARKERS_COLOR).commit();
+	}
+
+	public boolean clearMapMarkersHistory() {
+		return settingsAPI.edit(globalPreferences)
+				.remove(MAP_MARKERS_HISTORY_POINT)
+				.remove(MAP_MARKERS_HISTORY_DESCRIPTION)
+				.remove(MAP_MARKERS_HISTORY_COLOR).commit();
+	}
+
 	public final CommonPreference<Boolean> USE_INTERMEDIATE_POINTS_NAVIGATION =
 			new BooleanPreference("use_intermediate_points_navigation", false).makeGlobal().cache();
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 6b47af84fa..33b3ad8723 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -33,6 +33,7 @@ import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
+import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@@ -97,7 +98,6 @@ public class MapActivityActions implements DialogProvider {
 
 		openIntermediateEditPointsDialog();
 	}
-	*/
 
 	public void addAsTarget(double latitude, double longitude, PointDescription pd) {
 		TargetPointsHelper targets = getMyApplication().getTargetPointsHelper();
@@ -105,6 +105,13 @@ public class MapActivityActions implements DialogProvider {
 				pd);
 		openIntermediatePointsDialog();
 	}
+	*/
+
+	public void addMapMarker(double latitude, double longitude, PointDescription pd) {
+		MapMarkersHelper markersHelper = getMyApplication().getMapMarkersHelper();
+		markersHelper.addMapMarker(new LatLon(latitude, longitude), pd);
+		openMapMarkersActivity();
+	}
 
 	public void editWaypoints() {
 		openIntermediatePointsDialog();
@@ -570,11 +577,8 @@ public class MapActivityActions implements DialogProvider {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
 						MapActivity.clearPrevActivityIntent();
-						Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization()
-								.getMapMarkersActivity());
-						newIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-						mapActivity.startActivity(newIntent);
-						return false;
+						openMapMarkersActivity();
+						return true;
 					}
 				}).reg();
 		optionsMenuHelper.item(R.string.get_directions).iconColor(R.drawable.ic_action_gdirections_dark)
@@ -742,17 +746,17 @@ public class MapActivityActions implements DialogProvider {
 		return optionsMenuHelper;
 	}
 
+	public void openMapMarkersActivity() {
+		Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization()
+				.getMapMarkersActivity());
+		newIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+		mapActivity.startActivity(newIntent);
+	}
 
 	public void openIntermediatePointsDialog() {
 		mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.WAYPOINTS);
 	}
 
-	/*
-	public void openIntermediateEditPointsDialog() {
-		mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.WAYPOINTS_EDIT);
-	}
-	*/
-
 	public void openRoutePreferencesDialog() {
 		mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.ROUTE_PREFERENCES);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
index d6c0d53e2a..f24a25676e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
@@ -21,19 +21,23 @@ import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
+import net.osmand.plus.views.controls.DynamicListView;
+import net.osmand.plus.views.controls.DynamicListViewCallbacks;
 import net.osmand.plus.views.controls.ListDividerShape;
 import net.osmand.plus.views.controls.StableArrayAdapter;
+import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class MapMarkersActivity extends OsmandListActivity {
+public class MapMarkersActivity extends OsmandListActivity implements DynamicListViewCallbacks {
 
 	public static final int ACTIVE_MARKERS = 0;
 	public static final int MARKERS_HISTORY = 1;
 
+	private SwipeDismissListViewTouchListener swipeDismissListener;
 	private boolean nightMode;
 
 	@Override
@@ -43,6 +47,56 @@ public class MapMarkersActivity extends OsmandListActivity {
 		setContentView(R.layout.map_markers);
 		getSupportActionBar().setTitle(R.string.map_markers);
 
+		((DynamicListView) getListView()).setDynamicListViewCallbacks(this);
+		swipeDismissListener = new SwipeDismissListViewTouchListener(getListView(),
+				new SwipeDismissListViewTouchListener.DismissCallbacks() {
+					@Override
+					public boolean canDismiss(int position) {
+						List<Object> activeObjects = getListAdapter().getActiveObjects();
+						Object obj = getListAdapter().getItem(position);
+						return activeObjects.contains(obj);
+					}
+
+					@Override
+					public SwipeDismissListViewTouchListener.Undoable onDismiss(final int position) {
+						final Object item;
+						final StableArrayAdapter stableAdapter = getListAdapter();
+						final int activeObjPos;
+						item = stableAdapter.getItem(position);
+
+						stableAdapter.setNotifyOnChange(false);
+						stableAdapter.remove(item);
+						stableAdapter.getObjects().remove(item);
+						activeObjPos = stableAdapter.getActiveObjects().indexOf(item);
+						stableAdapter.getActiveObjects().remove(item);
+						stableAdapter.refreshData();
+						stableAdapter.notifyDataSetChanged();
+
+						return new SwipeDismissListViewTouchListener.Undoable() {
+							@Override
+							public void undo() {
+								if (item != null) {
+									stableAdapter.setNotifyOnChange(false);
+									stableAdapter.insert(item, position);
+									stableAdapter.getObjects().add(position, item);
+									stableAdapter.getActiveObjects().add(activeObjPos, item);
+									stableAdapter.refreshData();
+								}
+							}
+						};
+					}
+
+					@Override
+					public void onHidePopup() {
+						StableArrayAdapter stableAdapter = getListAdapter();
+						stableAdapter.refreshData();
+						// do delete
+						if (stableAdapter.getActiveObjects().size() == 0) {
+							finish();
+						}
+					}
+				});
+
 		//nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		nightMode = !getMyApplication().getSettings().isLightContent();
 		setListAdapter(getMapMarkersListAdapter());
@@ -55,8 +109,10 @@ public class MapMarkersActivity extends OsmandListActivity {
 
 	@Override
 	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		getListAdapter().getItem(position);
-		//
+		Object obj = getListAdapter().getItem(position);
+		if (obj instanceof MapMarker) {
+			showOnMap((MapMarker) obj);
+		}
 	}
 
 	@Override
@@ -78,6 +134,12 @@ public class MapMarkersActivity extends OsmandListActivity {
 				dividers = getCustomDividers(getObjects());
 			}
 
+			@Override
+			public boolean isEnabled(int position) {
+				Object obj = getItem(position);
+				return obj instanceof MapMarker;
+			}
+
 			@Override
 			public View getView(final int position, View convertView, ViewGroup parent) {
 				// User super class to create the View
@@ -176,18 +238,21 @@ public class MapMarkersActivity extends OsmandListActivity {
 		v.findViewById(R.id.check_item).setVisibility(View.GONE);
 		v.findViewById(R.id.ProgressBar).setVisibility(View.GONE);
 
-		final Button btn = (Button) v.findViewById(R.id.header_button);
-		btn.setTextColor(!nightMode ? getResources().getColor(R.color.map_widget_blue)
-				: getResources().getColor(R.color.osmand_orange));
-		btn.setText(getString(R.string.shared_string_clear));
-		btn.setVisibility(View.VISIBLE);
-		btn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				getListAdapter().notifyDataSetInvalidated();
-				reloadListAdapter();
-			}
-		});
+		if (type == MARKERS_HISTORY) {
+			final Button btn = (Button) v.findViewById(R.id.header_button);
+			btn.setTextColor(!nightMode ? getResources().getColor(R.color.map_widget_blue)
+					: getResources().getColor(R.color.osmand_orange));
+			btn.setText(getString(R.string.shared_string_clear));
+			btn.setVisibility(View.VISIBLE);
+			btn.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					getListAdapter().notifyDataSetInvalidated();
+					getMyApplication().getMapMarkersHelper().removeMarkersHistory();
+					reloadListAdapter();
+				}
+			});
+		}
 
 		TextView tv = (TextView) v.findViewById(R.id.header_text);
 		AndroidUtils.setTextPrimaryColor(this, tv, nightMode);
@@ -214,26 +279,19 @@ public class MapMarkersActivity extends OsmandListActivity {
 		TextView text = (TextView) localView.findViewById(R.id.waypoint_text);
 		AndroidUtils.setTextPrimaryColor(this, text, nightMode);
 		TextView textShadow = (TextView) localView.findViewById(R.id.waypoint_text_shadow);
-		localView.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				showOnMap(marker);
-			}
-		});
-
 		TextView textDist = (TextView) localView.findViewById(R.id.waypoint_dist);
 		((ImageView) localView.findViewById(R.id.waypoint_icon))
-				.setImageDrawable(getMapMarkerIcon(marker.colorIndex));
+				.setImageDrawable(getMapMarkerIcon(app, marker.colorIndex));
 
 		LatLon lastKnownMapLocation = app.getSettings().getLastKnownMapLocation();
 		int dist = (int) (MapUtils.getDistance(marker.getLatitude(), marker.getLongitude(),
 				lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
 
-		if (dist > 0) {
-			textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
-		} else {
-			textDist.setText("");
-		}
+		//if (dist > 0) {
+		textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
+		//} else {
+		//	textDist.setText("");
+		//}
 
 		localView.findViewById(R.id.waypoint_deviation).setVisibility(View.GONE);
 
@@ -250,6 +308,8 @@ public class MapMarkersActivity extends OsmandListActivity {
 		}
 		text.setText(descr);
 
+		localView.findViewById(R.id.waypoint_desc_text).setVisibility(View.GONE);
+		/*
 		String pointDescription = "";
 		TextView descText = (TextView) localView.findViewById(R.id.waypoint_desc_text);
 		if (descText != null) {
@@ -266,6 +326,7 @@ public class MapMarkersActivity extends OsmandListActivity {
 		if (descText != null) {
 			descText.setText(pointDescription);
 		}
+		*/
 	}
 
 	public void showOnMap(MapMarker marker) {
@@ -332,8 +393,8 @@ public class MapMarkersActivity extends OsmandListActivity {
 		return activeObjects;
 	}
 
-	private Drawable getMapMarkerIcon(int colorIndex) {
-		IconsCache iconsCache = getMyApplication().getIconsCache();
+	public static Drawable getMapMarkerIcon(OsmandApplication app, int colorIndex) {
+		IconsCache iconsCache = app.getIconsCache();
 		switch (colorIndex) {
 			case 0:
 				return iconsCache.getIcon(R.drawable.map_marker_blue);
@@ -349,4 +410,19 @@ public class MapMarkersActivity extends OsmandListActivity {
 				return iconsCache.getIcon(R.drawable.map_marker_blue);
 		}
 	}
+
+	@Override
+	public void onWindowVisibilityChanged(int visibility) {
+		if (visibility != View.VISIBLE && swipeDismissListener != null) {
+			swipeDismissListener.discardUndo();
+		}
+	}
+
+	@Override
+	public void onItemsSwapped(List<Object> items) {
+	}
+
+	@Override
+	public void onItemSwapping(int position) {
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index 4fd3711339..e15bf69579 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -470,9 +470,11 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 	public void buttonWaypointPressed() {
 		if (pointDescription.isDestination()) {
 			mapActivity.getMapActions().editWaypoints();
+		} else if (pointDescription.isMapMarker()) {
+			mapActivity.getMapActions().openMapMarkersActivity();
 		} else {
-			mapActivity.getMapActions().addAsTarget(latLon.getLatitude(), latLon.getLongitude(),
-					getPointDescriptionForTarget());
+			mapActivity.getMapActions().addMapMarker(latLon.getLatitude(), latLon.getLongitude(),
+					pointDescription);
 		}
 		close();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
index aa5e32cebf..b70b786ecd 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
@@ -8,6 +8,7 @@ import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.MapMarkersActivity;
 import net.osmand.plus.mapcontextmenu.MenuBuilder;
 import net.osmand.plus.mapcontextmenu.MenuController;
 import net.osmand.util.Algorithms;
@@ -59,7 +60,7 @@ public class MapMarkerMenuController extends MenuController {
 
 	@Override
 	public Drawable getLeftIcon() {
-		return getIconOrig(R.drawable.list_intermediate);
+		return MapMarkersActivity.getMapMarkerIcon(getMapActivity().getMyApplication(), mapMarker.colorIndex);
 	}
 
 	@Override

From 7d11782d567765e9960292a2347bc68317380785 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sun, 7 Feb 2016 19:59:04 +0300
Subject: [PATCH 07/18] Markers in process

---
 OsmAnd/res/values/strings.xml                 |   1 +
 .../src/net/osmand/plus/MapMarkersHelper.java |  90 +++++++++----
 .../src/net/osmand/plus/OsmandSettings.java   |  11 ++
 .../plus/activities/MapActivityActions.java   |   4 +-
 .../plus/activities/MapMarkersActivity.java   | 125 ++++++++++++++----
 .../views/controls/StableArrayAdapter.java    |   4 -
 6 files changed, 181 insertions(+), 54 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index abd958b898..18daff693a 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="clear_markers_history_q">Do you want to clear markers history?</string>
     <string name="active_markers">Active markers</string>
     <string name="map_markers">Map markers</string>
     <string name="map_marker">Map marker</string>
diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index 452d5cc3c9..57638217c1 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -17,7 +17,6 @@ import java.util.List;
 
 public class MapMarkersHelper {
 	public static final int MAP_MARKERS_COLORS_COUNT = 5;
-	public static final int MAP_MARKERS_HISTORY_LIMIT = 30;
 
 	private List<MapMarker> mapMarkers = new ArrayList<>();
 	private List<MapMarker> mapMarkersHistory = new ArrayList<>();
@@ -30,12 +29,7 @@ public class MapMarkersHelper {
 		private PointDescription pointDescription;
 		public int colorIndex;
 		public int index;
-
-		public MapMarker(LatLon point, PointDescription name, int colorIndex) {
-			this.point = point;
-			this.pointDescription = name;
-			this.colorIndex = colorIndex;
-		}
+		public boolean history;
 
 		public MapMarker(LatLon point, PointDescription name, int colorIndex, int index) {
 			this.point = point;
@@ -61,13 +55,6 @@ public class MapMarkersHelper {
 			return pointDescription != null && pointDescription.isSearchingAddress(ctx);
 		}
 
-		public static MapMarker create(LatLon point, PointDescription name, int color) {
-			if (point != null) {
-				return new MapMarker(point, name, color);
-			}
-			return null;
-		}
-
 		public double getLatitude() {
 			return point.getLatitude();
 		}
@@ -76,10 +63,6 @@ public class MapMarkersHelper {
 			return point.getLongitude();
 		}
 
-		public int getColorIndex() {
-			return colorIndex;
-		}
-
 		@Override
 		public int getColor() {
 			return 0;
@@ -105,7 +88,7 @@ public class MapMarkersHelper {
 		List<String> desc = settings.getMapMarkersPointDescriptions(ips.size());
 		List<Integer> colors = settings.getMapMarkersColors(ips.size());
 		for (int i = 0; i < ips.size(); i++) {
-			final MapMarker mapMarker = new MapMarker(ips.get(i),
+			MapMarker mapMarker = new MapMarker(ips.get(i),
 					PointDescription.deserializeFromString(desc.get(i), ips.get(i)), colors.get(i), i);
 			mapMarkers.add(mapMarker);
 			lookupAddress(mapMarker, false);
@@ -114,8 +97,9 @@ public class MapMarkersHelper {
 		desc = settings.getMapMarkersHistoryPointDescriptions(ips.size());
 		colors = settings.getMapMarkersHistoryColors(ips.size());
 		for (int i = 0; i < ips.size(); i++) {
-			final MapMarker mapMarker = new MapMarker(ips.get(i),
+			MapMarker mapMarker = new MapMarker(ips.get(i),
 					PointDescription.deserializeFromString(desc.get(i), ips.get(i)), colors.get(i), i);
+			mapMarker.history = true;
 			mapMarkersHistory.add(mapMarker);
 			lookupAddress(mapMarker, true);
 		}
@@ -162,7 +146,7 @@ public class MapMarkersHelper {
 	}
 
 	public List<LatLon> getActiveMarkersLatLon() {
-		List<LatLon> list = new ArrayList<LatLon>();
+		List<LatLon> list = new ArrayList<>();
 		for (MapMarker m : this.mapMarkers) {
 			list.add(m.point);
 		}
@@ -170,7 +154,7 @@ public class MapMarkersHelper {
 	}
 
 	public List<LatLon> getMarkersHistoryLatLon() {
-		List<LatLon> list = new ArrayList<LatLon>();
+		List<LatLon> list = new ArrayList<>();
 		for (MapMarker m : this.mapMarkersHistory) {
 			list.add(m.point);
 		}
@@ -195,7 +179,7 @@ public class MapMarkersHelper {
 		refresh();
 	}
 
-	public void addMapMarker(final LatLon point, PointDescription historyName) {
+	public void addMapMarker(LatLon point, PointDescription historyName) {
 		if (point != null) {
 			final PointDescription pointDescription;
 			if (historyName == null) {
@@ -214,9 +198,65 @@ public class MapMarkersHelper {
 			}
 			settings.insertMapMarker(point.getLatitude(), point.getLongitude(),
 					pointDescription, colorIndex, mapMarkers.size());
+
+			readFromSettings();
+			refresh();
+		}
+	}
+
+	public void removeMapMarker(MapMarker marker) {
+		if (marker != null) {
+			settings.deleteMapMarker(marker.index);
+			readFromSettings();
+			refresh();
+		}
+	}
+
+	public void addMapMarkerHistory(MapMarker marker) {
+		if (marker != null) {
+			settings.insertMapMarkerHistory(marker.getLatitude(), marker.getLongitude(), marker.pointDescription, marker.colorIndex, 0);
+			readFromSettings();
+			refresh();
+		}
+	}
+
+	public void removeMapMarkerHistory(MapMarker marker) {
+		if (marker != null) {
+			settings.deleteMapMarkerHistory(marker.index);
+			readFromSettings();
+			refresh();
+		}
+	}
+
+	public void saveMapMarkers(List<MapMarker> markers, List<MapMarker> markersHistory) {
+		if (markers != null) {
+			List<LatLon> ls = new ArrayList<>(markers.size());
+			List<String> names = new ArrayList<>(markers.size());
+			List<Integer> colors = new ArrayList<>(markers.size());
+			for (MapMarker marker : markers) {
+				ls.add(marker.point);
+				names.add(PointDescription.serializeToString(marker.pointDescription));
+				colors.add(marker.colorIndex);
+			}
+			settings.saveMapMarkers(ls, names, colors);
+		}
+
+		if (markersHistory != null) {
+			List<LatLon> ls = new ArrayList<>(markersHistory.size());
+			List<String> names = new ArrayList<>(markersHistory.size());
+			List<Integer> colors = new ArrayList<>(markersHistory.size());
+			for (MapMarker marker : markersHistory) {
+				ls.add(marker.point);
+				names.add(PointDescription.serializeToString(marker.pointDescription));
+				colors.add(marker.colorIndex);
+			}
+			settings.saveMapMarkersHistory(ls, names, colors);
+		}
+
+		if (markers != null || markersHistory != null) {
+			readFromSettings();
+			refresh();
 		}
-		readFromSettings();
-		refresh();
 	}
 
 	public void addListener(StateChangedListener<Void> l) {
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index c5ed649abe..15b687c0b8 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1483,6 +1483,7 @@ public class OsmandSettings {
 	public final static String MAP_MARKERS_HISTORY_POINT = "map_markers_history_point"; //$NON-NLS-1$
 	public final static String MAP_MARKERS_HISTORY_COLOR = "map_markers_history_color"; //$NON-NLS-1$
 	public final static String MAP_MARKERS_HISTORY_DESCRIPTION = "map_markers_history_description"; //$NON-NLS-1$
+	public final static int MAP_MARKERS_HISTORY_LIMIT = 30;
 	private MapMarkersStorage mapMarkersStorage = new MapMarkersStorage();
 	private MapMarkersHistoryStorage mapMarkersHistoryStorage = new MapMarkersHistoryStorage();
 
@@ -1562,6 +1563,16 @@ public class OsmandSettings {
 			descriptionsKey = MAP_MARKERS_HISTORY_DESCRIPTION;
 			colorsKey = MAP_MARKERS_HISTORY_COLOR;
 		}
+
+		@Override
+		public boolean savePoints(List<LatLon> ps, List<String> ds, List<Integer> cs) {
+			if (ps.size() > MAP_MARKERS_HISTORY_LIMIT) {
+				ps.remove(ps.size() - 1);
+				ds.remove(ds.size() - 1);
+				cs.remove(cs.size() - 1);
+			}
+			return super.savePoints(ps, ds, cs);
+		}
 	}
 
 	private class MapMarkersStorage extends MapPointsStorage {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 33b3ad8723..4275970f71 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -110,7 +110,7 @@ public class MapActivityActions implements DialogProvider {
 	public void addMapMarker(double latitude, double longitude, PointDescription pd) {
 		MapMarkersHelper markersHelper = getMyApplication().getMapMarkersHelper();
 		markersHelper.addMapMarker(new LatLon(latitude, longitude), pd);
-		openMapMarkersActivity();
+		//openMapMarkersActivity();
 	}
 
 	public void editWaypoints() {
@@ -572,7 +572,7 @@ public class MapActivityActions implements DialogProvider {
 						return true;
 					}
 				}).reg();
-		optionsMenuHelper.item(R.string.map_markers).iconColor(R.drawable.ic_action_waypoint)
+		optionsMenuHelper.item(R.string.map_markers).iconColor(R.drawable.ic_action_flag_dark)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
index f24a25676e..5ca4e7e45a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
@@ -1,9 +1,11 @@
 package net.osmand.plus.activities;
 
+import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.Shape;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -50,6 +52,9 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 		((DynamicListView) getListView()).setDynamicListViewCallbacks(this);
 		swipeDismissListener = new SwipeDismissListViewTouchListener(getListView(),
 				new SwipeDismissListViewTouchListener.DismissCallbacks() {
+
+					private List<Object> deletedMarkers = new ArrayList<>();
+
 					@Override
 					public boolean canDismiss(int position) {
 						List<Object> activeObjects = getListAdapter().getActiveObjects();
@@ -59,42 +64,72 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 
 					@Override
 					public SwipeDismissListViewTouchListener.Undoable onDismiss(final int position) {
-						final Object item;
 						final StableArrayAdapter stableAdapter = getListAdapter();
 						final int activeObjPos;
-						item = stableAdapter.getItem(position);
+						final Object item = stableAdapter.getItem(position);
+						if (item != null) {
+							if (!((MapMarker) item).history) {
+								deletedMarkers.add(item);
+							}
 
-						stableAdapter.setNotifyOnChange(false);
-						stableAdapter.remove(item);
-						stableAdapter.getObjects().remove(item);
-						activeObjPos = stableAdapter.getActiveObjects().indexOf(item);
-						stableAdapter.getActiveObjects().remove(item);
-						stableAdapter.refreshData();
-						stableAdapter.notifyDataSetChanged();
+							stableAdapter.setNotifyOnChange(false);
+							stableAdapter.remove(item);
+							stableAdapter.getObjects().remove(item);
+							activeObjPos = stableAdapter.getActiveObjects().indexOf(item);
+							stableAdapter.getActiveObjects().remove(item);
+							stableAdapter.refreshData();
+							stableAdapter.notifyDataSetChanged();
 
-						return new SwipeDismissListViewTouchListener.Undoable() {
-							@Override
-							public void undo() {
-								if (item != null) {
+							return new SwipeDismissListViewTouchListener.Undoable() {
+								@Override
+								public void undo() {
 									stableAdapter.setNotifyOnChange(false);
 									stableAdapter.insert(item, position);
 									stableAdapter.getObjects().add(position, item);
 									stableAdapter.getActiveObjects().add(activeObjPos, item);
 									stableAdapter.refreshData();
+									deletedMarkers.remove(item);
+									updateMapMarkers(stableAdapter.getActiveObjects());
+									reloadListAdapter();
 								}
-							}
-						};
+							};
+						} else {
+							return null;
+						}
 					}
 
 					@Override
 					public void onHidePopup() {
 						StableArrayAdapter stableAdapter = getListAdapter();
 						stableAdapter.refreshData();
-						// do delete
+						updateMapMarkers(stableAdapter.getActiveObjects());
 						if (stableAdapter.getActiveObjects().size() == 0) {
 							finish();
+						} else {
+							reloadListAdapter();
 						}
 					}
+
+					private void updateMapMarkers(List<Object> objects) {
+						List<MapMarker> markers = new ArrayList<>();
+						List<MapMarker> markersHistory = new ArrayList<>();
+
+						for (Object obj : objects) {
+							MapMarker marker = (MapMarker) obj;
+							if (!marker.history) {
+								markers.add(marker);
+							} else {
+								markersHistory.add(marker);
+							}
+						}
+
+						for (int i = deletedMarkers.size() - 1; i >= 0; i--) {
+							markersHistory.add(0, (MapMarker) deletedMarkers.get(i));
+						}
+						deletedMarkers.clear();
+
+						getMyApplication().getMapMarkersHelper().saveMapMarkers(markers, markersHistory);
+					}
 				});
 
 		//nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
@@ -102,6 +137,16 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 		setListAdapter(getMapMarkersListAdapter());
 	}
 
+	@Override
+	protected void onStart() {
+		super.onStart();
+		if (nightMode) {
+			getListView().setBackgroundColor(getResources().getColor(R.color.ctx_menu_info_view_bg_dark));
+		} else {
+			getListView().setBackgroundColor(getResources().getColor(R.color.ctx_menu_info_view_bg_light));
+		}
+	}
+
 	@Override
 	public StableArrayAdapter getListAdapter() {
 		return (StableArrayAdapter) super.getListAdapter();
@@ -111,7 +156,12 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 		Object obj = getListAdapter().getItem(position);
 		if (obj instanceof MapMarker) {
-			showOnMap((MapMarker) obj);
+			MapMarker marker = (MapMarker) obj;
+			if (!marker.history) {
+				showOnMap(marker);
+			} else {
+				showHistoryOnMap(marker);
+			}
 		}
 	}
 
@@ -247,9 +297,18 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 			btn.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					getListAdapter().notifyDataSetInvalidated();
-					getMyApplication().getMapMarkersHelper().removeMarkersHistory();
-					reloadListAdapter();
+					AlertDialog.Builder builder = new AlertDialog.Builder(MapMarkersActivity.this);
+					builder.setMessage(getString(R.string.clear_markers_history_q))
+							.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
+								@Override
+								public void onClick(DialogInterface dialog, int which) {
+									getListAdapter().notifyDataSetInvalidated();
+									getMyApplication().getMapMarkersHelper().removeMarkersHistory();
+									reloadListAdapter();
+								}
+							})
+							.setNegativeButton(R.string.shared_string_no, null)
+							.show();
 				}
 			});
 		}
@@ -277,11 +336,20 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 	protected void updateMapMarkerInfoView(View localView, final MapMarker marker) {
 		OsmandApplication app = getMyApplication();
 		TextView text = (TextView) localView.findViewById(R.id.waypoint_text);
-		AndroidUtils.setTextPrimaryColor(this, text, nightMode);
 		TextView textShadow = (TextView) localView.findViewById(R.id.waypoint_text_shadow);
 		TextView textDist = (TextView) localView.findViewById(R.id.waypoint_dist);
-		((ImageView) localView.findViewById(R.id.waypoint_icon))
-				.setImageDrawable(getMapMarkerIcon(app, marker.colorIndex));
+		if (!marker.history) {
+			((ImageView) localView.findViewById(R.id.waypoint_icon))
+					.setImageDrawable(getMapMarkerIcon(app, marker.colorIndex));
+			AndroidUtils.setTextPrimaryColor(this, text, nightMode);
+			textDist.setTextColor(getResources().getColor(R.color.color_myloc_distance));
+		} else {
+			((ImageView) localView.findViewById(R.id.waypoint_icon))
+					.setImageDrawable(getMyApplication().getIconsCache()
+							.getContentIcon(R.drawable.ic_action_flag_dark, !nightMode));
+			AndroidUtils.setTextSecondaryColor(this, text, nightMode);
+			AndroidUtils.setTextSecondaryColor(this, textDist, nightMode);
+		}
 
 		LatLon lastKnownMapLocation = app.getSettings().getLastKnownMapLocation();
 		int dist = (int) (MapUtils.getDistance(marker.getLatitude(), marker.getLongitude(),
@@ -335,6 +403,13 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 		MapActivity.launchMapActivityMoveToTop(this);
 	}
 
+	public void showHistoryOnMap(MapMarker marker) {
+		getMyApplication().getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
+				15, new PointDescription(PointDescription.POINT_TYPE_LOCATION, marker.getPointDescription(this).getName()),
+				false, null);
+		MapActivity.launchMapActivityMoveToTop(this);
+	}
+
 	protected String getHeader(int type) {
 		String str = getString(R.string.map_markers);
 		switch (type) {
@@ -358,6 +433,10 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 		}
 		listAdapter.updateObjects(objects, getActiveObjects(objects));
 		listAdapter.notifyDataSetChanged();
+
+		DynamicListView dynamicListView = (DynamicListView) getListView();
+		dynamicListView.setItemsList(listAdapter.getObjects());
+		dynamicListView.setActiveItemsList(listAdapter.getActiveObjects());
 	}
 
 	protected List<Object> getListObjects() {
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/StableArrayAdapter.java b/OsmAnd/src/net/osmand/plus/views/controls/StableArrayAdapter.java
index 871ae0a768..b0f9154436 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/StableArrayAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/StableArrayAdapter.java
@@ -2,12 +2,8 @@ package net.osmand.plus.views.controls;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
 import android.widget.ArrayAdapter;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 

From a77d32bd1b1682b478b2efbc666a442a5781129e Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sun, 7 Feb 2016 21:18:37 +0300
Subject: [PATCH 08/18] Fixes

---
 OsmAnd/src/net/osmand/plus/inapp/util/IabHelper.java            | 1 +
 .../net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/inapp/util/IabHelper.java b/OsmAnd/src/net/osmand/plus/inapp/util/IabHelper.java
index 2251d3e3f7..4e35ef9746 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/util/IabHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/util/IabHelper.java
@@ -270,6 +270,7 @@ public class IabHelper {
         }
         else {
             // no service available to handle that Intent
+            mServiceConn = null;
             if (listener != null) {
                 listener.onIabSetupFinished(
                         new IabResult(BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE,
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index d764d87a62..f3a6f60b1e 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -387,7 +387,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		});
 
 		final ImageButton buttonWaypoint = (ImageButton) view.findViewById(R.id.context_menu_route_button);
-		buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_waypoint,
+		buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_flag_dark,
 				!nightMode ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
 		AndroidUtils.setDashButtonBackground(getMapActivity(), buttonWaypoint, nightMode);
 		buttonWaypoint.setOnClickListener(new View.OnClickListener() {

From 1456b5e3283bca403e7c83e5bbaaff8fbb35c685 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Mon, 8 Feb 2016 11:22:03 +0300
Subject: [PATCH 09/18] Fix markers

---
 OsmAnd/res/values/strings.xml                 |  1 +
 .../plus/activities/MapMarkersActivity.java   | 35 +++++++++++++------
 .../controllers/MapMarkerMenuController.java  |  1 +
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 18daff693a..6798f05e22 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="clear_active_markers_q">Do you want to delete all active markers?</string>
     <string name="clear_markers_history_q">Do you want to clear markers history?</string>
     <string name="active_markers">Active markers</string>
     <string name="map_markers">Map markers</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
index 5ca4e7e45a..e735f9a086 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
@@ -288,15 +288,15 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 		v.findViewById(R.id.check_item).setVisibility(View.GONE);
 		v.findViewById(R.id.ProgressBar).setVisibility(View.GONE);
 
-		if (type == MARKERS_HISTORY) {
-			final Button btn = (Button) v.findViewById(R.id.header_button);
-			btn.setTextColor(!nightMode ? getResources().getColor(R.color.map_widget_blue)
-					: getResources().getColor(R.color.osmand_orange));
-			btn.setText(getString(R.string.shared_string_clear));
-			btn.setVisibility(View.VISIBLE);
-			btn.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
+		final Button btn = (Button) v.findViewById(R.id.header_button);
+		btn.setTextColor(!nightMode ? getResources().getColor(R.color.map_widget_blue)
+				: getResources().getColor(R.color.osmand_orange));
+		btn.setText(getString(R.string.shared_string_clear));
+		btn.setVisibility(View.VISIBLE);
+		btn.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (type == MARKERS_HISTORY) {
 					AlertDialog.Builder builder = new AlertDialog.Builder(MapMarkersActivity.this);
 					builder.setMessage(getString(R.string.clear_markers_history_q))
 							.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
@@ -309,9 +309,22 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 							})
 							.setNegativeButton(R.string.shared_string_no, null)
 							.show();
+				} else if (type == ACTIVE_MARKERS) {
+					AlertDialog.Builder builder = new AlertDialog.Builder(MapMarkersActivity.this);
+					builder.setMessage(getString(R.string.clear_active_markers_q))
+							.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
+								@Override
+								public void onClick(DialogInterface dialog, int which) {
+									getListAdapter().notifyDataSetInvalidated();
+									getMyApplication().getMapMarkersHelper().removeActiveMarkers();
+									reloadListAdapter();
+								}
+							})
+							.setNegativeButton(R.string.shared_string_no, null)
+							.show();
 				}
-			});
-		}
+			}
+		});
 
 		TextView tv = (TextView) v.findViewById(R.id.header_text);
 		AndroidUtils.setTextPrimaryColor(this, tv, nightMode);
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
index b70b786ecd..0fc2f91f79 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
@@ -25,6 +25,7 @@ public class MapMarkerMenuController extends MenuController {
 			@Override
 			public void buttonPressed() {
 				markersHelper.removeMapMarker(getMapMarker().index);
+				markersHelper.addMapMarkerHistory(getMapMarker());
 				getMapActivity().getContextMenu().close();
 			}
 		};

From ac4d6b16a46691fe235abca3ae04126a1d14e0d2 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Mon, 8 Feb 2016 20:15:17 +0300
Subject: [PATCH 10/18] Convert Markers to dashboard. Add sorting

---
 OsmAnd/AndroidManifest.xml                    |   1 -
 .../src/net/osmand/plus/MapMarkersHelper.java |   1 +
 .../osmand/plus/OsmAndAppCustomization.java   |  16 +-
 .../plus/activities/MapActivityActions.java   |  11 +-
 .../osmand/plus/dashboard/DashboardOnMap.java | 124 +++++--
 .../MapMarkerDialogHelper.java}               | 319 +++++++-----------
 .../plus/mapcontextmenu/MapContextMenu.java   |   5 +-
 .../controllers/MapMarkerMenuController.java  |   4 +-
 8 files changed, 229 insertions(+), 252 deletions(-)
 rename OsmAnd/src/net/osmand/plus/{activities/MapMarkersActivity.java => helpers/MapMarkerDialogHelper.java} (52%)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 49648a97e7..c0aa8be30f 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -166,7 +166,6 @@
 		<activity android:name="net.osmand.plus.activities.PluginsActivity" />
 		<activity android:name="net.osmand.plus.activities.PluginActivity" />
 		<activity android:name="net.osmand.plus.activities.ContributionVersionActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/contribution_activity" />
-		<activity android:name="net.osmand.plus.activities.MapMarkersActivity"/>
 
 
 		<activity android:name="net.osmand.plus.osmo.SettingsOsMoActivity" android:configChanges="keyboardHidden|orientation" />
diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index 57638217c1..9ced0f2f35 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -30,6 +30,7 @@ public class MapMarkersHelper {
 		public int colorIndex;
 		public int index;
 		public boolean history;
+		public int dist;
 
 		public MapMarker(LatLon point, PointDescription name, int colorIndex, int index) {
 			this.point = point;
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
index 1044dc3449..aeab7e17a6 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
@@ -1,15 +1,11 @@
 package net.osmand.plus;
 
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import android.app.Activity;
 
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
 import net.osmand.data.LocationPoint;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.MapMarkersActivity;
 import net.osmand.plus.activities.PluginsActivity;
 import net.osmand.plus.activities.SettingsActivity;
 import net.osmand.plus.activities.TrackActivity;
@@ -20,7 +16,11 @@ import net.osmand.plus.helpers.WaypointHelper;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.views.OsmandMapTileView;
-import android.app.Activity;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 public class OsmAndAppCustomization {
 	
@@ -68,10 +68,6 @@ public class OsmAndAppCustomization {
 		return FavoritesActivity.class;
 	}
 
-	public Class<MapMarkersActivity> getMapMarkersActivity(){
-		return MapMarkersActivity.class;
-	}
-
 	public Class<? extends Activity> getDownloadIndexActivity() {
 		return DownloadActivity.class;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 4275970f71..1707636fb4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -577,8 +577,8 @@ public class MapActivityActions implements DialogProvider {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
 						MapActivity.clearPrevActivityIntent();
-						openMapMarkersActivity();
-						return true;
+						mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.MAP_MARKERS);
+						return false;
 					}
 				}).reg();
 		optionsMenuHelper.item(R.string.get_directions).iconColor(R.drawable.ic_action_gdirections_dark)
@@ -746,13 +746,6 @@ public class MapActivityActions implements DialogProvider {
 		return optionsMenuHelper;
 	}
 
-	public void openMapMarkersActivity() {
-		Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization()
-				.getMapMarkersActivity());
-		newIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-		mapActivity.startActivity(newIntent);
-	}
-
 	public void openIntermediatePointsDialog() {
 		mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.WAYPOINTS);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 8c2b27749f..7d8dac5127 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -41,6 +41,8 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
 import net.osmand.plus.ContextMenuAdapter.OnRowItemClick;
 import net.osmand.plus.IconsCache;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
@@ -54,6 +56,7 @@ import net.osmand.plus.dialogs.ConfigureMapMenu;
 import net.osmand.plus.dialogs.RasterMapMenu;
 import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.helpers.MapMarkerDialogHelper;
 import net.osmand.plus.helpers.WaypointDialogHelper;
 import net.osmand.plus.helpers.WaypointDialogHelper.WaypointDialogHelperCallbacks;
 import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
@@ -68,6 +71,7 @@ import net.osmand.plus.views.controls.DynamicListView;
 import net.osmand.plus.views.controls.DynamicListViewCallbacks;
 import net.osmand.plus.views.controls.StableArrayAdapter;
 import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener;
+import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener.DismissCallbacks;
 import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener.Undoable;
 
 import java.lang.ref.WeakReference;
@@ -141,6 +145,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 	int baseColor;
 
 	private WaypointDialogHelper waypointDialogHelper;
+	private MapMarkerDialogHelper mapMarkerDialogHelper;
 	private final int[] running = new int[]{-1};
 	private List<LocationPointWrapper> deletedPoints = new ArrayList<>();
 	private Drawable gradientToolbar;
@@ -159,7 +164,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 		ROUTE_PREFERENCES,
 		DASHBOARD,
 		OVERLAY_MAP,
-		UNDERLAY_MAP
+		UNDERLAY_MAP,
+		MAP_MARKERS
 	}
 
 	private Map<DashboardActionButtonType, DashboardActionButton> actionButtons = new HashMap<>();
@@ -184,6 +190,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 		baseColor = mapActivity.getResources().getColor(R.color.osmand_orange) & 0x00ffffff;
 		waypointDialogHelper = new WaypointDialogHelper(mapActivity);
 		waypointDialogHelper.setWaypointDialogHelperCallbacks(this);
+		mapMarkerDialogHelper = new MapMarkerDialogHelper(mapActivity);
 		landscape = !AndroidUiHelper.isOrientationPortrait(mapActivity);
 		dashboardView = (FrameLayout) mapActivity.findViewById(R.id.dashboard);
 		final View.OnClickListener listener = new View.OnClickListener() {
@@ -204,11 +211,14 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 		// the pressed state (the list selector), handling list item clicks, etc.
 		swipeDismissListener = new SwipeDismissListViewTouchListener(
 						listView,
-						new SwipeDismissListViewTouchListener.DismissCallbacks() {
+						new DismissCallbacks() {
+
+							private List<Object> deletedMarkers = new ArrayList<>();
+
 							@Override
 							public boolean canDismiss(int position) {
 								boolean res = false;
-								if (visibleType == DashboardType.WAYPOINTS && listAdapter instanceof StableArrayAdapter) {
+								if (listAdapter instanceof StableArrayAdapter) {
 									List<Object> activeObjects = ((StableArrayAdapter) listAdapter).getActiveObjects();
 									Object obj = listAdapter.getItem(position);
 									res = activeObjects.contains(obj);
@@ -225,6 +235,12 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 									stableAdapter = (StableArrayAdapter) listAdapter;
 									item = stableAdapter.getItem(position);
 
+									if (visibleType == DashboardType.MAP_MARKERS) {
+										if (!((MapMarker) item).history) {
+											deletedMarkers.add(item);
+										}
+									}
+
 									stableAdapter.setNotifyOnChange(false);
 									stableAdapter.remove(item);
 									stableAdapter.getObjects().remove(item);
@@ -247,13 +263,19 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 											stableAdapter.getObjects().add(position, item);
 											stableAdapter.getActiveObjects().add(activeObjPos, item);
 											stableAdapter.refreshData();
-											onItemsSwapped(stableAdapter.getActiveObjects());
+											if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
+												onItemsSwapped(stableAdapter.getActiveObjects());
+											} else if (visibleType == DashboardType.MAP_MARKERS) {
+												deletedMarkers.remove(item);
+												updateMapMarkers(stableAdapter.getActiveObjects());
+												reloadAdapter();
+											}
 										}
 									}
 
 									@Override
 									public String getTitle() {
-										if (visibleType == DashboardType.WAYPOINTS
+										if ((visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT)
 												&& (getMyApplication().getRoutingHelper().isRoutePlanningMode() || getMyApplication().getRoutingHelper().isFollowingMode())
 												&& item != null
 												&& stableAdapter.getActiveObjects().size() == 0) {
@@ -270,14 +292,45 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 								if (listAdapter instanceof StableArrayAdapter) {
 									StableArrayAdapter stableAdapter = (StableArrayAdapter) listAdapter;
 									stableAdapter.refreshData();
-									onItemsSwapped(stableAdapter.getActiveObjects());
+									if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
+										onItemsSwapped(stableAdapter.getActiveObjects());
+									} else if (visibleType == DashboardType.MAP_MARKERS) {
+										updateMapMarkers(stableAdapter.getActiveObjects());
+									}
 									if (stableAdapter.getActiveObjects().size() == 0) {
 										hideDashboard();
-										mapActivity.getMapActions().stopNavigationWithoutConfirm();
-										mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
+										if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
+											mapActivity.getMapActions().stopNavigationWithoutConfirm();
+											mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
+										}
+									} else {
+										if (visibleType == DashboardType.MAP_MARKERS) {
+											reloadAdapter();
+										}
 									}
 								}
 							}
+
+							private void updateMapMarkers(List<Object> objects) {
+								List<MapMarker> markers = new ArrayList<>();
+								List<MapMarker> markersHistory = new ArrayList<>();
+
+								for (Object obj : objects) {
+									MapMarker marker = (MapMarker) obj;
+									if (!marker.history) {
+										markers.add(marker);
+									} else {
+										markersHistory.add(marker);
+									}
+								}
+
+								for (int i = deletedMarkers.size() - 1; i >= 0; i--) {
+									markersHistory.add(0, (MapMarker) deletedMarkers.get(i));
+								}
+								deletedMarkers.clear();
+
+								getMyApplication().getMapMarkersHelper().saveMapMarkers(markers, markersHistory);
+							}
 						});
 
 		gradientToolbar = mapActivity.getResources().getDrawable(R.drawable.gradient_toolbar).mutate();
@@ -358,6 +411,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 			tv.setText(R.string.map_underlay);
 		} else if (visibleType == DashboardType.OVERLAY_MAP) {
 			tv.setText(R.string.map_overlay);
+		} else if (visibleType == DashboardType.MAP_MARKERS) {
+			tv.setText(R.string.map_markers);
 		}
 		ImageView edit = (ImageView) dashboardView.findViewById(R.id.toolbar_edit);
 		edit.setVisibility(View.GONE);
@@ -399,17 +454,19 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 				});
 			}
 		}
-//		if (waypointsEdit) {
-//			ok.setVisibility(View.VISIBLE);
-//			ok.setOnClickListener(new View.OnClickListener() {
-//
-//				@Override
-//				public void onClick(View v) {
-//					mapActivity.getMyApplication().getWaypointHelper().removeVisibleLocationPoint(deletedPoints);
-//					hideDashboard();
-//				}
-//			});
-//		}
+
+		if (visibleType == DashboardType.MAP_MARKERS
+				&& getMyApplication().getMapMarkersHelper().getActiveMapMarkers().size() > 0) {
+			sort.setVisibility(View.VISIBLE);
+			sort.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					mapMarkerDialogHelper.setSorted(!mapMarkerDialogHelper.isSorted());
+					reloadAdapter();
+				}
+			});
+		}
+
 		if (visibleType == DashboardType.DASHBOARD || visibleType == DashboardType.LIST_MENU) {
 			settingsButton.setVisibility(View.VISIBLE);
 			settingsButton.setOnClickListener(new View.OnClickListener() {
@@ -672,7 +729,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 			} else {
 				listView.setBackgroundColor(mapActivity.getResources().getColor(R.color.ctx_menu_info_view_bg_dark));
 			}
-			if (visibleType != DashboardType.WAYPOINTS) {
+			if (visibleType != DashboardType.WAYPOINTS && visibleType != DashboardType.MAP_MARKERS) {
 				Drawable d = new ColorDrawable(mapActivity.getResources().getColor(R.color.dashboard_divider_dark));
 				listView.setDivider(d);
 				listView.setDividerHeight(dpToPx(1f));
@@ -685,7 +742,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 			} else {
 				listView.setBackgroundColor(mapActivity.getResources().getColor(R.color.ctx_menu_info_view_bg_light));
 			}
-			if (visibleType != DashboardType.WAYPOINTS) {
+			if (visibleType != DashboardType.WAYPOINTS && visibleType != DashboardType.MAP_MARKERS) {
 				Drawable d = new ColorDrawable(mapActivity.getResources().getColor(R.color.dashboard_divider_light));
 				listView.setDivider(d);
 				listView.setDividerHeight(dpToPx(1f));
@@ -703,6 +760,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 	private void updateListAdapter() {
 		ContextMenuAdapter cm = null;
 		if (DashboardType.WAYPOINTS == visibleType || DashboardType.WAYPOINTS_FLAT == visibleType) {
+
 			StableArrayAdapter listAdapter = waypointDialogHelper.getWaypointsDrawerAdapter(true, deletedPoints, mapActivity, running,
 					DashboardType.WAYPOINTS_FLAT == visibleType, nightMode);
 			OnItemClickListener listener = waypointDialogHelper.getDrawerItemClickListener(mapActivity, running,
@@ -714,7 +772,20 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 
 			updateListAdapter(listAdapter, listener);
 
+		} else if (DashboardType.MAP_MARKERS == visibleType) {
+
+			mapMarkerDialogHelper.setNightMode(nightMode);
+			StableArrayAdapter listAdapter = mapMarkerDialogHelper.getMapMarkersListAdapter();
+			OnItemClickListener listener = mapMarkerDialogHelper.getItemClickListener(listAdapter);
+
+			DynamicListView dynamicListView = (DynamicListView) listView;
+			dynamicListView.setItemsList(listAdapter.getObjects());
+			dynamicListView.setActiveItemsList(listAdapter.getActiveObjects());
+
+			updateListAdapter(listAdapter, listener);
+
 		} else {
+
 			if (DashboardType.CONFIGURE_SCREEN == visibleType) {
 				cm = mapActivity.getMapLayers().getMapWidgetRegistry().getViewConfigureMenuAdapter(mapActivity);
 			} else if (DashboardType.CONFIGURE_MAP == visibleType) {
@@ -749,7 +820,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 	}
 
 	public void refreshContent(boolean force) {
-		if (visibleType == DashboardType.WAYPOINTS || force) {
+		if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.MAP_MARKERS || force) {
 			updateListAdapter();
 		} else if (visibleType == DashboardType.CONFIGURE_MAP || visibleType == DashboardType.ROUTE_PREFERENCES) {
 			int index = listView.getFirstVisiblePosition();
@@ -1254,10 +1325,13 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 
 	@Override
 	public void reloadAdapter() {
-		if ((DashboardType.WAYPOINTS == visibleType || DashboardType.WAYPOINTS_FLAT == visibleType)
-				&& listAdapter != null && listAdapter instanceof StableArrayAdapter) {
+		if (listAdapter != null && listAdapter instanceof StableArrayAdapter) {
 			StableArrayAdapter stableAdapter = (StableArrayAdapter) listAdapter;
-			waypointDialogHelper.reloadListAdapter(stableAdapter);
+			if (DashboardType.WAYPOINTS == visibleType || DashboardType.WAYPOINTS_FLAT == visibleType) {
+				waypointDialogHelper.reloadListAdapter(stableAdapter);
+			} else if (DashboardType.MAP_MARKERS == visibleType) {
+				mapMarkerDialogHelper.reloadListAdapter(stableAdapter);
+			}
 			if (listView instanceof DynamicListView) {
 				DynamicListView dynamicListView = (DynamicListView) listView;
 				dynamicListView.setItemsList(stableAdapter.getObjects());
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
similarity index 52%
rename from OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
rename to OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
index e735f9a086..fd93adc3f5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
@@ -1,14 +1,14 @@
-package net.osmand.plus.activities;
+package net.osmand.plus.helpers;
 
 import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.Shape;
-import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -23,152 +23,62 @@ import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.views.controls.DynamicListView;
-import net.osmand.plus.views.controls.DynamicListViewCallbacks;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.views.controls.ListDividerShape;
 import net.osmand.plus.views.controls.StableArrayAdapter;
-import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
-public class MapMarkersActivity extends OsmandListActivity implements DynamicListViewCallbacks {
-
+public class MapMarkerDialogHelper {
 	public static final int ACTIVE_MARKERS = 0;
 	public static final int MARKERS_HISTORY = 1;
 
-	private SwipeDismissListViewTouchListener swipeDismissListener;
+	private MapActivity mapActivity;
+	private OsmandApplication app;
+	private boolean sorted;
 	private boolean nightMode;
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		getMyApplication().applyTheme(this);
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.map_markers);
-		getSupportActionBar().setTitle(R.string.map_markers);
-
-		((DynamicListView) getListView()).setDynamicListViewCallbacks(this);
-		swipeDismissListener = new SwipeDismissListViewTouchListener(getListView(),
-				new SwipeDismissListViewTouchListener.DismissCallbacks() {
-
-					private List<Object> deletedMarkers = new ArrayList<>();
-
-					@Override
-					public boolean canDismiss(int position) {
-						List<Object> activeObjects = getListAdapter().getActiveObjects();
-						Object obj = getListAdapter().getItem(position);
-						return activeObjects.contains(obj);
-					}
-
-					@Override
-					public SwipeDismissListViewTouchListener.Undoable onDismiss(final int position) {
-						final StableArrayAdapter stableAdapter = getListAdapter();
-						final int activeObjPos;
-						final Object item = stableAdapter.getItem(position);
-						if (item != null) {
-							if (!((MapMarker) item).history) {
-								deletedMarkers.add(item);
-							}
-
-							stableAdapter.setNotifyOnChange(false);
-							stableAdapter.remove(item);
-							stableAdapter.getObjects().remove(item);
-							activeObjPos = stableAdapter.getActiveObjects().indexOf(item);
-							stableAdapter.getActiveObjects().remove(item);
-							stableAdapter.refreshData();
-							stableAdapter.notifyDataSetChanged();
-
-							return new SwipeDismissListViewTouchListener.Undoable() {
-								@Override
-								public void undo() {
-									stableAdapter.setNotifyOnChange(false);
-									stableAdapter.insert(item, position);
-									stableAdapter.getObjects().add(position, item);
-									stableAdapter.getActiveObjects().add(activeObjPos, item);
-									stableAdapter.refreshData();
-									deletedMarkers.remove(item);
-									updateMapMarkers(stableAdapter.getActiveObjects());
-									reloadListAdapter();
-								}
-							};
-						} else {
-							return null;
-						}
-					}
-
-					@Override
-					public void onHidePopup() {
-						StableArrayAdapter stableAdapter = getListAdapter();
-						stableAdapter.refreshData();
-						updateMapMarkers(stableAdapter.getActiveObjects());
-						if (stableAdapter.getActiveObjects().size() == 0) {
-							finish();
-						} else {
-							reloadListAdapter();
-						}
-					}
-
-					private void updateMapMarkers(List<Object> objects) {
-						List<MapMarker> markers = new ArrayList<>();
-						List<MapMarker> markersHistory = new ArrayList<>();
-
-						for (Object obj : objects) {
-							MapMarker marker = (MapMarker) obj;
-							if (!marker.history) {
-								markers.add(marker);
-							} else {
-								markersHistory.add(marker);
-							}
-						}
-
-						for (int i = deletedMarkers.size() - 1; i >= 0; i--) {
-							markersHistory.add(0, (MapMarker) deletedMarkers.get(i));
-						}
-						deletedMarkers.clear();
-
-						getMyApplication().getMapMarkersHelper().saveMapMarkers(markers, markersHistory);
-					}
-				});
-
-		//nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
-		nightMode = !getMyApplication().getSettings().isLightContent();
-		setListAdapter(getMapMarkersListAdapter());
+	public MapMarkerDialogHelper(MapActivity mapActivity) {
+		this.mapActivity = mapActivity;
+		app = mapActivity.getMyApplication();
 	}
 
-	@Override
-	protected void onStart() {
-		super.onStart();
-		if (nightMode) {
-			getListView().setBackgroundColor(getResources().getColor(R.color.ctx_menu_info_view_bg_dark));
-		} else {
-			getListView().setBackgroundColor(getResources().getColor(R.color.ctx_menu_info_view_bg_light));
-		}
+	public boolean isNightMode() {
+		return nightMode;
 	}
 
-	@Override
-	public StableArrayAdapter getListAdapter() {
-		return (StableArrayAdapter) super.getListAdapter();
+	public void setNightMode(boolean nightMode) {
+		this.nightMode = nightMode;
 	}
 
-	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		Object obj = getListAdapter().getItem(position);
-		if (obj instanceof MapMarker) {
-			MapMarker marker = (MapMarker) obj;
-			if (!marker.history) {
-				showOnMap(marker);
-			} else {
-				showHistoryOnMap(marker);
+	public boolean isSorted() {
+		return sorted;
+	}
+
+	public void setSorted(boolean sorted) {
+		this.sorted = sorted;
+	}
+
+	public AdapterView.OnItemClickListener getItemClickListener(final ArrayAdapter<Object> listAdapter) {
+		return new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> adapterView, View view, int item, long l) {
+				Object obj = listAdapter.getItem(item);
+				if (obj instanceof MapMarker) {
+					MapMarker marker = (MapMarker) obj;
+					if (!marker.history) {
+						showOnMap(marker);
+					} else {
+						showHistoryOnMap(marker);
+					}
+				}
 			}
-		}
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		getListAdapter().notifyDataSetChanged();
+		};
 	}
 
 	public StableArrayAdapter getMapMarkersListAdapter() {
@@ -176,7 +86,7 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 		final List<Object> objects = getListObjects();
 		List<Object> activeObjects = getActiveObjects(objects);
 
-		final StableArrayAdapter listAdapter = new StableArrayAdapter(getMyApplication(),
+		final StableArrayAdapter listAdapter = new StableArrayAdapter(mapActivity,
 				R.layout.waypoint_reached, R.id.title, objects, activeObjects) {
 
 			@Override
@@ -199,16 +109,16 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 				boolean topDividerView = (obj instanceof Boolean) && ((Boolean) obj);
 				boolean bottomDividerView = (obj instanceof Boolean) && !((Boolean) obj);
 				if (labelView) {
-					v = createItemForCategory((Integer) obj);
-					AndroidUtils.setListItemBackground(MapMarkersActivity.this, v, nightMode);
+					v = createItemForCategory(this, (Integer) obj);
+					AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
 				} else if (topDividerView) {
-					v = getLayoutInflater().inflate(R.layout.card_top_divider, null);
+					v = mapActivity.getLayoutInflater().inflate(R.layout.card_top_divider, null);
 				} else if (bottomDividerView) {
-					v = getLayoutInflater().inflate(R.layout.card_bottom_divider, null);
+					v = mapActivity.getLayoutInflater().inflate(R.layout.card_bottom_divider, null);
 				} else if (obj instanceof MapMarker) {
 					MapMarker marker = (MapMarker) obj;
 					v = updateMapMarkerItemView(v, marker);
-					AndroidUtils.setListItemBackground(MapMarkersActivity.this, v, nightMode);
+					AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
 				}
 				return v;
 			}
@@ -218,15 +128,15 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 			if (p instanceof MapMarker) {
 				final MapMarker marker = (MapMarker) p;
 				if (marker.getOriginalPointDescription() != null
-						&& marker.getOriginalPointDescription().isSearchingAddress(this)) {
+						&& marker.getOriginalPointDescription().isSearchingAddress(mapActivity)) {
 					GeocodingLookupService.AddressLookupRequest lookupRequest
 							= new GeocodingLookupService.AddressLookupRequest(marker.point, new GeocodingLookupService.OnAddressLookupResult() {
 						@Override
 						public void geocodingDone(String address) {
-							reloadListAdapter();
+							reloadListAdapter(listAdapter);
 						}
 					}, null);
-					getMyApplication().getGeocodingLookupService().lookupAddress(lookupRequest);
+					app.getGeocodingLookupService().lookupAddress(lookupRequest);
 				}
 			}
 		}
@@ -237,18 +147,18 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 	private List<Drawable> getCustomDividers(List<Object> points) {
 		int color;
 		if (nightMode) {
-			color = getResources().getColor(R.color.dashboard_divider_dark);
+			color = mapActivity.getResources().getColor(R.color.dashboard_divider_dark);
 		} else {
-			color = getResources().getColor(R.color.dashboard_divider_light);
+			color = mapActivity.getResources().getColor(R.color.dashboard_divider_light);
 		}
 
 		Shape fullDividerShape = new ListDividerShape(color, 0);
-		Shape halfDividerShape = new ListDividerShape(color, AndroidUtils.dpToPx(this, 56f));
+		Shape halfDividerShape = new ListDividerShape(color, AndroidUtils.dpToPx(mapActivity, 56f));
 
 		final ShapeDrawable fullDivider = new ShapeDrawable(fullDividerShape);
 		final ShapeDrawable halfDivider = new ShapeDrawable(halfDividerShape);
 
-		int divHeight = AndroidUtils.dpToPx(this, 1f);
+		int divHeight = AndroidUtils.dpToPx(mapActivity, 1f);
 		fullDivider.setIntrinsicHeight(divHeight);
 		halfDivider.setIntrinsicHeight(divHeight);
 
@@ -283,41 +193,41 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 		return res;
 	}
 
-	protected View createItemForCategory(final int type) {
-		View v = getLayoutInflater().inflate(R.layout.waypoint_header, null);
+	protected View createItemForCategory(final ArrayAdapter<Object> listAdapter, final int type) {
+		View v = mapActivity.getLayoutInflater().inflate(R.layout.waypoint_header, null);
 		v.findViewById(R.id.check_item).setVisibility(View.GONE);
 		v.findViewById(R.id.ProgressBar).setVisibility(View.GONE);
 
 		final Button btn = (Button) v.findViewById(R.id.header_button);
-		btn.setTextColor(!nightMode ? getResources().getColor(R.color.map_widget_blue)
-				: getResources().getColor(R.color.osmand_orange));
-		btn.setText(getString(R.string.shared_string_clear));
+		btn.setTextColor(!nightMode ? mapActivity.getResources().getColor(R.color.map_widget_blue)
+				: mapActivity.getResources().getColor(R.color.osmand_orange));
+		btn.setText(mapActivity.getString(R.string.shared_string_clear));
 		btn.setVisibility(View.VISIBLE);
 		btn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				if (type == MARKERS_HISTORY) {
-					AlertDialog.Builder builder = new AlertDialog.Builder(MapMarkersActivity.this);
-					builder.setMessage(getString(R.string.clear_markers_history_q))
+					AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
+					builder.setMessage(mapActivity.getString(R.string.clear_markers_history_q))
 							.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 								@Override
 								public void onClick(DialogInterface dialog, int which) {
-									getListAdapter().notifyDataSetInvalidated();
-									getMyApplication().getMapMarkersHelper().removeMarkersHistory();
-									reloadListAdapter();
+									listAdapter.notifyDataSetInvalidated();
+									app.getMapMarkersHelper().removeMarkersHistory();
+									reloadListAdapter(listAdapter);
 								}
 							})
 							.setNegativeButton(R.string.shared_string_no, null)
 							.show();
 				} else if (type == ACTIVE_MARKERS) {
-					AlertDialog.Builder builder = new AlertDialog.Builder(MapMarkersActivity.this);
-					builder.setMessage(getString(R.string.clear_active_markers_q))
+					AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
+					builder.setMessage(mapActivity.getString(R.string.clear_active_markers_q))
 							.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 								@Override
 								public void onClick(DialogInterface dialog, int which) {
-									getListAdapter().notifyDataSetInvalidated();
-									getMyApplication().getMapMarkersHelper().removeActiveMarkers();
-									reloadListAdapter();
+									listAdapter.notifyDataSetInvalidated();
+									app.getMapMarkersHelper().removeActiveMarkers();
+									reloadListAdapter(listAdapter);
 								}
 							})
 							.setNegativeButton(R.string.shared_string_no, null)
@@ -327,14 +237,14 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 		});
 
 		TextView tv = (TextView) v.findViewById(R.id.header_text);
-		AndroidUtils.setTextPrimaryColor(this, tv, nightMode);
+		AndroidUtils.setTextPrimaryColor(mapActivity, tv, nightMode);
 		tv.setText(getHeader(type));
 		return v;
 	}
 
 	protected View updateMapMarkerItemView(View v, final MapMarker marker) {
 		if (v == null || v.findViewById(R.id.info_close) == null) {
-			v = getLayoutInflater().inflate(R.layout.waypoint_reached, null);
+			v = mapActivity.getLayoutInflater().inflate(R.layout.waypoint_reached, null);
 		}
 		updateMapMarkerInfoView(v, marker);
 		final View more = v.findViewById(R.id.all_points);
@@ -347,26 +257,23 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 	}
 
 	protected void updateMapMarkerInfoView(View localView, final MapMarker marker) {
-		OsmandApplication app = getMyApplication();
 		TextView text = (TextView) localView.findViewById(R.id.waypoint_text);
 		TextView textShadow = (TextView) localView.findViewById(R.id.waypoint_text_shadow);
 		TextView textDist = (TextView) localView.findViewById(R.id.waypoint_dist);
 		if (!marker.history) {
 			((ImageView) localView.findViewById(R.id.waypoint_icon))
 					.setImageDrawable(getMapMarkerIcon(app, marker.colorIndex));
-			AndroidUtils.setTextPrimaryColor(this, text, nightMode);
-			textDist.setTextColor(getResources().getColor(R.color.color_myloc_distance));
+			AndroidUtils.setTextPrimaryColor(mapActivity, text, nightMode);
+			textDist.setTextColor(mapActivity.getResources().getColor(R.color.color_myloc_distance));
 		} else {
 			((ImageView) localView.findViewById(R.id.waypoint_icon))
-					.setImageDrawable(getMyApplication().getIconsCache()
+					.setImageDrawable(app.getIconsCache()
 							.getContentIcon(R.drawable.ic_action_flag_dark, !nightMode));
-			AndroidUtils.setTextSecondaryColor(this, text, nightMode);
-			AndroidUtils.setTextSecondaryColor(this, textDist, nightMode);
+			AndroidUtils.setTextSecondaryColor(mapActivity, text, nightMode);
+			AndroidUtils.setTextSecondaryColor(mapActivity, textDist, nightMode);
 		}
 
-		LatLon lastKnownMapLocation = app.getSettings().getLastKnownMapLocation();
-		int dist = (int) (MapUtils.getDistance(marker.getLatitude(), marker.getLongitude(),
-				lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+		int dist = marker.dist;
 
 		//if (dist > 0) {
 		textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
@@ -411,62 +318,81 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 	}
 
 	public void showOnMap(MapMarker marker) {
-		getMyApplication().getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
-				15, marker.getPointDescription(this), true, marker);
-		MapActivity.launchMapActivityMoveToTop(this);
+		app.getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
+				15, marker.getPointDescription(mapActivity), true, marker);
+		MapActivity.launchMapActivityMoveToTop(mapActivity);
 	}
 
 	public void showHistoryOnMap(MapMarker marker) {
-		getMyApplication().getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
-				15, new PointDescription(PointDescription.POINT_TYPE_LOCATION, marker.getPointDescription(this).getName()),
+		app.getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
+				15, new PointDescription(PointDescription.POINT_TYPE_LOCATION,
+						marker.getPointDescription(mapActivity).getName()),
 				false, null);
-		MapActivity.launchMapActivityMoveToTop(this);
+		MapActivity.launchMapActivityMoveToTop(mapActivity);
 	}
 
 	protected String getHeader(int type) {
-		String str = getString(R.string.map_markers);
+		String str = mapActivity.getString(R.string.map_markers);
 		switch (type) {
 			case ACTIVE_MARKERS:
-				str = getString(R.string.active_markers);
+				str = mapActivity.getString(R.string.active_markers);
 				break;
 			case MARKERS_HISTORY:
-				str = getString(R.string.shared_string_history);
+				str = mapActivity.getString(R.string.shared_string_history);
 				break;
 		}
 		return str;
 	}
-
-	public void reloadListAdapter() {
-		StableArrayAdapter listAdapter = getListAdapter();
+	
+	public void reloadListAdapter(ArrayAdapter<Object> listAdapter) {
 		listAdapter.setNotifyOnChange(false);
 		listAdapter.clear();
 		List<Object> objects = getListObjects();
 		for (Object point : objects) {
 			listAdapter.add(point);
 		}
-		listAdapter.updateObjects(objects, getActiveObjects(objects));
+		if (listAdapter instanceof StableArrayAdapter) {
+			((StableArrayAdapter) listAdapter).updateObjects(objects, getActiveObjects(objects));
+		}
 		listAdapter.notifyDataSetChanged();
+	}
 
-		DynamicListView dynamicListView = (DynamicListView) getListView();
-		dynamicListView.setItemsList(listAdapter.getObjects());
-		dynamicListView.setActiveItemsList(listAdapter.getActiveObjects());
+	public void calcDistance(LatLon anchor, List<MapMarker> markers) {
+		for (MapMarker m : markers) {
+			m.dist = (int) (MapUtils.getDistance(m.getLatitude(), m.getLongitude(),
+					anchor.getLatitude(), anchor.getLongitude()));
+		}
 	}
 
 	protected List<Object> getListObjects() {
 		final List<Object> objects = new ArrayList<>();
-		final MapMarkersHelper markersHelper = getMyApplication().getMapMarkersHelper();
+		final MapMarkersHelper markersHelper = app.getMapMarkersHelper();
 
-		List<MapMarker> activeMarkers = markersHelper.getActiveMapMarkers();
+		LatLon mapLocation =
+				new LatLon(mapActivity.getMapView().getLatitude(), mapActivity.getMapView().getLongitude());
+
+		List<MapMarker> activeMarkers = new ArrayList<>(markersHelper.getActiveMapMarkers());
+		calcDistance(mapLocation, activeMarkers);
+		if (sorted) {
+			Collections.sort(activeMarkers, new Comparator<MapMarker>() {
+				@Override
+				public int compare(MapMarker lhs, MapMarker rhs) {
+					return lhs.dist < rhs.dist ? -1 : (lhs.dist == rhs.dist ? 0 : 1);
+				}
+			});
+		}
 		if (activeMarkers.size() > 0) {
-			objects.add(true);
 			objects.add(ACTIVE_MARKERS);
 			objects.addAll(activeMarkers);
 			objects.add(false);
 		}
 
-		List<MapMarker> markersHistory = markersHelper.getMapMarkersHistory();
+		List<MapMarker> markersHistory = new ArrayList<>(markersHelper.getMapMarkersHistory());
+		calcDistance(mapLocation, markersHistory);
 		if (markersHistory.size() > 0) {
-			objects.add(true);
+			if (activeMarkers.size() > 0) {
+				objects.add(true);
+			}
 			objects.add(MARKERS_HISTORY);
 			objects.addAll(markersHistory);
 			objects.add(false);
@@ -502,19 +428,4 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
 				return iconsCache.getIcon(R.drawable.map_marker_blue);
 		}
 	}
-
-	@Override
-	public void onWindowVisibilityChanged(int visibility) {
-		if (visibility != View.VISIBLE && swipeDismissListener != null) {
-			swipeDismissListener.discardUndo();
-		}
-	}
-
-	@Override
-	public void onItemsSwapped(List<Object> items) {
-	}
-
-	@Override
-	public void onItemSwapping(int position) {
-	}
-}
\ No newline at end of file
+}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index e15bf69579..c566155fa6 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -22,6 +22,7 @@ import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.dashboard.DashboardOnMap;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.mapcontextmenu.MenuController.MenuState;
@@ -471,7 +472,9 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 		if (pointDescription.isDestination()) {
 			mapActivity.getMapActions().editWaypoints();
 		} else if (pointDescription.isMapMarker()) {
-			mapActivity.getMapActions().openMapMarkersActivity();
+			hide();
+			MapActivity.clearPrevActivityIntent();
+			mapActivity.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.MAP_MARKERS);
 		} else {
 			mapActivity.getMapActions().addMapMarker(latLon.getLatitude(), latLon.getLongitude(),
 					pointDescription);
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
index 0fc2f91f79..a3a928688f 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
@@ -8,7 +8,7 @@ import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.MapMarkersActivity;
+import net.osmand.plus.helpers.MapMarkerDialogHelper;
 import net.osmand.plus.mapcontextmenu.MenuBuilder;
 import net.osmand.plus.mapcontextmenu.MenuController;
 import net.osmand.util.Algorithms;
@@ -61,7 +61,7 @@ public class MapMarkerMenuController extends MenuController {
 
 	@Override
 	public Drawable getLeftIcon() {
-		return MapMarkersActivity.getMapMarkerIcon(getMapActivity().getMyApplication(), mapMarker.colorIndex);
+		return MapMarkerDialogHelper.getMapMarkerIcon(getMapActivity().getMyApplication(), mapMarker.colorIndex);
 	}
 
 	@Override

From a8de5408b055e4fcfd35c348f61b43df1f59166d Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Thu, 11 Feb 2016 15:28:37 +0300
Subject: [PATCH 11/18] Added compass arrows. Fix bugs

---
 OsmAnd/res/layout/map_marker_item.xml         | 124 ++++++++++
 OsmAnd/res/values/colors.xml                  |   6 +
 .../src/net/osmand/plus/MapMarkersHelper.java |  44 ++--
 .../plus/activities/MapActivityActions.java   |   1 -
 .../plus/base/MapViewTrackingUtilities.java   |  26 +-
 .../osmand/plus/dashboard/DashboardOnMap.java | 231 ++++++++++--------
 .../plus/helpers/MapMarkerDialogHelper.java   | 230 +++++++++++++----
 .../plus/mapcontextmenu/MapContextMenu.java   |  30 ++-
 .../SwipeDismissListViewTouchListener.java    |   7 +-
 9 files changed, 519 insertions(+), 180 deletions(-)
 create mode 100644 OsmAnd/res/layout/map_marker_item.xml

diff --git a/OsmAnd/res/layout/map_marker_item.xml b/OsmAnd/res/layout/map_marker_item.xml
new file mode 100644
index 0000000000..58d93922f4
--- /dev/null
+++ b/OsmAnd/res/layout/map_marker_item.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:background="@drawable/view_transparent_selection"
+              android:id="@+id/package_delivered_layout"
+              android:minHeight="50dp"
+              android:descendantFocusability="blocksDescendants">
+
+    <ImageView
+        android:id="@+id/waypoint_icon"
+        android:src="@drawable/ic_action_fav_dark"
+        android:layout_height="25dp"
+        android:layout_width="56dp"
+        android:layout_gravity="center_vertical" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/waypoint_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:layout_gravity="center_vertical"
+            android:textSize="@dimen/default_list_text_size" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/direction"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="4dp"
+                android:src="@drawable/ic_destination_arrow_white"
+                android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/waypoint_dist"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:textColor="@color/color_myloc_distance"
+                android:maxLines="1"
+                android:textSize="@dimen/default_sub_text_size"/>
+
+            <TextView
+                android:id="@+id/waypoint_deviation"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:textColor="@color/secondary_text_dark"
+                android:layout_marginLeft="6dp"
+                android:drawablePadding="2dp"
+                android:maxLines="1"
+                android:textSize="@dimen/default_sub_text_size"/>
+
+            <TextView
+                android:id="@+id/waypoint_desc_text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:layout_gravity="bottom"
+                android:layout_weight="1"
+                android:textColor="@color/secondary_text_dark"
+                android:textSize="@dimen/default_sub_text_size" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/all_points"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:contentDescription="@string/shared_string_more"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="2dp"
+        android:visibility="gone"
+        android:focusable="false"
+        android:scaleType="center"
+        style="@style/Widget.AppCompat.ActionButton"
+        android:src="@drawable/map_overflow_menu_white" />
+
+    <ImageButton
+        android:id="@+id/info_close"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:contentDescription="@string/shared_string_close"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="2dp"
+        style="@style/Widget.AppCompat.ActionButton"
+        android:focusable="false"
+        android:scaleType="center"
+        android:src="@drawable/ic_action_remove_dark" />
+
+    <ImageView
+        android:id="@+id/info_move"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="2dp"
+        android:focusable="false"
+        android:clickable="false"
+        android:scaleType="center"
+        android:src="@drawable/ic_flat_list_dark"
+        android:visibility="gone"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index fbff124c19..eaa0ea14bd 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<color name="marker_blue">#2196f3</color>
+	<color name="marker_green">#73b825</color>
+	<color name="marker_orange">#ff9800</color>
+	<color name="marker_red">#e53935</color>
+	<color name="marker_lt_green">#d7eb23</color>
+
 	<color name="popup_bg_color">#EE666666</color>
 	<color name="popup_separator_color">#BBBBBB</color>
 	<color name="popup_text_color">#FFFFFF</color>
diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index 9ced0f2f35..f5e8be75ad 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -2,14 +2,9 @@ package net.osmand.plus;
 
 import android.content.Context;
 
-import net.osmand.StateChangedListener;
 import net.osmand.data.LatLon;
 import net.osmand.data.LocationPoint;
 import net.osmand.data.PointDescription;
-import net.osmand.plus.GeocodingLookupService;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
 import net.osmand.util.Algorithms;
 
 import java.util.ArrayList;
@@ -21,9 +16,14 @@ public class MapMarkersHelper {
 	private List<MapMarker> mapMarkers = new ArrayList<>();
 	private List<MapMarker> mapMarkersHistory = new ArrayList<>();
 	private OsmandSettings settings;
-	private List<StateChangedListener<Void>> listeners = new ArrayList<StateChangedListener<Void>>();
+	private List<MapMarkerChangedListener> listeners = new ArrayList<>();
 	private OsmandApplication ctx;
 
+	public interface MapMarkerChangedListener {
+		void onMapMarkerChanged(MapMarker mapMarker);
+		void onMapMarkersChanged();
+	}
+
 	public static class MapMarker implements LocationPoint {
 		public LatLon point;
 		private PointDescription pointDescription;
@@ -112,7 +112,11 @@ public class MapMarkersHelper {
 			GeocodingLookupService.AddressLookupRequest lookupRequest = new GeocodingLookupService.AddressLookupRequest(mapMarker.point, new GeocodingLookupService.OnAddressLookupResult() {
 				@Override
 				public void geocodingDone(String address) {
-					mapMarker.pointDescription.setName(address);
+					if (Algorithms.isEmpty(address)) {
+						mapMarker.pointDescription.setName(PointDescription.getAddressNotFoundStr(ctx));
+					} else {
+						mapMarker.pointDescription.setName(address);
+					}
 					if (history) {
 						settings.updateMapMarkerHistory(mapMarker.point.getLatitude(), mapMarker.point.getLongitude(),
 								mapMarker.pointDescription, mapMarker.colorIndex);
@@ -120,7 +124,7 @@ public class MapMarkersHelper {
 						settings.updateMapMarker(mapMarker.point.getLatitude(), mapMarker.point.getLongitude(),
 								mapMarker.pointDescription, mapMarker.colorIndex);
 					}
-					refresh();
+					updateMarker(mapMarker);
 				}
 			}, null);
 			ctx.getGeocodingLookupService().lookupAddress(lookupRequest);
@@ -260,18 +264,30 @@ public class MapMarkersHelper {
 		}
 	}
 
-	public void addListener(StateChangedListener<Void> l) {
-		listeners.add(l);
+	public void addListener(MapMarkerChangedListener l) {
+		if (!listeners.contains(l)) {
+			listeners.add(l);
+		}
 	}
 
-	private void updateListeners() {
-		for (StateChangedListener<Void> l : listeners) {
-			l.stateChanged(null);
+	public void removeListener(MapMarkerChangedListener l) {
+		listeners.remove(l);
+	}
+
+	private void updateMarker(MapMarker marker) {
+		for (MapMarkerChangedListener l : listeners) {
+			l.onMapMarkerChanged(marker);
+		}
+	}
+
+	private void updateMarkers() {
+		for (MapMarkerChangedListener l : listeners) {
+			l.onMapMarkersChanged();
 		}
 	}
 
 	public void refresh() {
-		updateListeners();
+		updateMarkers();
 	}
 
 	private void cancelAddressRequests() {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 1707636fb4..edf051dfa4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -110,7 +110,6 @@ public class MapActivityActions implements DialogProvider {
 	public void addMapMarker(double latitude, double longitude, PointDescription pd) {
 		MapMarkersHelper markersHelper = getMyApplication().getMapMarkersHelper();
 		markersHelper.addMapMarker(new LatLon(latitude, longitude), pd);
-		//openMapMarkersActivity();
 	}
 
 	public void editWaypoints() {
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index 07d7ad6e5f..df9a745159 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -8,6 +8,8 @@ import net.osmand.StateChangedListener;
 import net.osmand.ValueHolder;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.map.IMapLocationListener;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
 import net.osmand.plus.OsmAndConstants;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener;
@@ -17,10 +19,8 @@ import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.AutoZoomMap;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
-import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashboardOnMap;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
-import net.osmand.plus.mapcontextmenu.other.DestinationReachedMenu;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.routing.RoutingHelper.IRouteInformationListener;
 import net.osmand.plus.views.AnimateDraggingMapThread;
@@ -29,7 +29,8 @@ import net.osmand.util.MapUtils;
 
 import java.util.List;
 
-public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLocationListener, OsmAndCompassListener, IRouteInformationListener {
+public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLocationListener,
+		OsmAndCompassListener, IRouteInformationListener, MapMarkerChangedListener {
 	private static final int AUTO_FOLLOW_MSG_ID = OsmAndConstants.UI_HANDLER_LOCATION_SERVICE + 4; 
 	
 	private long lastTimeAutoZooming = 0;
@@ -70,15 +71,18 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 	}
 
 	private void addMapMarkersListener(OsmandApplication app) {
-		app.getMapMarkersHelper().addListener(new StateChangedListener<Void>() {
+		app.getMapMarkersHelper().addListener(this);
+	}
 
-			@Override
-			public void stateChanged(Void change) {
-				if(mapView != null) {
-					mapView.refreshMap();
-				}
-			}
-		});
+	@Override
+	public void onMapMarkerChanged(MapMarkersHelper.MapMarker mapMarker) {
+	}
+
+	@Override
+	public void onMapMarkersChanged() {
+		if (mapView != null) {
+			mapView.refreshMap();
+		}
 	}
 
 	public void setMapView(OsmandMapTileView mapView) {
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 7d8dac5127..c676e25b3e 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -43,6 +43,7 @@ import net.osmand.plus.ContextMenuAdapter.OnRowItemClick;
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
+import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
@@ -87,7 +88,7 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP;
 /**
  */
 public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicListViewCallbacks,
-		IRouteInformationListener, WaypointDialogHelperCallbacks {
+		IRouteInformationListener, WaypointDialogHelperCallbacks, MapMarkerChangedListener {
 	private static final org.apache.commons.logging.Log LOG =
 			PlatformUtil.getLog(DashboardOnMap.class);
 	private static final String TAG = "DashboardOnMap";
@@ -210,128 +211,128 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 		// by default they handle touches for their list items... i.e. they're in charge of drawing
 		// the pressed state (the list selector), handling list item clicks, etc.
 		swipeDismissListener = new SwipeDismissListViewTouchListener(
-						listView,
-						new DismissCallbacks() {
+				listView,
+				new DismissCallbacks() {
 
-							private List<Object> deletedMarkers = new ArrayList<>();
+					private List<Object> deletedMarkers = new ArrayList<>();
 
-							@Override
-							public boolean canDismiss(int position) {
-								boolean res = false;
-								if (listAdapter instanceof StableArrayAdapter) {
-									List<Object> activeObjects = ((StableArrayAdapter) listAdapter).getActiveObjects();
-									Object obj = listAdapter.getItem(position);
-									res = activeObjects.contains(obj);
+					@Override
+					public boolean canDismiss(int position) {
+						boolean res = false;
+						if (listAdapter instanceof StableArrayAdapter) {
+							List<Object> activeObjects = ((StableArrayAdapter) listAdapter).getActiveObjects();
+							Object obj = listAdapter.getItem(position);
+							res = activeObjects.contains(obj);
+						}
+						return res;
+					}
+
+					@Override
+					public Undoable onDismiss(final int position) {
+						final Object item;
+						final StableArrayAdapter stableAdapter;
+						final int activeObjPos;
+						if (listAdapter instanceof StableArrayAdapter) {
+							stableAdapter = (StableArrayAdapter) listAdapter;
+							item = stableAdapter.getItem(position);
+
+							if (visibleType == DashboardType.MAP_MARKERS) {
+								if (!((MapMarker) item).history) {
+									deletedMarkers.add(item);
 								}
-								return res;
 							}
 
+							stableAdapter.setNotifyOnChange(false);
+							stableAdapter.remove(item);
+							stableAdapter.getObjects().remove(item);
+							activeObjPos = stableAdapter.getActiveObjects().indexOf(item);
+							stableAdapter.getActiveObjects().remove(item);
+							stableAdapter.refreshData();
+							stableAdapter.notifyDataSetChanged();
+
+						} else {
+							item = null;
+							stableAdapter = null;
+							activeObjPos = 0;
+						}
+						return new Undoable() {
 							@Override
-							public Undoable onDismiss(final int position) {
-								final Object item;
-								final StableArrayAdapter stableAdapter;
-								final int activeObjPos;
-								if (listAdapter instanceof StableArrayAdapter) {
-									stableAdapter = (StableArrayAdapter) listAdapter;
-									item = stableAdapter.getItem(position);
-
-									if (visibleType == DashboardType.MAP_MARKERS) {
-										if (!((MapMarker) item).history) {
-											deletedMarkers.add(item);
-										}
-									}
-
+							public void undo() {
+								if (item != null) {
 									stableAdapter.setNotifyOnChange(false);
-									stableAdapter.remove(item);
-									stableAdapter.getObjects().remove(item);
-									activeObjPos = stableAdapter.getActiveObjects().indexOf(item);
-									stableAdapter.getActiveObjects().remove(item);
-									stableAdapter.refreshData();
-									stableAdapter.notifyDataSetChanged();
-
-								} else {
-									item = null;
-									stableAdapter = null;
-									activeObjPos = 0;
-								}
-								return new Undoable() {
-									@Override
-									public void undo() {
-										if (item != null) {
-											stableAdapter.setNotifyOnChange(false);
-											stableAdapter.insert(item, position);
-											stableAdapter.getObjects().add(position, item);
-											stableAdapter.getActiveObjects().add(activeObjPos, item);
-											stableAdapter.refreshData();
-											if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
-												onItemsSwapped(stableAdapter.getActiveObjects());
-											} else if (visibleType == DashboardType.MAP_MARKERS) {
-												deletedMarkers.remove(item);
-												updateMapMarkers(stableAdapter.getActiveObjects());
-												reloadAdapter();
-											}
-										}
-									}
-
-									@Override
-									public String getTitle() {
-										if ((visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT)
-												&& (getMyApplication().getRoutingHelper().isRoutePlanningMode() || getMyApplication().getRoutingHelper().isFollowingMode())
-												&& item != null
-												&& stableAdapter.getActiveObjects().size() == 0) {
-											return mapActivity.getResources().getString(R.string.cancel_navigation);
-										} else {
-											return null;
-										}
-									}
-								};
-							}
-
-							@Override
-							public void onHidePopup() {
-								if (listAdapter instanceof StableArrayAdapter) {
-									StableArrayAdapter stableAdapter = (StableArrayAdapter) listAdapter;
+									stableAdapter.insert(item, position);
+									stableAdapter.getObjects().add(position, item);
+									stableAdapter.getActiveObjects().add(activeObjPos, item);
 									stableAdapter.refreshData();
 									if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
 										onItemsSwapped(stableAdapter.getActiveObjects());
 									} else if (visibleType == DashboardType.MAP_MARKERS) {
+										deletedMarkers.remove(item);
 										updateMapMarkers(stableAdapter.getActiveObjects());
-									}
-									if (stableAdapter.getActiveObjects().size() == 0) {
-										hideDashboard();
-										if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
-											mapActivity.getMapActions().stopNavigationWithoutConfirm();
-											mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
-										}
-									} else {
-										if (visibleType == DashboardType.MAP_MARKERS) {
-											reloadAdapter();
-										}
+										reloadAdapter();
 									}
 								}
 							}
 
-							private void updateMapMarkers(List<Object> objects) {
-								List<MapMarker> markers = new ArrayList<>();
-								List<MapMarker> markersHistory = new ArrayList<>();
-
-								for (Object obj : objects) {
-									MapMarker marker = (MapMarker) obj;
-									if (!marker.history) {
-										markers.add(marker);
-									} else {
-										markersHistory.add(marker);
-									}
+							@Override
+							public String getTitle() {
+								if ((visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT)
+										&& (getMyApplication().getRoutingHelper().isRoutePlanningMode() || getMyApplication().getRoutingHelper().isFollowingMode())
+										&& item != null
+										&& stableAdapter.getActiveObjects().size() == 0) {
+									return mapActivity.getResources().getString(R.string.cancel_navigation);
+								} else {
+									return null;
 								}
-
-								for (int i = deletedMarkers.size() - 1; i >= 0; i--) {
-									markersHistory.add(0, (MapMarker) deletedMarkers.get(i));
-								}
-								deletedMarkers.clear();
-
-								getMyApplication().getMapMarkersHelper().saveMapMarkers(markers, markersHistory);
 							}
-						});
+						};
+					}
+
+					@Override
+					public void onHidePopup() {
+						if (listAdapter instanceof StableArrayAdapter) {
+							StableArrayAdapter stableAdapter = (StableArrayAdapter) listAdapter;
+							stableAdapter.refreshData();
+							if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
+								onItemsSwapped(stableAdapter.getActiveObjects());
+							} else if (visibleType == DashboardType.MAP_MARKERS) {
+								updateMapMarkers(stableAdapter.getActiveObjects());
+							}
+							if (stableAdapter.getActiveObjects().size() == 0) {
+								hideDashboard();
+								if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
+									mapActivity.getMapActions().stopNavigationWithoutConfirm();
+									mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
+								}
+							} else {
+								if (visibleType == DashboardType.MAP_MARKERS) {
+									reloadAdapter();
+								}
+							}
+						}
+					}
+
+					private void updateMapMarkers(List<Object> objects) {
+						List<MapMarker> markers = new ArrayList<>();
+						List<MapMarker> markersHistory = new ArrayList<>();
+
+						for (Object obj : objects) {
+							MapMarker marker = (MapMarker) obj;
+							if (!marker.history) {
+								markers.add(marker);
+							} else {
+								markersHistory.add(marker);
+							}
+						}
+
+						for (int i = deletedMarkers.size() - 1; i >= 0; i--) {
+							markersHistory.add(0, (MapMarker) deletedMarkers.get(i));
+						}
+						deletedMarkers.clear();
+
+						getMyApplication().getMapMarkersHelper().saveMapMarkers(markers, markersHistory);
+					}
+				});
 
 		gradientToolbar = mapActivity.getResources().getDrawable(R.drawable.gradient_toolbar).mutate();
 		if (AndroidUiHelper.isOrientationPortrait(mapActivity)) {
@@ -373,6 +374,16 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 		dashboardView.addView(actionButton);
 	}
 
+	@Override
+	public void onMapMarkerChanged(MapMarker mapMarker) {
+		if (visible && visibleType == DashboardType.MAP_MARKERS) {
+			mapMarkerDialogHelper.updateMarkerView(listView, mapMarker);
+		}
+	}
+
+	@Override
+	public void onMapMarkersChanged() {
+	}
 
 	private void updateListBackgroundHeight() {
 
@@ -682,6 +693,10 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 					updateListBackgroundHeight();
 				}
 				applyDayNightMode();
+
+				if (visibleType == DashboardType.MAP_MARKERS) {
+					getMyApplication().getMapMarkersHelper().addListener(this);
+				}
 			}
 			mapActivity.findViewById(R.id.toolbar_back).setVisibility(isBackButtonVisible() ? View.VISIBLE : View.GONE);
 			mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.INVISIBLE);
@@ -699,6 +714,9 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 //			addOrUpdateDashboardFragments();
 			mapActivity.getRoutingHelper().addListener(this);
 		} else {
+			if (visibleType == DashboardType.MAP_MARKERS) {
+				getMyApplication().getMapMarkersHelper().removeListener(this);
+			}
 			if (swipeDismissListener != null) {
 				swipeDismissListener.discardUndo();
 			}
@@ -1012,6 +1030,9 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 						((DashLocationFragment) df.get()).updateLocation(centerChanged, locationChanged, compassChanged);
 					}
 				}
+				if (visibleType == DashboardType.MAP_MARKERS) {
+					mapMarkerDialogHelper.updateLocation(listView, compassChanged);
+				}
 			}
 		});
 
diff --git a/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
index fd93adc3f5..6b49245d4a 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
@@ -11,19 +11,22 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
+import net.osmand.Location;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
-import net.osmand.plus.GeocodingLookupService;
-import net.osmand.plus.IconsCache;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.dashboard.DashLocationFragment;
+import net.osmand.plus.dashboard.DashboardOnMap;
+import net.osmand.plus.views.DirectionDrawable;
 import net.osmand.plus.views.controls.ListDividerShape;
 import net.osmand.plus.views.controls.StableArrayAdapter;
 import net.osmand.util.Algorithms;
@@ -40,12 +43,21 @@ public class MapMarkerDialogHelper {
 
 	private MapActivity mapActivity;
 	private OsmandApplication app;
+	private MapMarkersHelper markersHelper;
 	private boolean sorted;
 	private boolean nightMode;
 
+	private boolean useCenter;
+	private LatLon loc;
+	private Float heading;
+	private int screenOrientation;
+	private boolean reloading;
+	private long lastUpdateTime;
+
 	public MapMarkerDialogHelper(MapActivity mapActivity) {
 		this.mapActivity = mapActivity;
 		app = mapActivity.getMyApplication();
+		markersHelper = app.getMapMarkersHelper();
 	}
 
 	public boolean isNightMode() {
@@ -83,11 +95,14 @@ public class MapMarkerDialogHelper {
 
 	public StableArrayAdapter getMapMarkersListAdapter() {
 
+		screenOrientation = DashLocationFragment.getScreenOrientation(mapActivity);
+		calculateLocationParams();
+
 		final List<Object> objects = getListObjects();
 		List<Object> activeObjects = getActiveObjects(objects);
 
 		final StableArrayAdapter listAdapter = new StableArrayAdapter(mapActivity,
-				R.layout.waypoint_reached, R.id.title, objects, activeObjects) {
+				R.layout.map_marker_item, R.id.title, objects, activeObjects) {
 
 			@Override
 			public void buildDividers() {
@@ -124,23 +139,6 @@ public class MapMarkerDialogHelper {
 			}
 		};
 
-		for (Object p : objects) {
-			if (p instanceof MapMarker) {
-				final MapMarker marker = (MapMarker) p;
-				if (marker.getOriginalPointDescription() != null
-						&& marker.getOriginalPointDescription().isSearchingAddress(mapActivity)) {
-					GeocodingLookupService.AddressLookupRequest lookupRequest
-							= new GeocodingLookupService.AddressLookupRequest(marker.point, new GeocodingLookupService.OnAddressLookupResult() {
-						@Override
-						public void geocodingDone(String address) {
-							reloadListAdapter(listAdapter);
-						}
-					}, null);
-					app.getGeocodingLookupService().lookupAddress(lookupRequest);
-				}
-			}
-		}
-
 		return listAdapter;
 	}
 
@@ -213,8 +211,12 @@ public class MapMarkerDialogHelper {
 								@Override
 								public void onClick(DialogInterface dialog, int which) {
 									listAdapter.notifyDataSetInvalidated();
-									app.getMapMarkersHelper().removeMarkersHistory();
-									reloadListAdapter(listAdapter);
+									markersHelper.removeMarkersHistory();
+									if (markersHelper.getActiveMapMarkers().size() == 0) {
+										mapActivity.getDashboard().hideDashboard();
+									} else {
+										reloadListAdapter(listAdapter);
+									}
 								}
 							})
 							.setNegativeButton(R.string.shared_string_no, null)
@@ -226,8 +228,12 @@ public class MapMarkerDialogHelper {
 								@Override
 								public void onClick(DialogInterface dialog, int which) {
 									listAdapter.notifyDataSetInvalidated();
-									app.getMapMarkersHelper().removeActiveMarkers();
-									reloadListAdapter(listAdapter);
+									markersHelper.removeActiveMarkers();
+									if (markersHelper.getMapMarkersHistory().size() == 0) {
+										mapActivity.getDashboard().hideDashboard();
+									} else {
+										reloadListAdapter(listAdapter);
+									}
 								}
 							})
 							.setNegativeButton(R.string.shared_string_no, null)
@@ -244,7 +250,7 @@ public class MapMarkerDialogHelper {
 
 	protected View updateMapMarkerItemView(View v, final MapMarker marker) {
 		if (v == null || v.findViewById(R.id.info_close) == null) {
-			v = mapActivity.getLayoutInflater().inflate(R.layout.waypoint_reached, null);
+			v = mapActivity.getLayoutInflater().inflate(R.layout.map_marker_item, null);
 		}
 		updateMapMarkerInfoView(v, marker);
 		final View more = v.findViewById(R.id.all_points);
@@ -260,20 +266,56 @@ public class MapMarkerDialogHelper {
 		TextView text = (TextView) localView.findViewById(R.id.waypoint_text);
 		TextView textShadow = (TextView) localView.findViewById(R.id.waypoint_text_shadow);
 		TextView textDist = (TextView) localView.findViewById(R.id.waypoint_dist);
-		if (!marker.history) {
-			((ImageView) localView.findViewById(R.id.waypoint_icon))
-					.setImageDrawable(getMapMarkerIcon(app, marker.colorIndex));
-			AndroidUtils.setTextPrimaryColor(mapActivity, text, nightMode);
-			textDist.setTextColor(mapActivity.getResources().getColor(R.color.color_myloc_distance));
+		ImageView arrow = (ImageView) localView.findViewById(R.id.direction);
+		ImageView waypointIcon = (ImageView) localView.findViewById(R.id.waypoint_icon);
+		TextView waypointDeviation = (TextView) localView.findViewById(R.id.waypoint_deviation);
+		TextView descText = (TextView) localView.findViewById(R.id.waypoint_desc_text);
+		if (text == null || textDist == null || arrow == null || waypointIcon == null
+				|| waypointDeviation == null || descText == null) {
+			return;
+		}
+		float[] mes = new float[2];
+		if (loc != null && marker.point != null) {
+			Location.distanceBetween(marker.getLatitude(), marker.getLongitude(), loc.getLatitude(), loc.getLongitude(), mes);
+		}
+		boolean newImage = false;
+		int arrowResId = R.drawable.ic_destination_arrow_white;
+		DirectionDrawable dd;
+		if (!(arrow.getDrawable() instanceof DirectionDrawable)) {
+			newImage = true;
+			dd = new DirectionDrawable(mapActivity, arrow.getWidth(), arrow.getHeight());
 		} else {
-			((ImageView) localView.findViewById(R.id.waypoint_icon))
-					.setImageDrawable(app.getIconsCache()
-							.getContentIcon(R.drawable.ic_action_flag_dark, !nightMode));
+			dd = (DirectionDrawable) arrow.getDrawable();
+		}
+		if (!marker.history) {
+			dd.setImage(arrowResId, useCenter ? R.color.color_distance : R.color.color_myloc_distance);
+		} else {
+			dd.setImage(arrowResId, nightMode ? R.color.secondary_text_dark : R.color.secondary_text_light);
+		}
+		if (loc == null || heading == null || marker.point == null) {
+			dd.setAngle(0);
+		} else {
+			dd.setAngle(mes[1] - heading + 180 + screenOrientation);
+		}
+		if (newImage) {
+			arrow.setImageDrawable(dd);
+		}
+		arrow.setVisibility(View.VISIBLE);
+		arrow.invalidate();
+
+		if (!marker.history) {
+			waypointIcon.setImageDrawable(getMapMarkerIcon(app, marker.colorIndex));
+			AndroidUtils.setTextPrimaryColor(mapActivity, text, nightMode);
+			textDist.setTextColor(mapActivity.getResources()
+					.getColor(useCenter ? R.color.color_distance : R.color.color_myloc_distance));
+		} else {
+			waypointIcon.setImageDrawable(app.getIconsCache()
+					.getContentIcon(R.drawable.ic_action_flag_dark, !nightMode));
 			AndroidUtils.setTextSecondaryColor(mapActivity, text, nightMode);
 			AndroidUtils.setTextSecondaryColor(mapActivity, textDist, nightMode);
 		}
 
-		int dist = marker.dist;
+		int dist = (int) mes[0];
 
 		//if (dist > 0) {
 		textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
@@ -281,7 +323,7 @@ public class MapMarkerDialogHelper {
 		//	textDist.setText("");
 		//}
 
-		localView.findViewById(R.id.waypoint_deviation).setVisibility(View.GONE);
+		waypointDeviation.setVisibility(View.GONE);
 
 		String descr;
 		PointDescription pd = marker.getPointDescription(app);
@@ -296,10 +338,9 @@ public class MapMarkerDialogHelper {
 		}
 		text.setText(descr);
 
-		localView.findViewById(R.id.waypoint_desc_text).setVisibility(View.GONE);
+		descText.setVisibility(View.GONE);
 		/*
 		String pointDescription = "";
-		TextView descText = (TextView) localView.findViewById(R.id.waypoint_desc_text);
 		if (descText != null) {
 			AndroidUtils.setTextSecondaryColor(this, descText, nightMode);
 			pointDescription = marker.getPointDescription(this).getTypeName();
@@ -317,6 +358,44 @@ public class MapMarkerDialogHelper {
 		*/
 	}
 
+	protected void updateMapMarkerArrowDistanceView(View localView, final MapMarker marker) {
+		TextView textDist = (TextView) localView.findViewById(R.id.waypoint_dist);
+		ImageView arrow = (ImageView) localView.findViewById(R.id.direction);
+		if (textDist == null || arrow == null) {
+			return;
+		}
+		float[] mes = new float[2];
+		if (loc != null && marker.point != null) {
+			Location.distanceBetween(marker.getLatitude(), marker.getLongitude(), loc.getLatitude(), loc.getLongitude(), mes);
+		}
+		boolean newImage = false;
+		int arrowResId = R.drawable.ic_destination_arrow_white;
+		DirectionDrawable dd;
+		if (!(arrow.getDrawable() instanceof DirectionDrawable)) {
+			newImage = true;
+			dd = new DirectionDrawable(mapActivity, arrow.getWidth(), arrow.getHeight());
+		} else {
+			dd = (DirectionDrawable) arrow.getDrawable();
+		}
+		if (!marker.history) {
+			dd.setImage(arrowResId, useCenter ? R.color.color_distance : R.color.color_myloc_distance);
+		} else {
+			dd.setImage(arrowResId, nightMode ? R.color.secondary_text_dark : R.color.secondary_text_light);
+		}
+		if (loc == null || heading == null || marker.point == null) {
+			dd.setAngle(0);
+		} else {
+			dd.setAngle(mes[1] - heading + 180 + screenOrientation);
+		}
+		if (newImage) {
+			arrow.setImageDrawable(dd);
+		}
+		arrow.invalidate();
+
+		int dist = (int) mes[0];
+		textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
+	}
+
 	public void showOnMap(MapMarker marker) {
 		app.getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
 				15, marker.getPointDescription(mapActivity), true, marker);
@@ -343,8 +422,9 @@ public class MapMarkerDialogHelper {
 		}
 		return str;
 	}
-	
+
 	public void reloadListAdapter(ArrayAdapter<Object> listAdapter) {
+		reloading = true;
 		listAdapter.setNotifyOnChange(false);
 		listAdapter.clear();
 		List<Object> objects = getListObjects();
@@ -355,6 +435,7 @@ public class MapMarkerDialogHelper {
 			((StableArrayAdapter) listAdapter).updateObjects(objects, getActiveObjects(objects));
 		}
 		listAdapter.notifyDataSetChanged();
+		reloading = false;
 	}
 
 	public void calcDistance(LatLon anchor, List<MapMarker> markers) {
@@ -366,7 +447,6 @@ public class MapMarkerDialogHelper {
 
 	protected List<Object> getListObjects() {
 		final List<Object> objects = new ArrayList<>();
-		final MapMarkersHelper markersHelper = app.getMapMarkersHelper();
 
 		LatLon mapLocation =
 				new LatLon(mapActivity.getMapView().getLatitude(), mapActivity.getMapView().getLongitude());
@@ -412,20 +492,78 @@ public class MapMarkerDialogHelper {
 	}
 
 	public static Drawable getMapMarkerIcon(OsmandApplication app, int colorIndex) {
-		IconsCache iconsCache = app.getIconsCache();
+		int colorId;
 		switch (colorIndex) {
 			case 0:
-				return iconsCache.getIcon(R.drawable.map_marker_blue);
+				colorId = R.color.marker_blue;
+				break;
 			case 1:
-				return iconsCache.getIcon(R.drawable.map_marker_green);
+				colorId = R.color.marker_green;
+				break;
 			case 2:
-				return iconsCache.getIcon(R.drawable.map_marker_orange);
+				colorId = R.color.marker_orange;
+				break;
 			case 3:
-				return iconsCache.getIcon(R.drawable.map_marker_red);
+				colorId = R.color.marker_red;
+					break;
 			case 4:
-				return iconsCache.getIcon(R.drawable.map_marker_yellow);
+				colorId = R.color.marker_lt_green;
+				break;
 			default:
-				return iconsCache.getIcon(R.drawable.map_marker_blue);
+				colorId = R.color.marker_blue;
+		}
+		return app.getIconsCache().getIcon(R.drawable.ic_action_flag_dark, colorId);
+	}
+
+	public void updateLocation(ListView listView, boolean compassChanged) {
+		if ((compassChanged && !mapActivity.getDashboard().isMapLinkedToLocation())
+				|| reloading || System.currentTimeMillis() - lastUpdateTime < 100) {
+			return;
+		}
+
+		lastUpdateTime = System.currentTimeMillis();
+
+		try {
+			calculateLocationParams();
+
+			for (int i = listView.getFirstVisiblePosition(); i <= listView.getLastVisiblePosition(); i++) {
+				Object obj = listView.getItemAtPosition(i);
+				View v = listView.getChildAt(i - listView.getFirstVisiblePosition());
+				if (obj instanceof MapMarker && v != null) {
+					updateMapMarkerArrowDistanceView(v, (MapMarker) obj);
+				}
+			}
+		} catch (Exception e) {
 		}
 	}
+
+	public void updateMarkerView(ListView listView, MapMarker marker) {
+		try {
+			for (int i = listView.getFirstVisiblePosition(); i <= listView.getLastVisiblePosition(); i++) {
+				Object obj = listView.getItemAtPosition(i);
+				View v = listView.getChildAt(i - listView.getFirstVisiblePosition());
+				if (obj == marker) {
+					updateMapMarkerInfoView(v, (MapMarker) obj);
+				}
+			}
+		} catch (Exception e) {
+		}
+	}
+
+	private void calculateLocationParams() {
+		DashboardOnMap d = mapActivity.getDashboard();
+		if (d == null) {
+			return;
+		}
+
+		float head = d.getHeading();
+		float mapRotation = d.getMapRotation();
+		LatLon mw = d.getMapViewLocation();
+		Location l = d.getMyLocation();
+		boolean mapLinked = d.isMapLinkedToLocation() && l != null;
+		LatLon myLoc = l == null ? null : new LatLon(l.getLatitude(), l.getLongitude());
+		useCenter = !mapLinked;
+		loc = (useCenter ? mw : myLoc);
+		heading = useCenter ? -mapRotation : head;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index c566155fa6..01a5690a01 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -19,6 +19,8 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
+import net.osmand.plus.MapMarkersHelper.MapMarker;
+import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.activities.MapActivity;
@@ -42,7 +44,8 @@ import net.osmand.util.MapUtils;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
-public class MapContextMenu extends MenuTitleController implements StateChangedListener<ApplicationMode> {
+public class MapContextMenu extends MenuTitleController implements StateChangedListener<ApplicationMode>,
+		MapMarkerChangedListener {
 
 	private MapActivity mapActivity;
 	private MapMultiSelectionMenu mapMultiSelectionMenu;
@@ -256,6 +259,10 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 
 		mapActivity.refreshMap();
 
+		if (object instanceof MapMarker) {
+			mapActivity.getMyApplication().getMapMarkersHelper().addListener(this);
+		}
+
 		return true;
 	}
 
@@ -308,6 +315,9 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 	public void close() {
 		if (active) {
 			active = false;
+			if (object instanceof MapMarker) {
+				mapActivity.getMyApplication().getMapMarkersHelper().removeListener(this);
+			}
 			if (this.object != null) {
 				clearSelectedObject(this.object);
 			}
@@ -334,6 +344,22 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 		}
 	}
 
+	@Override
+	public void onMapMarkerChanged(MapMarker mapMarker) {
+		if (object == mapMarker) {
+			String address = ((MapMarker) object).getOnlyName();
+			nameStr = address;
+			pointDescription.setName(address);
+			WeakReference<MapContextMenuFragment> fragmentRef = findMenuFragment();
+			if (fragmentRef != null)
+				fragmentRef.get().refreshTitle();
+		}
+	}
+
+	@Override
+	public void onMapMarkersChanged() {
+	}
+
 	@Override
 	public void stateChanged(ApplicationMode change) {
 		appModeChanged = active;
@@ -477,7 +503,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 			mapActivity.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.MAP_MARKERS);
 		} else {
 			mapActivity.getMapActions().addMapMarker(latLon.getLatitude(), latLon.getLongitude(),
-					pointDescription);
+					getPointDescriptionForTarget());
 		}
 		close();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java b/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java
index 30d78e1c60..1586baa1fe 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java
@@ -102,6 +102,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
 	//private List<PendingDismissData> mPendingDismisses = new ArrayList<PendingDismissData>();
 	private int mDismissAnimationRefCount = 0;
 	private float mDownX;
+	private float mDownY;
 	private boolean mSwiping;
 	private VelocityTracker mVelocityTracker;
 	private int mDownPosition;
@@ -601,6 +602,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
 					int position = mListView.getPositionForView(mSwipeDownView) - mListView.getHeaderViewsCount();
 					if (mCallbacks == null || mCallbacks.canDismiss(position)) {
 						mDownX = ev.getRawX();
+						mDownY = ev.getRawY();
 						mDownPosition = position;
 
 						mVelocityTracker = VelocityTracker.obtain();
@@ -629,6 +631,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
 				mVelocityTracker.recycle();
 				mVelocityTracker = null;
 				mDownX = 0;
+				mDownY = 0;
 				mSwipeDownView = mSwipeDownChild = null;
 				mDownPosition = ListView.INVALID_POSITION;
 				mSwiping = false;
@@ -669,6 +672,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
 				}
 				mVelocityTracker = null;
 				mDownX = 0;
+				mDownY = 0;
 				mSwipeDownView = null;
 				mSwipeDownChild = null;
 				mDownPosition = AbsListView.INVALID_POSITION;
@@ -683,6 +687,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
 
 				mVelocityTracker.addMovement(ev);
 				float deltaX = ev.getRawX() - mDownX;
+				float deltaY = ev.getRawY() - mDownY;
 				// Only start swipe in correct direction
 				if (isSwipeDirectionValid(deltaX)) {
 					ViewParent parent = mListView.getParent();
@@ -691,7 +696,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
 						// otherwise swipe would not be working.
 						parent.requestDisallowInterceptTouchEvent(true);
 					}
-					if (Math.abs(deltaX) > mSlop) {
+					if (Math.abs(deltaX) > mSlop && Math.abs(deltaY) < Math.abs(deltaX) / 2) {
 						mSwiping = true;
 						mListView.requestDisallowInterceptTouchEvent(true);
 

From afad151b7c4ea03a82efcaf4583ff29da7ae5fec Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Thu, 11 Feb 2016 15:54:02 +0300
Subject: [PATCH 12/18] Added dest arrows for markers

---
 .../osmand/plus/views/MapMarkersLayer.java    | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
index a861ca7c48..62831440c7 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -5,18 +5,24 @@ import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.PointF;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
 
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
+import net.osmand.data.QuadPoint;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider {
+	protected final static int DIST_TO_SHOW = 80;
+
 	private final MapActivity map;
 	private OsmandMapTileView view;
 
@@ -27,6 +33,14 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 	private Bitmap markerBitmapRed;
 	private Bitmap markerBitmapYellow;
 
+	private Paint bitmapPaintDestBlue;
+	private Paint bitmapPaintDestGreen;
+	private Paint bitmapPaintDestOrange;
+	private Paint bitmapPaintDestRed;
+	private Paint bitmapPaintDestLtGreen;
+	private Bitmap arrowToDestination;
+	private float[] calculations = new float[2];
+
 	public MapMarkersLayer(MapActivity map) {
 		this.map = map;
 	}
@@ -41,6 +55,40 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 		markerBitmapOrange = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_orange);
 		markerBitmapRed = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_red);
 		markerBitmapYellow = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_yellow);
+
+		arrowToDestination = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_arrow_to_destination);
+		bitmapPaintDestBlue = createPaintDest(R.color.marker_blue);
+		bitmapPaintDestGreen = createPaintDest(R.color.marker_green);
+		bitmapPaintDestOrange = createPaintDest(R.color.marker_orange);
+		bitmapPaintDestRed = createPaintDest(R.color.marker_red);
+		bitmapPaintDestLtGreen = createPaintDest(R.color.marker_lt_green);
+	}
+
+	private Paint createPaintDest(int colorId) {
+		Paint paint = new Paint();
+		paint.setDither(true);
+		paint.setAntiAlias(true);
+		paint.setFilterBitmap(true);
+		int color = map.getResources().getColor(colorId);
+		paint.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN));
+		return paint;
+	}
+
+	private Paint getMarkerDestPaint(int colorIndex) {
+		switch (colorIndex) {
+			case 0:
+				return bitmapPaintDestBlue;
+			case 1:
+				return bitmapPaintDestGreen;
+			case 2:
+				return bitmapPaintDestOrange;
+			case 3:
+				return bitmapPaintDestRed;
+			case 4:
+				return bitmapPaintDestLtGreen;
+			default:
+				return bitmapPaintDestBlue;
+		}
 	}
 
 	private Bitmap getMapMarkerBitmap(int colorIndex) {
@@ -72,6 +120,7 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 			return;
 		}
 
+		List<MapMarker> hiddenMarkers = new ArrayList<>();
 		MapMarkersHelper markersHelper = map.getMyApplication().getMapMarkersHelper();
 		for (MapMarker marker : markersHelper.getActiveMapMarkers()) {
 			if (isLocationVisible(tb, marker)) {
@@ -83,6 +132,24 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 				canvas.rotate(-tb.getRotate(), locationX, locationY);
 				canvas.drawBitmap(bmp, locationX - marginX, locationY - marginY, bitmapPaint);
 				canvas.rotate(tb.getRotate(), locationX, locationY);
+			} else {
+				hiddenMarkers.add(marker);
+			}
+		}
+
+		for (MapMarker marker : hiddenMarkers) {
+			boolean show = true;
+			if (show) {
+				canvas.save();
+				net.osmand.Location.distanceBetween(view.getLatitude(), view.getLongitude(),
+						marker.getLatitude(), marker.getLongitude(), calculations);
+				float bearing = calculations[1] - 90;
+				float radiusBearing = DIST_TO_SHOW * tb.getDensity();
+				final QuadPoint cp = tb.getCenterPixelPoint();
+				canvas.rotate(bearing, cp.x, cp.y);
+				canvas.translate(-24 * tb.getDensity() + radiusBearing, -22 * tb.getDensity());
+				canvas.drawBitmap(arrowToDestination, cp.x, cp.y, getMarkerDestPaint(marker.colorIndex));
+				canvas.restore();
 			}
 		}
 	}

From 21ea0c4c4b3f9a5a430b7bfac12ca0d886a907dc Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Thu, 11 Feb 2016 16:31:02 +0300
Subject: [PATCH 13/18] Hide waypoints in non-route prep mode

---
 .../net/osmand/plus/dialogs/DirectionsDialogs.java    | 11 +++++++++++
 .../osmand/plus/mapcontextmenu/MapContextMenu.java    |  3 +++
 .../net/osmand/plus/views/PointNavigationLayer.java   |  6 ++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/dialogs/DirectionsDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/DirectionsDialogs.java
index 88d60838d5..6e711241d9 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/DirectionsDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/DirectionsDialogs.java
@@ -61,13 +61,17 @@ public class DirectionsDialogs {
 						public void onClick(DialogInterface dialog, int which) {
 							if (which == 0) {
 								targetPointsHelper.navigateToPoint(new LatLon(lat, lon), true, -1, name);
+								closeContextMenu(act);
 							} else if (which == 1) {
 								targetPointsHelper.navigateToPoint(new LatLon(lat, lon), true, 
 										targetPointsHelper.getIntermediatePoints().size() + 1, name);
+								closeContextMenu(act);
 							} else if (which == 2) {
 								targetPointsHelper.navigateToPoint(new LatLon(lat, lon), true, 0, name);
+								closeContextMenu(act);
 							} else {
 								targetPointsHelper.navigateToPoint(new LatLon(lat, lon), true, targetPointsHelper.getIntermediatePoints().size(), name);
+								closeContextMenu(act);
 							}
 							MapActivity.launchMapActivityMoveToTop(act);
 						}
@@ -75,10 +79,17 @@ public class DirectionsDialogs {
 			builder.show();
 		} else {
 			targetPointsHelper.navigateToPoint(new LatLon(lat, lon), true, -1, name);
+			closeContextMenu(act);
 			MapActivity.launchMapActivityMoveToTop(act);
 		}
 	}
 
+	private static void closeContextMenu(Activity act) {
+		if (act instanceof MapActivity) {
+			((MapActivity) act).getContextMenu().close();
+		}
+	}
+
 	public static void setupPopUpMenuIcon(PopupMenu menu){
 		try {
 			Field[] fields = menu.getClass().getDeclaredFields();
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index 01a5690a01..ee6ce64fa1 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -462,6 +462,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 		} else if (targets.getIntermediatePoints().isEmpty()) {
 			targets.navigateToPoint(latLon, true, -1, getPointDescriptionForTarget());
 			mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true);
+			close();
 		} else {
 			Builder bld = new AlertDialog.Builder(mapActivity);
 			bld.setTitle(R.string.new_directions_point_dialog);
@@ -483,9 +484,11 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 						targets.removeAllWayPoints(false);
 						targets.navigateToPoint(latLon, true, -1, getPointDescriptionForTarget());
 						mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true);
+						close();
 					} else {
 						targets.navigateToPoint(latLon, true, -1, getPointDescriptionForTarget());
 						mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true);
+						close();
 					}
 				}
 			});
diff --git a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
index 5f29a370fe..8705d6edcd 100644
--- a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
@@ -16,6 +16,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;
 
 import java.util.Iterator;
@@ -78,7 +79,8 @@ public class PointNavigationLayer extends OsmandMapLayer implements IContextMenu
 	
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings nightMode) {
-		if(tb.getZoom() < 3) {
+		RoutingHelper routingHelper = view.getApplication().getRoutingHelper();
+		if (tb.getZoom() < 3 || (!routingHelper.isRoutePlanningMode() && !routingHelper.isFollowingMode())) {
 			return;
 		}
 
@@ -126,7 +128,7 @@ public class PointNavigationLayer extends OsmandMapLayer implements IContextMenu
 			pointToNavigate = it.next();
 		}
 		if (pointToNavigate != null && !isLocationVisible(tb, pointToNavigate)) {
-			boolean show = !view.getApplication().getRoutingHelper().isRouteCalculated();
+			boolean show = !routingHelper.isRouteCalculated();
 			if(view.getSettings().SHOW_DESTINATION_ARROW.isSet()) {
 				show = view.getSettings().SHOW_DESTINATION_ARROW.get();
 			}

From faa85cdf54ff28880db09bac45d2574001cfa9e9 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Thu, 11 Feb 2016 17:58:45 +0300
Subject: [PATCH 14/18] Added 2 additional marker colors (except map images)

---
 OsmAnd/res/values/colors.xml                  |  4 +++-
 .../src/net/osmand/plus/MapMarkersHelper.java |  2 +-
 .../plus/helpers/MapMarkerDialogHelper.java   |  8 ++++++-
 .../osmand/plus/views/MapMarkersLayer.java    | 22 ++++++++++++++++---
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index eaa0ea14bd..f3567ad5cc 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -5,7 +5,9 @@
 	<color name="marker_green">#73b825</color>
 	<color name="marker_orange">#ff9800</color>
 	<color name="marker_red">#e53935</color>
-	<color name="marker_lt_green">#d7eb23</color>
+	<color name="marker_yellow">#FDD835</color>
+    <color name="marker_teal">#26a69a</color>
+    <color name="marker_purple">#ab47bc</color>
 
 	<color name="popup_bg_color">#EE666666</color>
 	<color name="popup_separator_color">#BBBBBB</color>
diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index f5e8be75ad..2622babaa2 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class MapMarkersHelper {
-	public static final int MAP_MARKERS_COLORS_COUNT = 5;
+	public static final int MAP_MARKERS_COLORS_COUNT = 7;
 
 	private List<MapMarker> mapMarkers = new ArrayList<>();
 	private List<MapMarker> mapMarkersHistory = new ArrayList<>();
diff --git a/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
index 6b49245d4a..0a45c67dbc 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
@@ -507,7 +507,13 @@ public class MapMarkerDialogHelper {
 				colorId = R.color.marker_red;
 					break;
 			case 4:
-				colorId = R.color.marker_lt_green;
+				colorId = R.color.marker_yellow;
+				break;
+			case 5:
+				colorId = R.color.marker_teal;
+				break;
+			case 6:
+				colorId = R.color.marker_purple;
 				break;
 			default:
 				colorId = R.color.marker_blue;
diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
index 62831440c7..54d477b485 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -32,12 +32,16 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 	private Bitmap markerBitmapOrange;
 	private Bitmap markerBitmapRed;
 	private Bitmap markerBitmapYellow;
+	private Bitmap markerBitmapTeal;
+	private Bitmap markerBitmapPurple;
 
 	private Paint bitmapPaintDestBlue;
 	private Paint bitmapPaintDestGreen;
 	private Paint bitmapPaintDestOrange;
 	private Paint bitmapPaintDestRed;
-	private Paint bitmapPaintDestLtGreen;
+	private Paint bitmapPaintDestYellow;
+	private Paint bitmapPaintDestTeal;
+	private Paint bitmapPaintDestPurple;
 	private Bitmap arrowToDestination;
 	private float[] calculations = new float[2];
 
@@ -55,13 +59,17 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 		markerBitmapOrange = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_orange);
 		markerBitmapRed = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_red);
 		markerBitmapYellow = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_yellow);
+		markerBitmapTeal = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_red);
+		markerBitmapPurple = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_marker_green);
 
 		arrowToDestination = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_arrow_to_destination);
 		bitmapPaintDestBlue = createPaintDest(R.color.marker_blue);
 		bitmapPaintDestGreen = createPaintDest(R.color.marker_green);
 		bitmapPaintDestOrange = createPaintDest(R.color.marker_orange);
 		bitmapPaintDestRed = createPaintDest(R.color.marker_red);
-		bitmapPaintDestLtGreen = createPaintDest(R.color.marker_lt_green);
+		bitmapPaintDestYellow = createPaintDest(R.color.marker_yellow);
+		bitmapPaintDestTeal = createPaintDest(R.color.marker_teal);
+		bitmapPaintDestPurple = createPaintDest(R.color.marker_purple);
 	}
 
 	private Paint createPaintDest(int colorId) {
@@ -85,7 +93,11 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 			case 3:
 				return bitmapPaintDestRed;
 			case 4:
-				return bitmapPaintDestLtGreen;
+				return bitmapPaintDestYellow;
+			case 5:
+				return bitmapPaintDestTeal;
+			case 6:
+				return bitmapPaintDestPurple;
 			default:
 				return bitmapPaintDestBlue;
 		}
@@ -103,6 +115,10 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 				return markerBitmapRed;
 			case 4:
 				return markerBitmapYellow;
+			case 5:
+				return markerBitmapTeal;
+			case 6:
+				return markerBitmapPurple;
 			default:
 				return markerBitmapBlue;
 		}

From 4b8ea588455645708ed2e5504f20feaf8337f7a5 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sat, 13 Feb 2016 14:32:25 +0300
Subject: [PATCH 15/18] Added top map markers widget

---
 OsmAnd/res/layout/map_hud_top.xml             | 177 +++++++++++++++-
 OsmAnd/res/values/colors.xml                  |   4 +
 .../plus/base/MapViewTrackingUtilities.java   |  14 ++
 .../plus/helpers/MapMarkerDialogHelper.java   |  19 +-
 .../osmand/plus/views/MapMarkersLayer.java    |   8 +
 .../views/mapwidgets/MapMarkersWidget.java    | 197 ++++++++++++++++++
 6 files changed, 408 insertions(+), 11 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java

diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index cc44e2d13a..1139a1e1d9 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -139,10 +139,185 @@
                 android:id="@+id/waypoint_close"
                 android:layout_width="@dimen/map_address_height"
                 android:layout_height="@dimen/map_address_height"
-                android:background="@drawable/btn_circle_transparent"
+                android:background="@drawable/bottom_shadow"
                 android:src="@drawable/ic_action_test_light"/>
         </LinearLayout>
     </FrameLayout>
+
+
+    <FrameLayout
+        android:id="@+id/map_markers_top_bar"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:minHeight="@dimen/map_address_height">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/map_address_height"
+                android:background="@color/markers_top_bar_background">
+
+                <LinearLayout
+                    android:id="@+id/map_marker_row"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/map_marker_arrow"
+                        android:layout_width="60dp"
+                        android:layout_height="40dp"
+                        android:src="@drawable/map_arrow_to_destination"/>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/map_marker_dist"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textStyle="bold"
+                            android:textSize="26sp"
+                            android:textColor="@color/color_white"
+                            android:text="500 m"/>
+
+                        <TextView
+                            android:id="@+id/map_marker_address"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:textColor="@color/marker_top_2nd_line_color"
+                            android:textStyle="bold"
+                            android:maxLines="1"
+                            android:ellipsize="end"
+                            android:textSize="@dimen/default_list_text_size"
+                            android:text="Dmitrievskaya st., 45"/>
+
+                    </LinearLayout>
+
+                    <ImageButton
+                        android:id="@+id/marker_btn_ok"
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:background="?attr/dashboard_button"
+                        android:src="@drawable/ic_action_done"/>
+
+                    <ImageButton
+                        android:id="@+id/marker_btn_more"
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:background="?attr/dashboard_button"
+                        android:src="@drawable/ic_overflow_menu_white"/>
+
+                </LinearLayout>
+
+
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/map_markers_top_bar_2nd"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/map_address_height"
+                android:background="@color/markers_top_bar_2nd_background"
+                android:visibility="visible">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:foreground="@drawable/bg_contextmenu_shadow"
+                    android:foregroundGravity="top|fill_horizontal"/>
+
+                <LinearLayout
+                    android:id="@+id/map_marker_row_2nd"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/map_marker_arrow_2nd"
+                        android:layout_width="60dp"
+                        android:layout_height="30dp"
+                        android:src="@drawable/map_arrow_to_destination"/>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginTop="6dp"
+                        android:layout_marginBottom="6dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/map_marker_dist_2nd"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textStyle="bold"
+                            android:textSize="@dimen/default_list_text_size_large"
+                            android:textColor="@color/color_white"
+                            android:text="500 m"/>
+
+                        <TextView
+                            android:id="@+id/map_marker_address_2nd"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/marker_top_2nd_line_color"
+                            android:maxLines="1"
+                            android:layout_marginTop="2dp"
+                            android:ellipsize="end"
+                            android:textStyle="bold"
+                            android:textSize="@dimen/default_desc_text_size"
+                            android:text=" - Dmitrievskaya st., 45"/>
+
+                    </LinearLayout>
+
+                    <ImageButton
+                        android:id="@+id/marker_btn_ok_2dn"
+                        android:layout_width="50dp"
+                        android:layout_height="48dp"
+                        android:background="?attr/dashboard_button"
+                        android:src="@drawable/ic_action_done"/>
+
+                    <ImageButton
+                        android:id="@+id/marker_btn_more_2nd"
+                        android:layout_width="50dp"
+                        android:layout_height="48dp"
+                        android:background="?attr/dashboard_button"
+                        android:src="@drawable/ic_overflow_menu_white"/>
+
+                </LinearLayout>
+
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/map_markers_top_bar_shadow"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:foreground="@drawable/bg_contextmenu_shadow"
+                android:foregroundGravity="top|fill_horizontal"/>
+
+        </LinearLayout>
+
+    </FrameLayout>
+
     <!-- Widgets -->
 
     <FrameLayout
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index f3567ad5cc..44ff2e15f7 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <color name="markers_top_bar_background">#145256</color>
+    <color name="markers_top_bar_2nd_background">#0e3b3e</color>
+    <color name="marker_top_2nd_line_color">#588689</color>
+
 	<color name="marker_blue">#2196f3</color>
 	<color name="marker_green">#73b825</color>
 	<color name="marker_orange">#ff9800</color>
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index df9a745159..ca4206e4a7 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -3,6 +3,7 @@ package net.osmand.plus.base;
 import android.content.Context;
 import android.view.WindowManager;
 
+import net.osmand.FloatMath;
 import net.osmand.Location;
 import net.osmand.StateChangedListener;
 import net.osmand.ValueHolder;
@@ -47,10 +48,13 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 	private boolean isUserZoomed = false;
 	private String locationProvider;
 	private boolean showRouteFinishDialog = false;
+	private Location myLocation;
+	private Float heading;
 
 	public MapViewTrackingUtilities(OsmandApplication app){
 		this.app = app;
 		settings = app.getSettings();
+		myLocation = app.getLocationProvider().getLastKnownLocation();
 		app.getLocationProvider().addLocationListener(this);
 		app.getLocationProvider().addCompassListener(this);
 		addTargetPointListener(app);
@@ -95,12 +99,21 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 		}
 	}
 
+	public Location getMyLocation() {
+		return myLocation;
+	}
+
+	public Float getHeading() {
+		return heading;
+	}
+
 	public String getLocationProvider() {
 		return locationProvider;
 	}
 
 	@Override
 	public void updateCompassValue(float val) {
+		heading = val;
 		if (mapView != null) {
 			if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS && !routePlanningMode) {
 				if (Math.abs(MapUtils.degreesDiff(mapView.getRotate(), -val)) > 1) {
@@ -128,6 +141,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 
 	@Override
 	public void updateLocation(Location location) {
+		myLocation = location;
 		showViewAngle = false;
 		if (location != null) {
 			locationProvider = location.getProvider();
diff --git a/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
index 0a45c67dbc..b6f05f3755 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
@@ -84,7 +84,7 @@ public class MapMarkerDialogHelper {
 				if (obj instanceof MapMarker) {
 					MapMarker marker = (MapMarker) obj;
 					if (!marker.history) {
-						showOnMap(marker);
+						showMarkerOnMap(mapActivity, marker);
 					} else {
 						showHistoryOnMap(marker);
 					}
@@ -316,12 +316,7 @@ public class MapMarkerDialogHelper {
 		}
 
 		int dist = (int) mes[0];
-
-		//if (dist > 0) {
 		textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
-		//} else {
-		//	textDist.setText("");
-		//}
 
 		waypointDeviation.setVisibility(View.GONE);
 
@@ -396,8 +391,8 @@ public class MapMarkerDialogHelper {
 		textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
 	}
 
-	public void showOnMap(MapMarker marker) {
-		app.getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
+	public static void showMarkerOnMap(MapActivity mapActivity, MapMarker marker) {
+		mapActivity.getMyApplication().getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
 				15, marker.getPointDescription(mapActivity), true, marker);
 		MapActivity.launchMapActivityMoveToTop(mapActivity);
 	}
@@ -492,6 +487,10 @@ public class MapMarkerDialogHelper {
 	}
 
 	public static Drawable getMapMarkerIcon(OsmandApplication app, int colorIndex) {
+		return app.getIconsCache().getIcon(R.drawable.ic_action_flag_dark, getMapMarkerColorId(colorIndex));
+	}
+
+	public static int getMapMarkerColorId(int colorIndex) {
 		int colorId;
 		switch (colorIndex) {
 			case 0:
@@ -505,7 +504,7 @@ public class MapMarkerDialogHelper {
 				break;
 			case 3:
 				colorId = R.color.marker_red;
-					break;
+				break;
 			case 4:
 				colorId = R.color.marker_yellow;
 				break;
@@ -518,7 +517,7 @@ public class MapMarkerDialogHelper {
 			default:
 				colorId = R.color.marker_blue;
 		}
-		return app.getIconsCache().getIcon(R.drawable.ic_action_flag_dark, colorId);
+		return colorId;
 	}
 
 	public void updateLocation(ListView listView, boolean compassChanged) {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
index 54d477b485..8b562b45ed 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -16,6 +16,7 @@ import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.views.mapwidgets.MapMarkersWidget;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +27,8 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 	private final MapActivity map;
 	private OsmandMapTileView view;
 
+	private MapMarkersWidget widget;
+
 	private Paint bitmapPaint;
 	private Bitmap markerBitmapBlue;
 	private Bitmap markerBitmapGreen;
@@ -70,6 +73,8 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 		bitmapPaintDestYellow = createPaintDest(R.color.marker_yellow);
 		bitmapPaintDestTeal = createPaintDest(R.color.marker_teal);
 		bitmapPaintDestPurple = createPaintDest(R.color.marker_purple);
+
+		widget = new MapMarkersWidget(map);
 	}
 
 	private Paint createPaintDest(int colorId) {
@@ -132,6 +137,9 @@ public class MapMarkersLayer extends OsmandMapLayer implements ContextMenuLayer.
 
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings nightMode) {
+
+		widget.updateInfo(tb.getZoom());
+
 		if (tb.getZoom() < 3) {
 			return;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
new file mode 100644
index 0000000000..ea4b1614df
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
@@ -0,0 +1,197 @@
+package net.osmand.plus.views.mapwidgets;
+
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.Location;
+import net.osmand.data.PointDescription;
+import net.osmand.plus.IconsCache;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.MapMarkersHelper.MapMarker;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.dashboard.DashLocationFragment;
+import net.osmand.plus.helpers.MapMarkerDialogHelper;
+import net.osmand.plus.views.DirectionDrawable;
+import net.osmand.util.Algorithms;
+
+import java.util.List;
+
+public class MapMarkersWidget {
+
+	public static final int MIN_DIST_OK_VISIBLE = 50;
+
+	private final MapActivity map;
+	private MapMarkersHelper helper;
+	private int screenOrientation;
+
+	private View topBar;
+	private View topBar2nd;
+	private View rowView;
+	private View rowView2nd;
+	private ImageView arrowImg;
+	private ImageView arrowImg2nd;
+	private TextView distText;
+	private TextView distText2nd;
+	private TextView addressText;
+	private TextView addressText2nd;
+	private ImageButton okButton;
+	private ImageButton okButton2nd;
+	private ImageButton moreButton;
+	private ImageButton moreButton2nd;
+
+	public MapMarkersWidget(MapActivity map) {
+		this.map = map;
+		helper = map.getMyApplication().getMapMarkersHelper();
+		screenOrientation = DashLocationFragment.getScreenOrientation(map);
+
+		topBar = map.findViewById(R.id.map_markers_top_bar);
+		topBar2nd = map.findViewById(R.id.map_markers_top_bar_2nd);
+		rowView = map.findViewById(R.id.map_marker_row);
+		rowView2nd = map.findViewById(R.id.map_marker_row_2nd);
+		arrowImg = (ImageView) map.findViewById(R.id.map_marker_arrow);
+		arrowImg2nd = (ImageView) map.findViewById(R.id.map_marker_arrow_2nd);
+		distText = (TextView) map.findViewById(R.id.map_marker_dist);
+		distText2nd = (TextView) map.findViewById(R.id.map_marker_dist_2nd);
+		addressText = (TextView) map.findViewById(R.id.map_marker_address);
+		addressText2nd = (TextView) map.findViewById(R.id.map_marker_address_2nd);
+		okButton = (ImageButton) map.findViewById(R.id.marker_btn_ok);
+		okButton2nd = (ImageButton) map.findViewById(R.id.marker_btn_ok_2dn);
+		moreButton = (ImageButton) map.findViewById(R.id.marker_btn_more);
+		moreButton2nd = (ImageButton) map.findViewById(R.id.marker_btn_more_2nd);
+
+		rowView.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				showMarkerOnMap(0);
+			}
+		});
+		rowView2nd.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				showMarkerOnMap(1);
+			}
+		});
+
+		IconsCache iconsCache = map.getMyApplication().getIconsCache();
+		moreButton.setImageDrawable(iconsCache.getIcon(R.drawable.ic_overflow_menu_white, R.color.marker_top_2nd_line_color));
+		moreButton2nd.setImageDrawable(iconsCache.getIcon(R.drawable.ic_overflow_menu_white, R.color.marker_top_2nd_line_color));
+		okButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				removeMarker(0);
+			}
+		});
+		okButton2nd.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				removeMarker(1);
+			}
+		});
+
+		updateVisibility(false);
+	}
+
+	private void removeMarker(int index) {
+		if (helper.getActiveMapMarkers().size() > index) {
+			MapMarker marker = helper.getActiveMapMarkers().get(index);
+			helper.removeMapMarker(marker.index);
+			helper.addMapMarkerHistory(marker);
+		}
+	}
+
+	private void showMarkerOnMap(int index) {
+		if (helper.getActiveMapMarkers().size() > index) {
+			MapMarker marker = helper.getActiveMapMarkers().get(index);
+			MapMarkerDialogHelper.showMarkerOnMap(map, marker);
+		}
+	}
+
+	public boolean updateVisibility(boolean visible) {
+		return updateVisibility(topBar, visible);
+	}
+
+	public boolean updateVisibility(View v, boolean visible) {
+		if (visible != (v.getVisibility() == View.VISIBLE)) {
+			if (visible) {
+				v.setVisibility(View.VISIBLE);
+			} else {
+				v.setVisibility(View.GONE);
+			}
+			v.invalidate();
+			return true;
+		}
+		return false;
+	}
+
+	public void updateInfo(int zoom) {
+		List<MapMarker> markers = helper.getActiveMapMarkers();
+		if (zoom < 3 || markers.size() == 0 || map.getMyApplication().getRoutingHelper().isFollowingMode()
+				|| map.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().isVisible()) {
+			updateVisibility(false);
+			return;
+		}
+
+		Location loc = map.getMapViewTrackingUtilities().getMyLocation();
+		Float heading = map.getMapViewTrackingUtilities().getHeading();
+
+		MapMarker marker = markers.get(0);
+		updateUI(loc, heading, marker, arrowImg, distText, okButton, addressText, true);
+
+		if (markers.size() > 1) {
+			marker = markers.get(1);
+			updateUI(loc, heading, marker, arrowImg2nd, distText2nd, okButton2nd, addressText2nd, false);
+			updateVisibility(topBar2nd, true);
+		} else {
+			updateVisibility(topBar2nd, false);
+		}
+
+		updateVisibility(true);
+	}
+
+	private void updateUI(Location loc, Float heading, MapMarker marker, ImageView arrowImg,
+						  TextView distText, ImageButton okButton, TextView addressText, boolean firstLine) {
+		float[] mes = new float[2];
+		if (loc != null && marker.point != null) {
+			Location.distanceBetween(marker.getLatitude(), marker.getLongitude(), loc.getLatitude(), loc.getLongitude(), mes);
+		}
+
+		boolean newImage = false;
+		DirectionDrawable dd;
+		if (!(arrowImg.getDrawable() instanceof DirectionDrawable)) {
+			newImage = true;
+			dd = new DirectionDrawable(map, arrowImg.getWidth(), arrowImg.getHeight());
+		} else {
+			dd = (DirectionDrawable) arrowImg.getDrawable();
+		}
+		dd.setImage(R.drawable.map_arrow_to_destination, MapMarkerDialogHelper.getMapMarkerColorId(marker.colorIndex));
+		if (loc == null || heading == null || marker.point == null) {
+			dd.setAngle(0);
+		} else {
+			dd.setAngle(mes[1] - heading + 90 + screenOrientation);
+		}
+		if (newImage) {
+			arrowImg.setImageDrawable(dd);
+		}
+		arrowImg.invalidate();
+
+		int dist = (int) mes[0];
+		distText.setText(OsmAndFormatter.getFormattedDistance(dist, map.getMyApplication()));
+		updateVisibility(okButton, dist < MIN_DIST_OK_VISIBLE);
+
+		String descr;
+		PointDescription pd = marker.getPointDescription(map);
+		if (Algorithms.isEmpty(pd.getName())) {
+			descr = pd.getTypeName();
+		} else {
+			descr = pd.getName();
+		}
+		if (!firstLine) {
+			descr = " — " + descr;
+		}
+		addressText.setText(descr);
+	}
+}

From 0dc09e1554463eaf3ee80bc4953e5d8f6391dfaa Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sat, 13 Feb 2016 15:47:38 +0300
Subject: [PATCH 16/18] Small markers widget UI fix

---
 OsmAnd/res/layout/map_hud_top.xml             | 23 ++++++++++---------
 .../views/mapwidgets/MapMarkersWidget.java    |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 1139a1e1d9..14dc1ee96f 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -257,7 +257,7 @@
                         android:layout_height="30dp"
                         android:src="@drawable/map_arrow_to_destination"/>
 
-                    <LinearLayout
+                    <RelativeLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -270,24 +270,25 @@
                             android:id="@+id/map_marker_dist_2nd"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textStyle="bold"
-                            android:textSize="@dimen/default_list_text_size_large"
+                            android:text="500 m"
                             android:textColor="@color/color_white"
-                            android:text="500 m"/>
+                            android:textSize="@dimen/default_list_text_size_large"
+                            android:textStyle="bold"/>
 
                         <TextView
                             android:id="@+id/map_marker_address_2nd"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/marker_top_2nd_line_color"
-                            android:maxLines="1"
-                            android:layout_marginTop="2dp"
+                            android:layout_alignBaseline="@+id/map_marker_dist_2nd"
+                            android:layout_toRightOf="@+id/map_marker_dist_2nd"
                             android:ellipsize="end"
-                            android:textStyle="bold"
-                            android:textSize="@dimen/default_desc_text_size"
-                            android:text=" - Dmitrievskaya st., 45"/>
+                            android:maxLines="1"
+                            android:text="  •  Dmitr"
+                            android:textColor="@color/marker_top_2nd_line_color"
+                            android:textSize="@dimen/default_list_text_size"
+                            android:textStyle="bold"/>
 
-                    </LinearLayout>
+                    </RelativeLayout>
 
                     <ImageButton
                         android:id="@+id/marker_btn_ok_2dn"
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
index 3b32d620cf..94b662084d 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
@@ -195,7 +195,7 @@ public class MapMarkersWidget {
 			descr = pd.getName();
 		}
 		if (!firstLine && !isLandscapeLayout()) {
-			descr = " — " + descr;
+			descr = "  •  " + descr;
 		}
 
 		addressText.setText(descr);

From 73e1283722045c05316c3cba1871762695f02ef7 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sat, 13 Feb 2016 21:57:51 +0300
Subject: [PATCH 17/18] Fix top bar UI

---
 OsmAnd/res/layout/map_hud_top.xml             |  7 -----
 .../views/mapwidgets/MapMarkersWidget.java    | 27 ++++++++++++++++---
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 14dc1ee96f..8699f23361 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -297,13 +297,6 @@
                         android:background="?attr/dashboard_button"
                         android:src="@drawable/ic_action_done"/>
 
-                    <ImageButton
-                        android:id="@+id/marker_btn_more_2nd"
-                        android:layout_width="50dp"
-                        android:layout_height="48dp"
-                        android:background="?attr/dashboard_button"
-                        android:src="@drawable/ic_overflow_menu_white"/>
-
                 </LinearLayout>
 
             </FrameLayout>
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
index 94b662084d..580765c992 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
@@ -14,6 +14,7 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashLocationFragment;
+import net.osmand.plus.dashboard.DashboardOnMap;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.MapMarkerDialogHelper;
 import net.osmand.plus.views.DirectionDrawable;
@@ -46,7 +47,7 @@ public class MapMarkersWidget {
 	private ImageButton moreButton;
 	private ImageButton moreButton2nd;
 
-	public MapMarkersWidget(MapActivity map) {
+	public MapMarkersWidget(final MapActivity map) {
 		this.map = map;
 		helper = map.getMyApplication().getMapMarkersHelper();
 		screenOrientation = DashLocationFragment.getScreenOrientation(map);
@@ -82,8 +83,28 @@ public class MapMarkersWidget {
 		});
 
 		IconsCache iconsCache = map.getMyApplication().getIconsCache();
-		moreButton.setImageDrawable(iconsCache.getIcon(R.drawable.ic_overflow_menu_white, R.color.marker_top_2nd_line_color));
-		moreButton2nd.setImageDrawable(iconsCache.getIcon(R.drawable.ic_overflow_menu_white, R.color.marker_top_2nd_line_color));
+		if (isLandscapeLayout()) {
+			moreButton.setVisibility(View.GONE);
+		} else {
+			moreButton.setImageDrawable(iconsCache.getIcon(R.drawable.ic_overflow_menu_white, R.color.marker_top_2nd_line_color));
+			moreButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					MapActivity.clearPrevActivityIntent();
+					map.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.MAP_MARKERS);
+				}
+			});
+		}
+		if (moreButton2nd != null) {
+			moreButton2nd.setImageDrawable(iconsCache.getIcon(R.drawable.ic_overflow_menu_white, R.color.marker_top_2nd_line_color));
+			moreButton2nd.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					MapActivity.clearPrevActivityIntent();
+					map.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.MAP_MARKERS);
+				}
+			});
+		}
 		okButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {

From a3ed18c8df66b7939764ea382d88539aba2ff7a9 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sun, 14 Feb 2016 12:01:55 +0300
Subject: [PATCH 18/18] Added switch on/off map markers to dev settings

---
 OsmAnd/res/layout-land/map_hud_top.xml        |  3 +-
 OsmAnd/res/layout/map_hud_top.xml             |  3 +-
 OsmAnd/res/values/strings.xml                 |  2 ++
 .../src/net/osmand/plus/OsmandSettings.java   |  2 ++
 .../plus/activities/MapActivityActions.java   | 36 ++++++++++++-------
 .../plus/activities/MapActivityLayers.java    | 13 ++++---
 .../SettingsDevelopmentActivity.java          |  6 +++-
 .../plus/mapcontextmenu/MapContextMenu.java   | 18 +++++++---
 .../MapContextMenuFragment.java               |  9 +++--
 .../plus/views/PointNavigationLayer.java      |  7 ++--
 .../views/mapwidgets/MapMarkersWidget.java    |  8 +++--
 11 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml
index 2ab4c0b733..81615ed877 100644
--- a/OsmAnd/res/layout-land/map_hud_top.xml
+++ b/OsmAnd/res/layout-land/map_hud_top.xml
@@ -10,7 +10,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:clickable="true"
-        android:minHeight="@dimen/map_address_height">
+        android:minHeight="@dimen/map_address_height"
+        android:visibility="gone">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 8699f23361..7937d94f1b 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -150,7 +150,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:clickable="true"
-        android:minHeight="@dimen/map_address_height">
+        android:minHeight="@dimen/map_address_height"
+        android:visibility="gone">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 9e6b1b1e4f..23ff4301c2 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,8 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="show_map_markers">Map Markers</string>
+    <string name="show_map_markers_description">Activate Map Markers feature</string>
     <string name="clear_active_markers_q">Do you want to delete all active markers?</string>
     <string name="clear_markers_history_q">Do you want to clear markers history?</string>
     <string name="active_markers">Active markers</string>
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 15b687c0b8..54d56184fb 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1101,6 +1101,8 @@ public class OsmandSettings {
 
 	public final OsmandPreference<Boolean> SHOULD_SHOW_FREE_VERSION_BANNER = new BooleanPreference("should_show_free_version_banner", false).makeGlobal().cache();
 
+	public final OsmandPreference<Boolean> USE_MAP_MARKERS = new BooleanPreference("use_map_markers", false).makeGlobal().cache();
+
 	public ITileSource getMapTileSource(boolean warnWhenSelected) {
 		String tileName = MAP_TILE_SOURCES.get();
 		if (tileName != null) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index edf051dfa4..8ee3b868b1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -98,14 +98,14 @@ public class MapActivityActions implements DialogProvider {
 
 		openIntermediateEditPointsDialog();
 	}
-
+	*/
 	public void addAsTarget(double latitude, double longitude, PointDescription pd) {
 		TargetPointsHelper targets = getMyApplication().getTargetPointsHelper();
 		targets.navigateToPoint(new LatLon(latitude, longitude), true, targets.getIntermediatePoints().size() + 1,
 				pd);
 		openIntermediatePointsDialog();
 	}
-	*/
+
 
 	public void addMapMarker(double latitude, double longitude, PointDescription pd) {
 		MapMarkersHelper markersHelper = getMyApplication().getMapMarkersHelper();
@@ -286,7 +286,7 @@ public class MapActivityActions implements DialogProvider {
 		if (getMyApplication().getTargetPointsHelper().getPointToNavigate() != null && 
 				(mapActivity.getRoutingHelper().isFollowingMode() || mapActivity.getRoutingHelper().isRoutePlanningMode())) {
 			adapter.item(R.string.context_menu_item_last_intermediate_point).iconColor(
-					R.drawable.ic_action_flage_dark).reg();
+					R.drawable.ic_action_intermediate).reg();
 		}
 		OsmandPlugin.registerMapContextMenu(mapActivity, latitude, longitude, adapter, selectedObj);
 
@@ -571,15 +571,27 @@ public class MapActivityActions implements DialogProvider {
 						return true;
 					}
 				}).reg();
-		optionsMenuHelper.item(R.string.map_markers).iconColor(R.drawable.ic_action_flag_dark)
-				.listen(new OnContextMenuClick() {
-					@Override
-					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-						MapActivity.clearPrevActivityIntent();
-						mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.MAP_MARKERS);
-						return false;
-					}
-				}).reg();
+		if (settings.USE_MAP_MARKERS.get()) {
+			optionsMenuHelper.item(R.string.map_markers).iconColor(R.drawable.ic_action_flag_dark)
+					.listen(new OnContextMenuClick() {
+						@Override
+						public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
+							MapActivity.clearPrevActivityIntent();
+							mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.MAP_MARKERS);
+							return false;
+						}
+					}).reg();
+		} else {
+			optionsMenuHelper.item(R.string.waypoints).iconColor(R.drawable.ic_action_intermediate)
+					.listen(new OnContextMenuClick() {
+						@Override
+						public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
+							MapActivity.clearPrevActivityIntent();
+							mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.WAYPOINTS);
+							return false;
+						}
+					}).reg();
+		}
 		optionsMenuHelper.item(R.string.get_directions).iconColor(R.drawable.ic_action_gdirections_dark)
 				.listen(new OnContextMenuClick() {
 					@Override
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index 868e0333b0..25fe948880 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -146,8 +146,10 @@ public class MapActivityLayers {
 		navigationLayer = new PointNavigationLayer(activity);
 		mapView.addLayer(navigationLayer, 7);
 		// 7.3 map markers layer
-		mapMarkersLayer = new MapMarkersLayer(activity);
-		mapView.addLayer(mapMarkersLayer, 7.3f);
+		if (app.getSettings().USE_MAP_MARKERS.get()) {
+			mapMarkersLayer = new MapMarkersLayer(activity);
+			mapView.addLayer(mapMarkersLayer, 7.3f);
+		}
 		// 7.5 Impassible roads
 		impassableRoadsLayer = new ImpassableRoadsLayer(activity);
 		mapView.addLayer(impassableRoadsLayer, 7.5f);
@@ -463,8 +465,11 @@ public class MapActivityLayers {
 	public MapControlsLayer getMapControlsLayer() {
 		return mapControlsLayer;
 	}
-	
-	
+
+	public MapMarkersLayer getMapMarkersLayer() {
+		return mapMarkersLayer;
+	}
+
 	public MapTileLayer getMapTileLayer() {
 		return mapTileLayer;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
index 4a0721a4c8..58a2a15ec3 100644
--- a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
@@ -63,7 +63,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 		firstRunPreference.setSummary(R.string.simulate_initial_startup_descr);
 		firstRunPreference.setSelectable(true);
 		firstRunPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-		@Override
+			@Override
 			public boolean onPreferenceClick(Preference preference) {
 				getMyApplication().getAppInitializer().resetFirstTimeRun();
 				getMyApplication().getSettings().FIRST_MAP_IS_DOWNLOADED.set(false);
@@ -77,6 +77,10 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 				R.string.show_free_version_banner,
 				R.string.show_free_version_banner_description));
 
+		cat.addPreference(createCheckBoxPreference(settings.USE_MAP_MARKERS,
+				R.string.show_map_markers,
+				R.string.show_map_markers_description));
+
 		Preference pref = new Preference(this);
 		final Preference simulate = pref;
 		final OsmAndLocationSimulation sim = getMyApplication().getLocationProvider().getLocationSimulation();
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index ee6ce64fa1..e0433759ea 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -21,6 +21,7 @@ import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.activities.MapActivity;
@@ -48,6 +49,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 		MapMarkerChangedListener {
 
 	private MapActivity mapActivity;
+	private OsmandSettings settings;
 	private MapMultiSelectionMenu mapMultiSelectionMenu;
 
 	private FavoritePointEditor favoritePointEditor;
@@ -81,6 +83,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 
 	public void setMapActivity(MapActivity mapActivity) {
 		this.mapActivity = mapActivity;
+		settings = mapActivity.getMyApplication().getSettings();
 		if (!appModeListenerAdded) {
 			mapActivity.getMyApplication().getSettings().APPLICATION_MODE.addListener(this);
 			appModeListenerAdded = true;
@@ -500,12 +503,17 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 	public void buttonWaypointPressed() {
 		if (pointDescription.isDestination()) {
 			mapActivity.getMapActions().editWaypoints();
-		} else if (pointDescription.isMapMarker()) {
-			hide();
-			MapActivity.clearPrevActivityIntent();
-			mapActivity.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.MAP_MARKERS);
+		} else if (settings.USE_MAP_MARKERS.get()) {
+			if (pointDescription.isMapMarker()) {
+				hide();
+				MapActivity.clearPrevActivityIntent();
+				mapActivity.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.MAP_MARKERS);
+			} else {
+				mapActivity.getMapActions().addMapMarker(latLon.getLatitude(), latLon.getLongitude(),
+						getPointDescriptionForTarget());
+			}
 		} else {
-			mapActivity.getMapActions().addMapMarker(latLon.getLatitude(), latLon.getLongitude(),
+			mapActivity.getMapActions().addAsTarget(latLon.getLatitude(), latLon.getLongitude(),
 					getPointDescriptionForTarget());
 		}
 		close();
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index f3a6f60b1e..26b1b0a289 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -387,8 +387,13 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		});
 
 		final ImageButton buttonWaypoint = (ImageButton) view.findViewById(R.id.context_menu_route_button);
-		buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_flag_dark,
-				!nightMode ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
+		if (getMyApplication().getSettings().USE_MAP_MARKERS.get()) {
+			buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_flag_dark,
+					!nightMode ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
+		} else {
+			buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_waypoint,
+					!nightMode ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
+		}
 		AndroidUtils.setDashButtonBackground(getMapActivity(), buttonWaypoint, nightMode);
 		buttonWaypoint.setOnClickListener(new View.OnClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
index 8705d6edcd..849348f046 100644
--- a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
@@ -8,6 +8,7 @@ import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.PointF;
+
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadPoint;
@@ -16,7 +17,6 @@ import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;
 
 import java.util.Iterator;
@@ -79,8 +79,7 @@ public class PointNavigationLayer extends OsmandMapLayer implements IContextMenu
 	
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings nightMode) {
-		RoutingHelper routingHelper = view.getApplication().getRoutingHelper();
-		if (tb.getZoom() < 3 || (!routingHelper.isRoutePlanningMode() && !routingHelper.isFollowingMode())) {
+		if (tb.getZoom() < 3) {
 			return;
 		}
 
@@ -128,7 +127,7 @@ public class PointNavigationLayer extends OsmandMapLayer implements IContextMenu
 			pointToNavigate = it.next();
 		}
 		if (pointToNavigate != null && !isLocationVisible(tb, pointToNavigate)) {
-			boolean show = !routingHelper.isRouteCalculated();
+			boolean show = !view.getApplication().getRoutingHelper().isRouteCalculated();
 			if(view.getSettings().SHOW_DESTINATION_ARROW.isSet()) {
 				show = view.getSettings().SHOW_DESTINATION_ARROW.get();
 			}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
index 580765c992..8d912cced0 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
@@ -205,8 +205,12 @@ public class MapMarkersWidget {
 		arrowImg.invalidate();
 
 		int dist = (int) mes[0];
-		distText.setText(OsmAndFormatter.getFormattedDistance(dist, map.getMyApplication()));
-		updateVisibility(okButton, dist < MIN_DIST_OK_VISIBLE);
+		if (loc != null) {
+			distText.setText(OsmAndFormatter.getFormattedDistance(dist, map.getMyApplication()));
+		} else {
+			distText.setText("— " + map.getString(R.string.m));
+		}
+		updateVisibility(okButton, loc != null && dist < MIN_DIST_OK_VISIBLE);
 
 		String descr;
 		PointDescription pd = marker.getPointDescription(map);