From 7027ce98fdf1a395020896377df3262efcd5283d Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Sat, 29 Jul 2017 13:24:32 +0300
Subject: [PATCH 1/3] Open waypoint by click on fab

---
 OsmAnd/res/layout/points_tree.xml             | 32 +++++++++++++++++
 .../plus/myplaces/TrackPointFragment.java     | 35 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 OsmAnd/res/layout/points_tree.xml

diff --git a/OsmAnd/res/layout/points_tree.xml b/OsmAnd/res/layout/points_tree.xml
new file mode 100644
index 0000000000..aaae2efb47
--- /dev/null
+++ b/OsmAnd/res/layout/points_tree.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:id="@+id/MainLayout"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <ExpandableListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginTop="0dp"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:drawSelectorOnTop="false"
+        android:groupIndicator="@android:color/transparent" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fabButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_action_plus"
+        android:contentDescription="@string/quick_action_new_action"
+        app:backgroundTint="@color/dashboard_blue"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index b94efce8b5..29ac87ddc3 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.view.ActionMode;
@@ -89,6 +90,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 	private Set<Integer> selectedGroups = new LinkedHashSet<>();
 	private ActionMode actionMode;
 	private SearchView searchView;
+	private FloatingActionButton fab;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -106,10 +108,41 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.favorites_tree, container, false);
+		View view = inflater.inflate(R.layout.points_tree, container, false);
 		ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
 		setHasOptionsMenu(true);
 
+		fab = (FloatingActionButton) view.findViewById(R.id.fabButton);
+
+		fab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				GpxDisplayItem item = null;
+				int groupCount = adapter.getGroupCount();
+				for (int i = 0; i < groupCount; i++) {
+					GpxDisplayGroup group = adapter.getGroup(i);
+					if (group.getType() == GpxDisplayItemType.TRACK_POINTS) {
+						int childrenCount = adapter.getChildrenCount(i);
+						item = adapter.getChild(i, childrenCount - 1);
+					}
+				}
+				if (item != null) {
+					if (item.group.getGpx() != null) {
+						app.getSelectedGpxHelper().setGpxFileToDisplay(item.group.getGpx());
+					}
+					final OsmandSettings settings = app.getSettings();
+					LatLon location = new LatLon(item.locationStart.lat, item.locationStart.lon);
+					settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
+							settings.getLastKnownMapZoom(),
+							new PointDescription(PointDescription.POINT_TYPE_WPT, item.name),
+							false,
+							item.locationStart);
+
+					MapActivity.launchMapActivityMoveToTop(getActivity());
+				}
+			}
+		});
+
 		TextView tv = new TextView(getActivity());
 		tv.setText(R.string.none_selected_gpx);
 		tv.setTextSize(24);

From 3d60e37765c56d9871d286f3796473b34b2017f9 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 31 Jul 2017 10:22:29 +0300
Subject: [PATCH 2/3] Fix toShow

---
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  | 15 ++++++++++
 .../osmand/plus/activities/MapActivity.java   |  6 +++-
 .../plus/myplaces/TrackPointFragment.java     | 28 ++++++++-----------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index c30620b199..94774cd6f5 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -102,6 +102,21 @@ public class GPXUtilities {
 		public float speed;
 	}
 
+	public static class CreatedGpxWaypoint {
+		private WptPt point;
+
+		public CreatedGpxWaypoint() {
+		}
+
+		public WptPt getPoint() {
+			return point;
+		}
+
+		public void setPoint(WptPt point) {
+			this.point = point;
+		}
+	}
+
 	public static class WptPt extends GPXExtensions implements LocationPoint {
 		public boolean firstPoint = false;
 		public boolean lastPoint = false;
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 5fd14c9016..19a9674209 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -57,6 +57,7 @@ import net.osmand.plus.AppInitializer;
 import net.osmand.plus.AppInitializer.AppInitializeListener;
 import net.osmand.plus.AppInitializer.InitEvents;
 import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
@@ -912,7 +913,10 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 				} else if (toShow instanceof QuadRect) {
 					QuadRect qr = (QuadRect) toShow;
 					mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
-				} else {
+				} else if (toShow instanceof WptPt) {
+					WptPt createdGpxWaypoint = (WptPt) toShow;
+				}
+				else {
 					mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);
 				}
 				if (editToShow) {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index 29ac87ddc3..143234cb1b 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -36,7 +36,9 @@ import net.osmand.data.PointDescription;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GPXUtilities.GPXFile;
+import net.osmand.plus.GPXUtilities.CreatedGpxWaypoint;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
@@ -91,11 +93,13 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 	private ActionMode actionMode;
 	private SearchView searchView;
 	private FloatingActionButton fab;
+	private CreatedGpxWaypoint createdGpxWaypoint;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		this.app = getMyApplication();
+		this.createdGpxWaypoint = new CreatedGpxWaypoint();
 	}
 
 	@Override
@@ -117,26 +121,16 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		fab.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				GpxDisplayItem item = null;
-				int groupCount = adapter.getGroupCount();
-				for (int i = 0; i < groupCount; i++) {
-					GpxDisplayGroup group = adapter.getGroup(i);
-					if (group.getType() == GpxDisplayItemType.TRACK_POINTS) {
-						int childrenCount = adapter.getChildrenCount(i);
-						item = adapter.getChild(i, childrenCount - 1);
-					}
-				}
-				if (item != null) {
-					if (item.group.getGpx() != null) {
-						app.getSelectedGpxHelper().setGpxFileToDisplay(item.group.getGpx());
-					}
-					final OsmandSettings settings = app.getSettings();
-					LatLon location = new LatLon(item.locationStart.lat, item.locationStart.lon);
+				final OsmandSettings settings = app.getSettings();
+				GPXFile gpx = getGpx();
+				WptPt pointToShow = gpx != null ? gpx.findPointToShow() : null;
+				if (pointToShow != null) {
+					LatLon location = new LatLon(pointToShow.lat, pointToShow.lon);
 					settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
 							settings.getLastKnownMapZoom(),
-							new PointDescription(PointDescription.POINT_TYPE_WPT, item.name),
+							new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.context_menu_item_add_waypoint)),
 							false,
-							item.locationStart);
+							createdGpxWaypoint);
 
 					MapActivity.launchMapActivityMoveToTop(getActivity());
 				}

From 560fca06ff8ee6c09f2127cbc10dcafe145bdfd2 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 1 Aug 2017 17:21:51 +0300
Subject: [PATCH 3/3] Modify fab in trackPointsFragment

---
 .../add_gpx_waypoint_bottom_sheet.xml         |  66 +++++++++++
 OsmAnd/res/layout-land/map_hud_bottom.xml     |   7 ++
 .../layout/add_gpx_waypoint_bottom_sheet.xml  |  68 +++++++++++
 OsmAnd/res/layout/map_hud_bottom.xml          |   3 +
 OsmAnd/res/values/strings.xml                 |   2 +
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  |  15 +--
 .../osmand/plus/activities/MapActivity.java   |  11 +-
 .../plus/myplaces/TrackPointFragment.java     |  12 +-
 .../views/AddWaypointBottomSheetHelper.java   | 102 +++++++++++++++++
 .../osmand/plus/views/ContextMenuLayer.java   | 108 +++++++++++++++++-
 .../osmand/plus/views/MapControlsLayer.java   |   8 +-
 .../plus/views/MapQuickActionLayer.java       |  14 +--
 12 files changed, 379 insertions(+), 37 deletions(-)
 create mode 100644 OsmAnd/res/layout-land/add_gpx_waypoint_bottom_sheet.xml
 create mode 100644 OsmAnd/res/layout/add_gpx_waypoint_bottom_sheet.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/views/AddWaypointBottomSheetHelper.java

diff --git a/OsmAnd/res/layout-land/add_gpx_waypoint_bottom_sheet.xml b/OsmAnd/res/layout-land/add_gpx_waypoint_bottom_sheet.xml
new file mode 100644
index 0000000000..541d8c347f
--- /dev/null
+++ b/OsmAnd/res/layout-land/add_gpx_waypoint_bottom_sheet.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/add_gpx_waypoint_bottom_sheet"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:background="?attr/bottom_menu_view_bg"
+    android:clickable="true"
+    android:visibility="gone"
+    tools:visibility="visible">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:src="@drawable/ic_action_photo_dark"/>
+
+    <LinearLayout
+        android:layout_weight="1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/add_gpx_waypoint_bottom_sheet_title"
+            style="@style/TextAppearance.ContextMenuTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/add_gpx_waypoint_bottom_sheet_title"/>
+
+        <TextView
+            android:id="@+id/description"
+            style="@style/TextAppearance.ContextMenuSubtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="8dp"
+            tools:text="Lat: 50.45375 Lon: 30.48693"/>
+
+    </LinearLayout>
+
+    <android.support.v7.widget.AppCompatButton
+        android:id="@+id/create_button"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:text="@string/shared_string_create"/>
+
+    <android.support.v7.widget.AppCompatButton
+        android:id="@+id/cancel_button"
+        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="16dp"
+        android:layout_gravity="center_vertical"
+        android:text="@string/shared_string_cancel"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index 72be926e0d..ffa987a0f6 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -261,4 +261,11 @@
         android:layout_gravity="bottom|left"
         tools:visibility="visible"/>
 
+    <include
+        layout="@layout/add_gpx_waypoint_bottom_sheet"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|left"
+        tools:visibility="visible"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/add_gpx_waypoint_bottom_sheet.xml b/OsmAnd/res/layout/add_gpx_waypoint_bottom_sheet.xml
new file mode 100644
index 0000000000..a57d63a9a5
--- /dev/null
+++ b/OsmAnd/res/layout/add_gpx_waypoint_bottom_sheet.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/add_gpx_waypoint_bottom_sheet"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:background="?attr/bottom_menu_view_bg"
+    android:clickable="true"
+    android:visibility="gone"
+    tools:visibility="visible">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:src="@drawable/ic_action_photo_dark"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/add_gpx_waypoint_bottom_sheet_title"
+            style="@style/TextAppearance.ContextMenuTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/add_gpx_waypoint_bottom_sheet_title"/>
+
+        <TextView
+            android:id="@+id/description"
+            style="@style/TextAppearance.ContextMenuSubtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="8dp"
+            tools:text="Lat: 50.45375\nLon: 30.48693"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="12dp">
+
+            <Button
+                android:id="@+id/create_button"
+                style="@style/DialogActionButton"
+                android:layout_marginRight="8dp"
+                android:text="@string/shared_string_create"/>
+
+            <Button
+                android:id="@+id/cancel_button"
+                style="@style/DialogCancelButton"
+                android:text="@string/shared_string_cancel"/>
+        </LinearLayout>
+
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 52dbd1cf8e..f82edd56e0 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -223,6 +223,9 @@
         <include layout="@layout/move_marker_bottom_sheet"
                  tools:visibility="gone"/>
 
+        <include layout="@layout/add_gpx_waypoint_bottom_sheet"
+                 tools:visibility="gone"/>
+
         <FrameLayout
             android:id="@+id/bottomFragmentContainer"
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 386b4aef71..8313ae2912 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2658,4 +2658,6 @@
     <string name="shared_string_action_name">Action name</string>
     <string name="mappilary_no_internet_desc">You need internet to view photos from Mapillary</string>
     <string name="retry">Retry</string>
+    <string name="add_gpx_waypoint_bottom_sheet_title">Add gpx waypoint</string>
+    <string name="shared_string_create">Create</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index 94774cd6f5..deca20637b 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -102,18 +102,15 @@ public class GPXUtilities {
 		public float speed;
 	}
 
-	public static class CreatedGpxWaypoint {
-		private WptPt point;
+	public static class NewGpxWaypoint {
+		private GPXFile gpx;
 
-		public CreatedGpxWaypoint() {
+		public NewGpxWaypoint(GPXFile gpx) {
+			this.gpx = gpx;
 		}
 
-		public WptPt getPoint() {
-			return point;
-		}
-
-		public void setPoint(WptPt point) {
-			this.point = point;
+		public GPXFile getGpx() {
+			return gpx;
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 19a9674209..1898c46b29 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -57,7 +57,8 @@ import net.osmand.plus.AppInitializer;
 import net.osmand.plus.AppInitializer.AppInitializeListener;
 import net.osmand.plus.AppInitializer.InitEvents;
 import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
@@ -913,10 +914,10 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 				} else if (toShow instanceof QuadRect) {
 					QuadRect qr = (QuadRect) toShow;
 					mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
-				} else if (toShow instanceof WptPt) {
-					WptPt createdGpxWaypoint = (WptPt) toShow;
-				}
-				else {
+				} else if (toShow instanceof NewGpxWaypoint) {
+					NewGpxWaypoint newGpxWaypoint = (NewGpxWaypoint) toShow;
+					getMapLayers().getContextMenuLayer().enterAddGpxWaypointMode(newGpxWaypoint);
+				} else {
 					mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);
 				}
 				if (editToShow) {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index 143234cb1b..9a2fcecd5b 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -30,6 +30,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
+import net.osmand.Location;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
@@ -38,7 +39,7 @@ import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GPXUtilities.GPXFile;
-import net.osmand.plus.GPXUtilities.CreatedGpxWaypoint;
+import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
@@ -93,13 +94,11 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 	private ActionMode actionMode;
 	private SearchView searchView;
 	private FloatingActionButton fab;
-	private CreatedGpxWaypoint createdGpxWaypoint;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		this.app = getMyApplication();
-		this.createdGpxWaypoint = new CreatedGpxWaypoint();
 	}
 
 	@Override
@@ -123,14 +122,13 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 			public void onClick(View view) {
 				final OsmandSettings settings = app.getSettings();
 				GPXFile gpx = getGpx();
-				WptPt pointToShow = gpx != null ? gpx.findPointToShow() : null;
-				if (pointToShow != null) {
-					LatLon location = new LatLon(pointToShow.lat, pointToShow.lon);
+				Location location = app.getLocationProvider().getLastKnownLocation();
+				if (location != null) {
 					settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
 							settings.getLastKnownMapZoom(),
 							new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.context_menu_item_add_waypoint)),
 							false,
-							createdGpxWaypoint);
+							new NewGpxWaypoint(gpx));
 
 					MapActivity.launchMapActivityMoveToTop(getActivity());
 				}
diff --git a/OsmAnd/src/net/osmand/plus/views/AddWaypointBottomSheetHelper.java b/OsmAnd/src/net/osmand/plus/views/AddWaypointBottomSheetHelper.java
new file mode 100644
index 0000000000..27eddc58ac
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/views/AddWaypointBottomSheetHelper.java
@@ -0,0 +1,102 @@
+package net.osmand.plus.views;
+
+import android.content.Context;
+import android.graphics.PointF;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
+import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.GPXFile;
+import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
+import net.osmand.plus.IconsCache;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.mapcontextmenu.MapContextMenu;
+
+public class AddWaypointBottomSheetHelper {
+	private final View view;
+	private final TextView title;
+	private String titleText = "";
+	private final TextView description;
+	private final Context context;
+	private final MapContextMenu contextMenu;
+	private final ContextMenuLayer contextMenuLayer;
+	private boolean applyingPositionMode;
+	private NewGpxWaypoint newGpxWaypoint;
+
+	public AddWaypointBottomSheetHelper(final MapActivity activity, ContextMenuLayer ctxMenuLayer) {
+		this.contextMenuLayer = ctxMenuLayer;
+		view = activity.findViewById(R.id.add_gpx_waypoint_bottom_sheet);
+		title = (TextView) view.findViewById(R.id.add_gpx_waypoint_bottom_sheet_title);
+		description = (TextView) view.findViewById(R.id.description);
+		context = activity;
+		contextMenu = activity.getContextMenu();
+		ImageView icon = (ImageView) view.findViewById(R.id.icon);
+
+		IconsCache iconsCache = activity.getMyApplication().getIconsCache();
+		icon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_photo_dark, R.color.marker_green));
+		view.findViewById(R.id.create_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				contextMenuLayer.createGpxWaypoint();
+				GPXFile gpx = newGpxWaypoint.getGpx();
+				LatLon latLon = contextMenu.getLatLon();
+				activity.getContextMenu().getWptPtPointEditor().add(gpx, latLon, titleText);
+			}
+		});
+		view.findViewById(R.id.cancel_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				hide();
+				contextMenuLayer.cancelAddGpxWaypoint();
+			}
+		});
+	}
+
+	public void onDraw(RotatedTileBox rt) {
+		PointF point = contextMenuLayer.getMovableCenterPoint(rt);
+		double lat = rt.getLatFromPixel(point.x, point.y);
+		double lon = rt.getLonFromPixel(point.x, point.y);
+		description.setText(PointDescription.getLocationName(context, lat, lon, true));
+	}
+
+	public void setTitle(String title) {
+		titleText = title;
+		this.title.setText(titleText);
+	}
+
+	public boolean isVisible() {
+		return view.getVisibility() == View.VISIBLE;
+	}
+
+	public void show(Drawable drawable, NewGpxWaypoint newGpxWaypoint) {
+		this.newGpxWaypoint = newGpxWaypoint;
+		exitApplyPositionMode();
+		view.setVisibility(View.VISIBLE);
+		((ImageView) view.findViewById(R.id.icon)).setImageDrawable(drawable);
+	}
+
+	public void hide() {
+		exitApplyPositionMode();
+		view.setVisibility(View.GONE);
+	}
+
+	public void enterApplyPositionMode() {
+		if (!applyingPositionMode) {
+			applyingPositionMode = true;
+			view.findViewById(R.id.create_button).setEnabled(false);
+		}
+	}
+
+	public void exitApplyPositionMode() {
+		if (applyingPositionMode) {
+			applyingPositionMode = false;
+			view.findViewById(R.id.create_button).setEnabled(true);
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index d95ac0bf2d..eb033497c0 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -35,6 +35,7 @@ import net.osmand.osm.PoiFilter;
 import net.osmand.osm.PoiType;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
+import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
@@ -75,12 +76,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	private GestureDetector movementListener;
 
 	private final MoveMarkerBottomSheetHelper mMoveMarkerBottomSheetHelper;
+	private final AddWaypointBottomSheetHelper mAddWaypointBottomSheetHelper;
 	private boolean mInChangeMarkerPositionMode;
 	private IContextMenuProvider selectedObjectContextMenuProvider;
 	private boolean cancelApplyingNewMarkerPosition;
 	private LatLon applyingMarkerLatLon;
 	private boolean wasCollapseButtonVisible;
 	private boolean mInGpxDetailsMode;
+	private boolean mInAddGpxWaypointMode;
 
 	private List<String> publicTransportTypes;
 	private Object selectedObject;
@@ -91,6 +94,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		multiSelectionMenu = menu.getMultiSelectionMenu();
 		movementListener = new GestureDetector(activity, new MenuLayerOnGestureListener());
 		mMoveMarkerBottomSheetHelper = new MoveMarkerBottomSheetHelper(activity, this);
+		mAddWaypointBottomSheetHelper = new AddWaypointBottomSheetHelper(activity, this);
 	}
 
 	@Override
@@ -194,7 +198,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 			canvas.drawBitmap(pressedBitmap, x - pressedBitmap.getWidth() / 2, y - pressedBitmap.getHeight() / 2, paint);
 		}
 
-		if (mapQuickActionLayer!= null && mapQuickActionLayer.isInChangeMarkerPositionMode())
+		if (mapQuickActionLayer!= null && mapQuickActionLayer.isInMovingMarkerMode())
 			return;
 
 		if (mInChangeMarkerPositionMode) {
@@ -203,6 +207,10 @@ public class ContextMenuLayer extends OsmandMapLayer {
 				contextMarker.draw(canvas);
 			}
 			mMoveMarkerBottomSheetHelper.onDraw(box);
+		} else if (mInAddGpxWaypointMode) {
+			canvas.translate(box.getPixWidth() / 2 - contextMarker.getWidth() / 2, box.getPixHeight() / 2 - contextMarker.getHeight());
+			contextMarker.draw(canvas);
+			mAddWaypointBottomSheetHelper.onDraw(box);
 		} else if (menu.isActive()) {
 			LatLon latLon = menu.getLatLon();
 			int x = (int) box.getPixXFromLatLon(latLon.getLatitude(), latLon.getLongitude());
@@ -281,7 +289,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	}
 
 	public Object getMoveableObject() {
-		return mInChangeMarkerPositionMode ? menu.getObject() : null;
+		return mInChangeMarkerPositionMode || mInAddGpxWaypointMode ? menu.getObject() : null;
 	}
 
 	public boolean isInChangeMarkerPositionMode() {
@@ -292,6 +300,10 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		return mInGpxDetailsMode;
 	}
 
+	public boolean isInAddGpxWaypointMode() {
+		return mInAddGpxWaypointMode;
+	}
+
 	public boolean isObjectMoveable(Object o) {
 		if (o == null) {
 			return true;
@@ -313,7 +325,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 					l.applyNewObjectPosition(o, position, callback);
 				}
 			}
-		} else if (mInChangeMarkerPositionMode) {
+		} else if (mInChangeMarkerPositionMode || mInAddGpxWaypointMode) {
 			callback.onApplyMovedObject(true, null);
 		}
 	}
@@ -357,6 +369,45 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		});
 	}
 
+	public void createGpxWaypoint() {
+		if (!mInAddGpxWaypointMode) {
+			throw new IllegalStateException("Not in add gpx waypoint mode");
+		}
+
+		RotatedTileBox tileBox = activity.getMapView().getCurrentRotatedTileBox();
+		PointF newMarkerPosition = getMovableCenterPoint(tileBox);
+		final LatLon ll = tileBox.getLatLonFromPixel(newMarkerPosition.x, newMarkerPosition.y);
+		applyingMarkerLatLon = ll;
+
+		Object obj = getMoveableObject();
+		cancelApplyingNewMarkerPosition = false;
+		mAddWaypointBottomSheetHelper.enterApplyPositionMode();
+		applyMovedObject(obj, ll, new ApplyMovedObjectCallback() {
+			@Override
+			public void onApplyMovedObject(boolean success, @Nullable Object newObject) {
+				mAddWaypointBottomSheetHelper.exitApplyPositionMode();
+				if (success && !cancelApplyingNewMarkerPosition) {
+					mAddWaypointBottomSheetHelper.hide();
+					quitAddGpxWaipoint();
+
+					PointDescription pointDescription = null;
+					if (selectedObjectContextMenuProvider != null) {
+						pointDescription = selectedObjectContextMenuProvider.getObjectName(newObject);
+					}
+					menu.show(ll, pointDescription, newObject);
+					view.refreshMap();
+				}
+				selectedObjectContextMenuProvider = null;
+				applyingMarkerLatLon = null;
+			}
+
+			@Override
+			public boolean isCancelled() {
+				return cancelApplyingNewMarkerPosition;
+			}
+		});
+	}
+
 	public void enterGpxDetailsMode() {
 		menu.updateMapCenter(null);
 		menu.hide();
@@ -398,6 +449,39 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		}
 	}
 
+	private void quitAddGpxWaipoint() {
+		mInAddGpxWaypointMode = false;
+		mark(View.VISIBLE, R.id.map_ruler_layout,
+				R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
+
+		View collapseButton = activity.findViewById(R.id.map_collapse_button);
+		if (collapseButton != null && wasCollapseButtonVisible) {
+			collapseButton.setVisibility(View.VISIBLE);
+		}
+	}
+
+	public void enterAddGpxWaypointMode(NewGpxWaypoint newGpxWaypoint) {
+		menu.updateMapCenter(null);
+		menu.hide();
+
+		activity.disableDrawer();
+
+		mInAddGpxWaypointMode = true;
+		mAddWaypointBottomSheetHelper.show(menu.getLeftIcon(), newGpxWaypoint);
+		mark(View.INVISIBLE, R.id.map_ruler_layout,
+				R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
+
+		View collapseButton = activity.findViewById(R.id.map_collapse_button);
+		if (collapseButton != null && collapseButton.getVisibility() == View.VISIBLE) {
+			wasCollapseButtonVisible = true;
+			collapseButton.setVisibility(View.INVISIBLE);
+		} else {
+			wasCollapseButtonVisible = false;
+		}
+
+		view.refreshMap();
+	}
+
 	private void enterMovingMode(RotatedTileBox tileBox) {
 		Vibrator vibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE);
 		vibrator.vibrate(VIBRATE_SHORT);
@@ -445,6 +529,13 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		applyingMarkerLatLon = null;
 	}
 
+	public void cancelAddGpxWaypoint() {
+		cancelApplyingNewMarkerPosition = true;
+		quitAddGpxWaipoint();
+		activity.getContextMenu().show();
+		applyingMarkerLatLon = null;
+	}
+
 	public boolean showContextMenu(double latitude, double longitude, boolean showUnknownLocation) {
 		RotatedTileBox cp = activity.getMapView().getCurrentRotatedTileBox();
 		float x = cp.getPixXFromLatLon(latitude, longitude);
@@ -557,7 +648,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
 			if (latLon == null) {
 				latLon = getLatLon(point, tileBox);
 			}
-			showContextMenu(latLon, pointDescription, selectedObj, provider);
+			if (mInAddGpxWaypointMode) {
+				if (pointDescription != null) {
+					mAddWaypointBottomSheetHelper.setTitle(pointDescription.getName());
+				}
+				view.getAnimatedDraggingThread().startMoving(latLon.getLatitude(), latLon.getLongitude(), view.getZoom(), true);
+			} else {
+				showContextMenu(latLon, pointDescription, selectedObj, provider);
+			}
 			return true;
 
 		} else if (selectedObjects.size() > 1) {
@@ -599,7 +697,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	}
 
 	public boolean disableLongPressOnMap() {
-		if (mInChangeMarkerPositionMode || mInGpxDetailsMode) {
+		if (mInChangeMarkerPositionMode || mInGpxDetailsMode || mInAddGpxWaypointMode) {
 			return true;
 		}
 		boolean res = false;
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index f9d5b323cb..bc05ca3953 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -712,7 +712,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				((app.accessibilityEnabled() || (System.currentTimeMillis() - touchEvent < TIMEOUT_TO_SHOW_BUTTONS)) && routeFollowingMode);
 		updateMyLocation(rh, routeDialogOpened || trackDialogOpened);
 		boolean showButtons = (showRouteCalculationControls || !routeFollowingMode)
-				&& !isInChangeMarkerPositionMode() && !isInGpxDetailsMode();
+				&& !isInMovingMarkerMode() && !isInGpxDetailsMode();
 		//routePlanningBtn.setIconResId(routeFollowingMode ? R.drawable.ic_action_gabout_dark : R.drawable.map_directions);
 		if (rh.isFollowingMode()) {
 			routePlanningBtn.setIconResId(R.drawable.map_start_navigation);
@@ -1118,9 +1118,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 		this.mapQuickActionLayer = mapQuickActionLayer;
 	}
 
-	private boolean isInChangeMarkerPositionMode(){
-		return mapQuickActionLayer == null ? contextMenuLayer.isInChangeMarkerPositionMode() :
-				mapQuickActionLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInChangeMarkerPositionMode();
+	private boolean isInMovingMarkerMode(){
+		return mapQuickActionLayer == null ? contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxWaypointMode():
+				mapQuickActionLayer.isInMovingMarkerMode() || contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxWaypointMode();
 	}
 
 	private boolean isInGpxDetailsMode() {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
index 5a6b47ed65..3170b2742a 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
@@ -52,7 +52,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
     private boolean           wasCollapseButtonVisible;
     private int               previousMapPosition;
 
-    private boolean inChangeMarkerPositionMode;
+    private boolean inMovingMarkerMode;
     private boolean isLayerOn;
 
 	private boolean nightMode;
@@ -233,7 +233,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
         double lon = rb.getLonFromPixel(tileBox.getCenterPixelX(), tileBox.getCenterPixelY());
         view.setLatLon(lat, lon);
 
-        inChangeMarkerPositionMode = true;
+        inMovingMarkerMode = true;
         mark(View.INVISIBLE, R.id.map_ruler_layout,
                 R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
 
@@ -268,7 +268,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
         }
         view.setMapPosition(previousMapPosition);
 
-        inChangeMarkerPositionMode = false;
+        inMovingMarkerMode = false;
         mark(View.VISIBLE, R.id.map_ruler_layout,
                 R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
 
@@ -290,7 +290,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
 
     @Override
     public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-        if (isInChangeMarkerPositionMode() && !pressedQuickActionWidget(point.x, point.y)) {
+        if (isInMovingMarkerMode() && !pressedQuickActionWidget(point.x, point.y)) {
             setLayerState(false);
             return true;
         } else
@@ -304,7 +304,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
     @Override
     public void onDraw(Canvas canvas, RotatedTileBox box, DrawSettings settings) {
 		boolean nightMode = settings != null && settings.isNightMode();
-        if (isInChangeMarkerPositionMode()) {
+        if (isInMovingMarkerMode()) {
             canvas.translate(box.getCenterPixelX() - contextMarker.getWidth() / 2, box.getCenterPixelY() - contextMarker.getHeight());
             contextMarker.draw(canvas);
         }
@@ -352,8 +352,8 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
         return new PointF(tb.getPixWidth() / 2, tb.getPixHeight() / 2);
     }
 
-    public boolean isInChangeMarkerPositionMode() {
-        return isLayerOn && inChangeMarkerPositionMode;
+    public boolean isInMovingMarkerMode() {
+        return isLayerOn && inMovingMarkerMode;
     }
 
     public boolean isLayerOn() {