From 81cca5fc4557af569aa2e3f907b65b9487b04e78 Mon Sep 17 00:00:00 2001
From: aceman444 <aceman444@users.noreply.github.com>
Date: Tue, 25 Apr 2017 23:13:22 +0200
Subject: [PATCH 1/2] OSM bugs -> OSM Notes in strings.xml

Converts last remaining occurrences of 'OSM bugs' name. They are called Notes for some time now.
---
 OsmAnd/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index fc31d85224..80b9db56f4 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -829,7 +829,7 @@
     <string name="shared_string_accessibility">Accessibility</string>
     <string name="osmand_accessibility_description">This plugin makes the device\'s accessibility features available directly in OsmAnd. It facilitates e.g. adjusting the speech rate for TTS voices, configuring directional-pad screen navigation, using a trackball for zoom control, or using text-to-speech feedback, like for auto announcing your position.</string>
     <string name="osm_settings">OSM editing</string>
-    <string name="osm_editing_plugin_description">Via this plugin OsmAnd can be used to make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM bugs, and contributing recorded GPX files. OSM is a community driven, global public domain mapping project. For details please refer to https://openstreetmap.org. Active participation is appreciated, and contributions can be made directly from OsmAnd, if you specify your personal OSM credentials in the app.</string>
+    <string name="osm_editing_plugin_description">Via this plugin OsmAnd can be used to make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM Notes, and contributing recorded GPX files. OSM is a community driven, global public domain mapping project. For details please refer to https://openstreetmap.org. Active participation is appreciated, and contributions can be made directly from OsmAnd, if you specify your personal OSM credentials in the app.</string>
     <string name="osmand_development_plugin_description">This plugin displays settings for development and debugging features like to test or simulate routing, the screen rendering performance, or voice prompting. These settings are intended for developers and are not needed for the general user.</string>
     <string name="debugging_and_development">OsmAnd development</string>
     <string name="rename_failed">Rename failed.</string>
@@ -2537,7 +2537,7 @@
     <string name="quick_action_take_audio_note">Take audio note</string>
     <string name="quick_action_take_video_note">Take video note</string>
     <string name="quick_action_take_photo_note">Take photo note</string>
-    <string name="quick_action_add_osm_bug">Add OSM bug</string>
+    <string name="quick_action_add_osm_bug">Add OSM Note</string>
     <string name="quick_action_navigation_voice">Voice on/off</string>
     <string name="quick_action_navigation_voice_off">Voice is off</string>
     <string name="quick_action_navigation_voice_on">Voice is on</string>
@@ -2556,7 +2556,7 @@
     <string name="quick_action_take_audio_note_descr">Tapping the action button will add an audio note at the screen center location.</string>
     <string name="quick_action_take_video_note_descr">Tapping the action button will add a video note at the screen center location.</string>
     <string name="quick_action_take_photo_note_descr">Tapping the action button will add a photo note at the screen center location.</string>
-    <string name="quick_action_add_osm_bug_descr">Tapping the action button will add an OSM bug note at the screen center location.</string>
+    <string name="quick_action_add_osm_bug_descr">Tapping the action button will add an OSM note at the screen center location.</string>
     <string name="quick_action_add_poi_descr">Tapping the action button will add a POI at the screen center location.</string>
     <string name="quick_action_navigation_voice_descr">Tapping the action button will disable or enable voice guidance during navigation.</string>
     <string name="quick_action_add_parking_descr">Tapping the action button will add a parking place at the screen center location.</string>

From cce02cc6c188c4097bfc9e86469dcce1ae7517b6 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 26 Apr 2017 10:46:50 +0300
Subject: [PATCH 2/2] Fix #3671

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

diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
index 7600ea5b58..296a8de611 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -524,7 +524,10 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
 			MapMarkersHelper markersHelper = map.getMyApplication().getMapMarkersHelper();
 			MapMarker marker = (MapMarker) o;
 
-			marker.getOriginalPointDescription().setName(PointDescription.getSearchAddressStr(map));
+			PointDescription originalDescription = marker.getOriginalPointDescription();
+			if (originalDescription.isLocation()) {
+				originalDescription.setName(PointDescription.getSearchAddressStr(map));
+			}
 			markersHelper.moveMapMarker(marker, position);
 			int index = markersHelper.getMapMarkers().indexOf(marker);
 			if (index != -1) {