diff --git a/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl b/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl index b0cd6be027..2038a68fbd 100644 --- a/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl +++ b/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl @@ -90,6 +90,7 @@ import net.osmand.aidl.contextmenu.ContextMenuButtonsParams; import net.osmand.aidl.contextmenu.UpdateContextMenuButtonsParams; import net.osmand.aidl.contextmenu.RemoveContextMenuButtonsParams; +import net.osmand.aidl.mapmarker.RemoveMapMarkersParams; // NOTE: Add new methods at the end of file!!! @@ -829,5 +830,5 @@ interface IOsmAndAidlInterface { * Removes all active map markers (marks them as passed and moves to history) * Empty class of params */ - boolean removeAllActiveMapMarkers(in RemoveMapMarkersParams); + boolean removeAllActiveMapMarkers(in RemoveMapMarkersParams params); } diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java index 331566f132..68e5a9959f 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java @@ -1057,7 +1057,7 @@ public class OsmandAidlApi { } } - boolean removeAllMapMarkers() { + boolean removeAllActiveMapMarkers() { boolean refreshNeeded = false; MapMarkersHelper markersHelper = app.getMapMarkersHelper(); List mapMarkers = markersHelper.getMapMarkers(); diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java index 4cccbbbbca..bec6725bdc 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java @@ -49,6 +49,7 @@ import net.osmand.aidl.maplayer.point.ShowMapPointParams; import net.osmand.aidl.maplayer.point.UpdateMapPointParams; import net.osmand.aidl.mapmarker.AddMapMarkerParams; import net.osmand.aidl.mapmarker.RemoveMapMarkerParams; +import net.osmand.aidl.mapmarker.RemoveMapMarkersParams; import net.osmand.aidl.mapmarker.UpdateMapMarkerParams; import net.osmand.aidl.mapwidget.AddMapWidgetParams; import net.osmand.aidl.mapwidget.RemoveMapWidgetParams; @@ -75,7 +76,6 @@ import net.osmand.aidl.search.SearchParams; import net.osmand.aidl.search.SearchResult; import net.osmand.aidl.tiles.ASqliteDbFile; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.routing.VoiceRouter; import net.osmand.util.Algorithms; import org.apache.commons.logging.Log; @@ -1165,10 +1165,10 @@ public class OsmandAidlService extends Service implements AidlCallbackListener { } @Override - public boolean removeAllMapMarkers() { + public boolean removeAllActiveMapMarkers(RemoveMapMarkersParams params) { try { - OsmandAidlApi api = getApi("removeAllMapMarkers"); - return api != null && api.removeAllMapMarkers(); + OsmandAidlApi api = getApi("removeAllActiveMapMarkers"); + return api != null && api.removeAllActiveMapMarkers(); } catch (Exception e) { handleException(e); return false; diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl index e5b5b126ad..ee5f4936d7 100644 --- a/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl +++ b/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl @@ -1,3 +1,3 @@ package net.osmand.aidl.mapmarker; -parcelable RemoveMapMarkerParams; \ No newline at end of file +parcelable RemoveMapMarkersParams; \ No newline at end of file