From 9c9e4c5e212b6e773163abe3c1bb66c846d5fd95 Mon Sep 17 00:00:00 2001
From: Sergiy Kozyr <s.trump@gmail.com>
Date: Tue, 30 Jul 2024 21:39:43 +0300
Subject: [PATCH] Implemented
 app.organicmaps.Framework.nativeDeactivateMapSelectionCircle

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>
---
 .../app/src/main/cpp/app/organicmaps/Framework.cpp    | 11 +++++++++++
 .../app/src/main/cpp/app/organicmaps/Framework.hpp    |  1 +
 .../app/src/main/java/app/organicmaps/Framework.java  |  1 +
 map/framework.cpp                                     |  6 ++++++
 map/framework.hpp                                     |  1 +
 5 files changed, 20 insertions(+)

diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.cpp b/android/app/src/main/cpp/app/organicmaps/Framework.cpp
index 8f377c6b24..998c9dfc1e 100644
--- a/android/app/src/main/cpp/app/organicmaps/Framework.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/Framework.cpp
@@ -597,6 +597,11 @@ void Framework::DeactivatePopup()
   m_work.DeactivateMapSelection();
 }
 
+void Framework::DeactivateMapSelectionCircle()
+{
+  m_work.DeactivateMapSelectionCircle();
+}
+
 /*
 string Framework::GetOutdatedCountriesString()
 {
@@ -1451,6 +1456,12 @@ Java_app_organicmaps_Framework_nativeDeactivatePopup(JNIEnv * env, jclass)
   return g_framework->DeactivatePopup();
 }
 
+JNIEXPORT void JNICALL
+Java_app_organicmaps_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env, jclass)
+{
+  return g_framework->DeactivateMapSelectionCircle();
+}
+
 JNIEXPORT void JNICALL
 Java_app_organicmaps_Framework_nativeSetMapStyle(JNIEnv * env, jclass, jint mapStyle)
 {
diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.hpp b/android/app/src/main/cpp/app/organicmaps/Framework.hpp
index b88fabac5f..fd40fea44c 100644
--- a/android/app/src/main/cpp/app/organicmaps/Framework.hpp
+++ b/android/app/src/main/cpp/app/organicmaps/Framework.hpp
@@ -168,6 +168,7 @@ namespace android
     void ExecuteMapApiRequest();
 
     void DeactivatePopup();
+    void DeactivateMapSelectionCircle();
 
 //    std::string GetOutdatedCountriesString();
 
diff --git a/android/app/src/main/java/app/organicmaps/Framework.java b/android/app/src/main/java/app/organicmaps/Framework.java
index 146bb92964..2a076225c3 100644
--- a/android/app/src/main/java/app/organicmaps/Framework.java
+++ b/android/app/src/main/java/app/organicmaps/Framework.java
@@ -244,6 +244,7 @@ public class Framework
   public static native @Nullable String nativeGetParsedBackUrl();
 
   public static native void nativeDeactivatePopup();
+  public static native void nativeDeactivateMapSelectionCircle();
 
   public static native String nativeGetDataFileExt();
 
diff --git a/map/framework.cpp b/map/framework.cpp
index 41e6efb36b..2d6e1abf70 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1923,6 +1923,12 @@ void Framework::DeactivateMapSelection()
   }
 }
 
+void Framework::DeactivateMapSelectionCircle()
+{
+    if (m_drapeEngine != nullptr)
+        m_drapeEngine->DeselectObject();
+}
+
 void Framework::SwitchFullScreen()
 {
   if (m_onSwitchFullScreen)
diff --git a/map/framework.hpp b/map/framework.hpp
index 62ff4da7f0..88fe446de2 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -309,6 +309,7 @@ private:
 
 public:
   void DeactivateMapSelection();
+  void DeactivateMapSelectionCircle();
   void SwitchFullScreen();
   /// Used to "refresh" UI in some cases (e.g. feature editing).
   void UpdatePlacePageInfoForCurrentSelection(