Merge pull request #4278 from osmandapp/fab_waypoints

Fix adding route point

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/RtePtEditorFragment.java

@@ -1,5 +1,6 @@
 package net.osmand.plus.mapcontextmenu.editors;
 
+import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 
@@ -40,4 +41,10 @@ public class RtePtEditorFragment extends WptPtEditorFragment {
 				.add(R.id.fragmentContainer, fragment, editor.getFragmentTag())
 				.addToBackStack(null).commit();
 	}
+
+	@Override
+	protected void addWpt(GPXUtilities.GPXFile gpx, String description, String name, String category, int color) {
+		wpt = gpx.addRtePt(wpt.getLatitude(), wpt.getLongitude(),
+				System.currentTimeMillis(), description, name, category, color);
+	}
 }

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java

@@ -29,7 +29,7 @@ import java.io.File;
 public class WptPtEditorFragment extends PointEditorFragment {
 
 	protected WptPtEditor editor;
-	private WptPt wpt;
+	protected WptPt wpt;
 	private SavingTrackHelper savingTrackHelper;
 	private GpxSelectionHelper selectedGpxHelper;
 
@@ -181,13 +181,17 @@ public class WptPtEditorFragment extends PointEditorFragment {
 					selectedGpxHelper.setGpxFileToDisplay(gpx);
 				}
 			} else {
-				wpt = gpx.addWptPt(wpt.getLatitude(), wpt.getLongitude(),
+				addWpt(gpx, description, name, category, color);
-						System.currentTimeMillis(), description, name, category, color);
 				new SaveGpxAsyncTask(getMyApplication(), gpx, editor.isGpxSelected()).execute();
 			}
 		}
 	}
 
+	protected void addWpt(GPXFile gpx, String description, String name, String category, int color) {
+		wpt = gpx.addWptPt(wpt.getLatitude(), wpt.getLongitude(),
+				System.currentTimeMillis(), description, name, category, color);
+	}
+
 	private void doUpdateWpt(String name, String category, String description) {
 		GPXFile gpx = editor.getGpxFile();
 		if (gpx != null) {