Added added basic features to OSM Maps

app/build.gradle

@@ -158,6 +158,9 @@ dependencies {
     kaptAndroidTest "androidx.databinding:databinding-compiler:8.0.2"
 
     implementation("io.github.coordinates2country:coordinates2country-android:1.3") {  exclude group: 'com.google.android', module: 'android' }
+
+    //OSMDroid
+    implementation ("org.osmdroid:osmdroid-android:$OSMDROID_VERSION")
 }
 
 task disableAnimations(type: Exec) {

app/src/main/java/fr/free/nrw/commons/nearby/RotationGestureOverlay.java

@@ -0,0 +1,129 @@
+package fr.free.nrw.commons.nearby;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import org.osmdroid.views.MapView;
+import org.osmdroid.views.overlay.IOverlayMenuProvider;
+import org.osmdroid.views.overlay.Overlay;
+import org.osmdroid.views.overlay.gestures.RotationGestureDetector;
+
+public class RotationGestureOverlay extends Overlay implements
+    RotationGestureDetector.RotationListener, IOverlayMenuProvider {
+    private final static boolean SHOW_ROTATE_MENU_ITEMS = false;
+
+    private final static int MENU_ENABLED = getSafeMenuId();
+    private final static int MENU_ROTATE_CCW = getSafeMenuId();
+    private final static int MENU_ROTATE_CW = getSafeMenuId();
+
+    private final RotationGestureDetector mRotationDetector;
+    private MapView mMapView;
+    private boolean mOptionsMenuEnabled = true;
+
+    private ImageView mCompass;
+    private LinearLayout mCompassLL;
+
+    /**
+     * use {@link #RotationGestureOverlay(MapView,ImageView,LinearLayout)} instead.
+     */
+    @Deprecated
+    public RotationGestureOverlay(Context context, MapView mapView, ImageView compass, LinearLayout compassLL) {
+        this(mapView,compass,compassLL);
+    }
+
+    public RotationGestureOverlay(MapView mapView,ImageView compass,LinearLayout compassLL) {
+        super();
+        mMapView = mapView;
+        mCompass = compass;
+        mCompassLL = compassLL;
+        mRotationDetector = new RotationGestureDetector(this);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event, MapView mapView) {
+        mRotationDetector.onTouch(event);
+        return super.onTouchEvent(event, mapView);
+    }
+
+    long timeLastSet = 0L;
+    final long deltaTime = 25L;
+    float currentAngle = 0f;
+
+    @Override
+    public void onRotate(float deltaAngle) {
+        currentAngle += deltaAngle;
+        if (System.currentTimeMillis() - deltaTime > timeLastSet) {
+            timeLastSet = System.currentTimeMillis();
+            mMapView.setMapOrientation(mMapView.getMapOrientation() + currentAngle);
+            mCompass.setRotation(mMapView.getMapOrientation());
+            mCompassLL.setVisibility(View.VISIBLE);
+        }
+    }
+
+    @Override
+    public void onDetach(MapView map) {
+        mMapView = null;
+    }
+
+    @Override
+    public boolean isOptionsMenuEnabled() {
+        return mOptionsMenuEnabled;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu pMenu, int pMenuIdOffset, MapView pMapView) {
+        pMenu.add(0, MENU_ENABLED + pMenuIdOffset, Menu.NONE, "Enable rotation").setIcon(
+            android.R.drawable.ic_menu_info_details);
+        if (SHOW_ROTATE_MENU_ITEMS) {
+            pMenu.add(0, MENU_ROTATE_CCW + pMenuIdOffset, Menu.NONE,
+                "Rotate maps counter clockwise").setIcon(android.R.drawable.ic_menu_rotate);
+            pMenu.add(0, MENU_ROTATE_CW + pMenuIdOffset, Menu.NONE, "Rotate maps clockwise")
+                .setIcon(android.R.drawable.ic_menu_rotate);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem pItem, int pMenuIdOffset, MapView pMapView) {
+        if (pItem.getItemId() == MENU_ENABLED + pMenuIdOffset) {
+            if (this.isEnabled()) {
+                mMapView.setMapOrientation(0);
+                this.setEnabled(false);
+            } else {
+                this.setEnabled(true);
+                return true;
+            }
+        } else if (pItem.getItemId() == MENU_ROTATE_CCW + pMenuIdOffset) {
+            mMapView.setMapOrientation(mMapView.getMapOrientation() - 10);
+        } else if (pItem.getItemId() == MENU_ROTATE_CW + pMenuIdOffset) {
+            mMapView.setMapOrientation(mMapView.getMapOrientation() + 10);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(final Menu pMenu, final int pMenuIdOffset, final MapView pMapView) {
+        pMenu.findItem(MENU_ENABLED + pMenuIdOffset).setTitle(
+            this.isEnabled() ? "Disable rotation" : "Enable rotation");
+        return false;
+    }
+
+    @Override
+    public void setOptionsMenuEnabled(boolean enabled) {
+        mOptionsMenuEnabled = enabled;
+    }
+
+    @Override
+    public void setEnabled(final boolean pEnabled) {
+        mRotationDetector.setEnabled(pEnabled);
+        super.setEnabled(pEnabled);
+    }
+}

app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java

@@ -4,7 +4,6 @@ import static fr.free.nrw.commons.location.LocationServiceManager.LocationChange
 import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
 import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED;
 import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.MAP_UPDATED;
-import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
 import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
 
 import android.Manifest;
@@ -17,9 +16,13 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
 import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
@@ -53,6 +56,7 @@ import androidx.appcompat.widget.AppCompatButton;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -67,12 +71,9 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.jakewharton.rxbinding2.view.RxView;
 import com.jakewharton.rxbinding3.appcompat.RxSearchView;
-import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.Polygon;
-import com.mapbox.mapboxsdk.annotations.PolygonOptions;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
@@ -105,6 +106,7 @@ import fr.free.nrw.commons.nearby.NearbyFilterSearchRecyclerViewAdapter;
 import fr.free.nrw.commons.nearby.NearbyFilterState;
 import fr.free.nrw.commons.nearby.NearbyMarker;
 import fr.free.nrw.commons.nearby.Place;
+import fr.free.nrw.commons.nearby.RotationGestureOverlay;
 import fr.free.nrw.commons.nearby.contract.NearbyParentFragmentContract;
 import fr.free.nrw.commons.nearby.fragments.AdvanceQueryFragment.Callback;
 import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
@@ -134,6 +136,19 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
+import org.osmdroid.tileprovider.MapTileProviderBasic;
+import org.osmdroid.tileprovider.tilesource.ITileSource;
+import org.osmdroid.tileprovider.tilesource.XYTileSource;
+import org.osmdroid.util.GeoPoint;
+import org.osmdroid.util.constants.GeoConstants;
+import org.osmdroid.views.CustomZoomButtonsController;
+import org.osmdroid.views.overlay.ItemizedIconOverlay.OnItemGestureListener;
+import org.osmdroid.views.overlay.ItemizedOverlayWithFocus;
+import org.osmdroid.views.overlay.Overlay;
+import org.osmdroid.views.overlay.OverlayItem;
+import org.osmdroid.views.overlay.ScaleBarOverlay;
+import org.osmdroid.views.overlay.ScaleDiskOverlay;
+import org.osmdroid.views.overlay.TilesOverlay;
 import timber.log.Timber;
 
 
@@ -174,6 +189,12 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     @BindView(R.id.checkbox_tri_states) CheckBoxTriStates checkBoxTriStates;
     @BindView(R.id.map_view)
     MapView mapView;
+    @BindView(R.id.map)
+    org.osmdroid.views.MapView mMapView;
+    @BindView(R.id.compassBg)
+    LinearLayout compassBg;
+    @BindView(R.id.compassArrow)
+    ImageView compassArrow;
     @BindView(R.id.rv_nearby_list)
     RecyclerView rvNearbyList;
     @BindView(R.id.no_results_message) TextView noResultsView;
@@ -357,6 +378,12 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
             rlContainerWLMMonthMessage.setVisibility(View.GONE);
         }
 
+        compassBg.setOnClickListener(v -> {
+            mMapView.getController().animateTo(null,null,600L,0f);
+            compassBg.setVisibility(View.INVISIBLE);
+            compassArrow.setRotation(0);
+        });
+
         cameraMoveListener= () -> presenter.onCameraMove(mapBox.getCameraPosition().target);
         addCheckBoxCallback();
         presenter.attachView(this);
@@ -364,6 +391,56 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
         recenterToUserLocation = false;
         initRvNearbyList();
         initThemePreferences();
+
+        org.osmdroid.config.Configuration.getInstance().load(this.getContext(),PreferenceManager.getDefaultSharedPreferences(this.getContext()));
+        mMapView.setTilesScaledToDpi(true);
+        final GeoPoint intialGeoPoint;
+        if(applicationKvStore.getString("LastLocation")!=null) { // Checking for last searched location
+            String[] locationLatLng = applicationKvStore.getString("LastLocation").split(",");
+            intialGeoPoint = new GeoPoint(Double.valueOf(locationLatLng[0]),Double.valueOf(locationLatLng[1]));
+        }else {
+            intialGeoPoint = new GeoPoint(51.50550,-0.07520);
+        }
+        ScaleBarOverlay scaleBarOverlay = new ScaleBarOverlay(mMapView);
+        scaleBarOverlay.setScaleBarOffset(15,25);
+        Paint barPaint = new Paint();
+        barPaint.setARGB(200,255,250,250);
+        scaleBarOverlay.setBackgroundPaint(barPaint);
+        scaleBarOverlay.enableScaleBar();
+        mMapView.getOverlays().add(scaleBarOverlay);
+        mMapView.getController().setCenter(intialGeoPoint);
+        mMapView.getZoomController().setVisibility(CustomZoomButtonsController.Visibility.NEVER);
+        mMapView.getController().setZoom(ZOOM_LEVEL);
+        MapTileProviderBasic tileProvider = new MapTileProviderBasic(this.getContext());
+        ITileSource tileSource = new XYTileSource(
+            "FietsRegionaal",
+            3,
+            18,
+            256,
+            ".png",
+            new String[]{"http://overlay.openstreetmap.nl/openfietskaart-rcn/"}
+        );
+        tileProvider.setTileSource(tileSource);
+        tileProvider.getTileRequestCompleteHandlers().add(mMapView.getTileRequestCompleteHandler());
+        TilesOverlay tilesOverlay = new TilesOverlay(tileProvider, this.getContext());
+        tilesOverlay.setLoadingBackgroundColor(Color.TRANSPARENT);
+        mMapView.getOverlays().add(tilesOverlay);
+
+        RotationGestureOverlay rotationGestureOverlay = new RotationGestureOverlay(mMapView,compassArrow,compassBg);
+        rotationGestureOverlay.setEnabled(true);
+        mMapView.setMultiTouchControls(true);
+        mMapView.getOverlays().add(rotationGestureOverlay);
+        initViews();
+        presenter.setActionListeners(applicationKvStore);
+        initNearbyFilter();
+        if(nearbyParentFragmentInstanceReadyCallback!=null){
+            nearbyParentFragmentInstanceReadyCallback.onReady();
+        }
+        performMapReadyActions();
+        recenterMarkerToPosition(intialGeoPoint);
+        onResume();
+
+        //TODO Remove MapBox Code
         mapView.onCreate(savedInstanceState);
         mapView.getMapAsync(mapBoxMap -> {
             mapBox =mapBoxMap;
@@ -414,8 +491,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
             });
         });
 
-        tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution)));
+       tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution)));
-        tvAttribution.setMovementMethod(LinkMovementMethod.getInstance());
+       tvAttribution.setMovementMethod(LinkMovementMethod.getInstance());
 
         btnAdvancedOptions.setOnClickListener(v -> {
             searchView.clearFocus();
@@ -493,20 +570,20 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     }
 
     private void performMapReadyActions() {
-        if (((MainActivity)getActivity()).activeFragment == ActiveFragment.NEARBY && isMapBoxReady) {
+        if (((MainActivity)getActivity()).activeFragment == ActiveFragment.NEARBY) {
             if(!applicationKvStore.getBoolean("doNotAskForLocationPermission", false) ||
                 PermissionUtils.hasPermission(getActivity(), new String[]{Manifest.permission.ACCESS_FINE_LOCATION})){
                 checkPermissionsAndPerformAction();
             }else{
                 isPermissionDenied = true;
-                addOnCameraMoveListener();
+                //TODO
+               // addOnCameraMoveListener();
             }
         }
     }
 
     private void locationPermissionGranted() {
         isPermissionDenied = false;
-
         applicationKvStore.putBoolean("doNotAskForLocationPermission", false);
         lastKnownLocation = locationManager.getLastLocation();
         fr.free.nrw.commons.location.LatLng target=lastFocusLocation;
@@ -518,7 +595,11 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
                 .target(LocationUtils.commonsLatLngToMapBoxLatLng(target)) // Sets the new camera position
                 .zoom(ZOOM_LEVEL) // Same zoom level
                 .build();
-            mapBox.moveCamera(CameraUpdateFactory.newCameraPosition(position));
+            //TODO
+            if(target != null){
+            GeoPoint targetP = new GeoPoint(target.getLatitude(),target.getLongitude());
+            recenterMarkerToPosition(targetP);}
+           // mapBox.moveCamera(CameraUpdateFactory.newCameraPosition(position));
         }
         else if(locationManager.isGPSProviderEnabled()||locationManager.isNetworkProviderEnabled()){
             locationManager.requestLocationUpdatesFromProvider(LocationManager.NETWORK_PROVIDER);
@@ -530,13 +611,14 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
         }
         presenter.onMapReady();
         registerUnregisterLocationListener(false);
-        addOnCameraMoveListener();
+        //addOnCameraMoveListener();
     }
 
     @Override
     public void onResume() {
         super.onResume();
         mapView.onResume();
+        mMapView.onResume();
         presenter.attachView(this);
         registerNetworkReceiver();
         if (isResumed() && ((MainActivity)getActivity()).activeFragment == ActiveFragment.NEARBY) {
@@ -606,6 +688,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     public void onPause() {
         super.onPause();
         mapView.onPause();
+        mMapView.onPause();
         compositeDisposable.clear();
         presenter.detachView();
         registerUnregisterLocationListener(true);
@@ -1034,15 +1117,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
 
     @Override
     public void centerMapToPosition(fr.free.nrw.commons.location.LatLng searchLatLng) {
-        final CameraPosition cameraPosition = mapBox.getCameraPosition();
+        if (null != searchLatLng && !(mMapView.getMapCenter().getLatitude() == searchLatLng.getLatitude() && mMapView.getMapCenter().getLongitude() == searchLatLng.getLongitude())){
-        if (null != searchLatLng && !(
+            recenterMarkerToPosition(new GeoPoint(searchLatLng.getLatitude(),searchLatLng.getLongitude()));
-            cameraPosition.target.getLatitude() == searchLatLng.getLatitude()
-                && cameraPosition.target.getLongitude() == searchLatLng.getLongitude())) {
-            final CameraPosition position = new CameraPosition.Builder()
-                .target(LocationUtils.commonsLatLngToMapBoxLatLng(searchLatLng))
-                .zoom(ZOOM_LEVEL) // Same zoom level
-                .build();
-            mapBox.setCameraPosition(position);
         }
     }
 
@@ -1440,30 +1516,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     public void addCurrentLocationMarker(final fr.free.nrw.commons.location.LatLng curLatLng) {
         if (null != curLatLng && !isPermissionDenied && locationManager.isGPSProviderEnabled()) {
             ExecutorUtils.get().submit(() -> {
-                mapView.post(() -> removeCurrentLocationMarker());
                 Timber.d("Adds current location marker");
-
+                recenterMarkerToPosition(new GeoPoint(curLatLng.getLatitude(),curLatLng.getLongitude()));
-                final Icon icon = IconFactory.getInstance(getContext())
-                        .fromResource(R.drawable.current_location_marker);
-
-                final MarkerOptions currentLocationMarkerOptions = new MarkerOptions()
-                        .position(new LatLng(curLatLng.getLatitude(),
-                                curLatLng.getLongitude()));
-                currentLocationMarkerOptions.setIcon(icon); // Set custom icon
-                mapView.post(
-                    () -> currentLocationMarker = mapBox.addMarker(currentLocationMarkerOptions));
-
-                final List<LatLng> circle = UiUtils
-                        .createCircleArray(curLatLng.getLatitude(), curLatLng.getLongitude(),
-                                curLatLng.getAccuracy() * 2, 100);
-
-                final PolygonOptions currentLocationPolygonOptions = new PolygonOptions()
-                        .addAll(circle)
-                        .strokeColor(getResources().getColor(R.color.current_marker_stroke))
-                        .fillColor(getResources().getColor(R.color.current_marker_fill));
-                mapView.post(
-                    () -> currentLocationPolygon = mapBox
-                        .addPolygon(currentLocationPolygonOptions));
             });
         } else {
             Timber.d("not adding current location marker..current location is null");
@@ -1505,12 +1559,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
 
     @Override
     public void updateMapMarkers(final List<NearbyBaseMarker> nearbyBaseMarkers, final Marker selectedMarker) {
-        if(mapBox!=null && isMapBoxReady){
+        if (mMapView != null){
-            mapBox.clear();
+            addNearbyMarkersToMapBoxMap(nearbyBaseMarkers,selectedMarker);
-            addNearbyMarkersToMapBoxMap(nearbyBaseMarkers, selectedMarker);
-            presenter.updateMapMarkersToController(nearbyBaseMarkers);
-            // Re-enable mapbox gestures on custom location markers load
-            mapBox.getUiSettings().setAllGesturesEnabled(true);
         }
     }
 
@@ -1611,39 +1661,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
      * @param curLatLng current location
      */
     public void updateMarker(final boolean isBookmarked, final Place place, @Nullable final fr.free.nrw.commons.location.LatLng curLatLng) {
-        VectorDrawableCompat vectorDrawable = VectorDrawableCompat.create(
+        if(curLatLng != null){
-            getContext().getResources(), getIconFor(place, isBookmarked), getContext().getTheme());
+        addMarkerToMap(place,isBookmarked);
-
-        if(curLatLng != null) {
-            for (NearbyBaseMarker nearbyMarker : allMarkers) {
-                if (nearbyMarker.getMarker().getTitle() != null && nearbyMarker.getMarker().getTitle().equals(place.getName())) {
-
-                    final Bitmap icon = UiUtils.getBitmap(vectorDrawable);
-
-                    final String distance = formatDistanceBetween(curLatLng, place.location);
-                    place.setDistance(distance);
-
-                    final NearbyBaseMarker nearbyBaseMarker = new NearbyBaseMarker();
-                    nearbyBaseMarker.title(place.name);
-                    nearbyBaseMarker.position(
-                        new com.mapbox.mapboxsdk.geometry.LatLng(
-                            place.location.getLatitude(),
-                            place.location.getLongitude()));
-                    nearbyBaseMarker.place(place);
-                    nearbyBaseMarker.icon(IconFactory.getInstance(getContext())
-                        .fromBitmap(icon));
-                    nearbyMarker.setIcon(IconFactory.getInstance(getContext()).fromBitmap(icon));
-                    filteredMarkers.add(nearbyBaseMarker);
-                }
-            }
-        } else {
-            for (Marker marker : mapBox.getMarkers()) {
-                if (marker.getTitle() != null && marker.getTitle().equals(place.getName())) {
-
-                    final Bitmap icon = UiUtils.getBitmap(vectorDrawable);
-                    marker.setIcon(IconFactory.getInstance(getContext()).fromBitmap(icon));
-                }
-            }
         }
     }
 
@@ -1666,6 +1685,75 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
         }
     }
 
+    /**
+     * Adds a marker representing a place to the map with optional bookmark icon.
+     *
+     * @param place        The Place object containing information about the location.
+     * @param isBookMarked A Boolean flag indicating whether the place is bookmarked or not.
+     */
+    private void addMarkerToMap(Place place,Boolean isBookMarked){
+        ArrayList<OverlayItem> items = new ArrayList<>();
+        Drawable icon = ContextCompat.getDrawable(getContext(),getIconFor(place,isBookMarked));
+        GeoPoint point = new GeoPoint(place.location.getLatitude(),place.location.getLongitude());
+        OverlayItem item = new OverlayItem(place.name,null,point);
+        item.setMarker(icon);
+        items.add(item);
+        ItemizedOverlayWithFocus overlay =  new ItemizedOverlayWithFocus(items,
+            new OnItemGestureListener<OverlayItem>() {
+                @Override
+                public boolean onItemSingleTapUp(int index, OverlayItem item) {
+                    passInfoToSheet(place);
+                    hideBottomSheet();
+                    bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+                    return true;
+                }
+
+                @Override
+                public boolean onItemLongPress(int index, OverlayItem item) {
+                    return false;
+                }
+            },getContext());
+
+        overlay.setFocusItemsOnTap(true);
+        mMapView.getOverlays().add(overlay); // Add the overlay to the map
+    }
+
+    /**
+     * Adds multiple markers representing places to the map and handles item gestures.
+     *
+     * @param places The list of Place objects containing information about the locations.
+     */
+    private void addMarkersToMap(ArrayList<Place> places){
+        Boolean isBookMarked = false;
+        ArrayList<OverlayItem> items = new ArrayList<>();
+        clearAllMarkers();
+        for (int i = 0;i<places.size();i++){
+            Drawable icon = ContextCompat.getDrawable(getContext(),getIconFor(places.get(i),isBookMarked));
+            GeoPoint point = new GeoPoint(places.get(i).location.getLatitude(),places.get(i).location.getLongitude());
+            OverlayItem item = new OverlayItem(places.get(i).name,null,point);
+            item.setMarker(icon);
+            items.add(item);
+        }
+        ItemizedOverlayWithFocus overlay =  new ItemizedOverlayWithFocus(items,
+            new OnItemGestureListener<OverlayItem>() {
+                @Override
+                public boolean onItemSingleTapUp(int index, OverlayItem item) {
+                    final Place place = places.get(index);
+                    passInfoToSheet(place);
+                    hideBottomSheet();
+                    bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+                    return true;
+                }
+                @Override
+                public boolean onItemLongPress(int index, OverlayItem item) {
+                    return false;
+                }
+            },getContext());
+
+        overlay.setFocusItemsOnTap(true);
+        mMapView.getOverlays().add(overlay);
+    }
+
     /**
      * Removes all markers except current location marker, an icon has been used
      * but it is transparent more than grey(as the name of the icon might suggest)
@@ -1685,28 +1773,14 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     }
 
     private void addNearbyMarkersToMapBoxMap(final List<NearbyBaseMarker> nearbyBaseMarkers, final Marker selectedMarker) {
-        if (isMapBoxReady && mapBox != null) {
+        if (mMapView != null){
             allMarkers = new ArrayList<>(nearbyBaseMarkers);
-            mapBox.addMarkers(nearbyBaseMarkers);
+            ArrayList<Place> places1 = new ArrayList<>();
-            setMapMarkerActions(selectedMarker);
+            //TODO Work on bookmarks
-            presenter.updateMapMarkersToController(nearbyBaseMarkers);
+            for (int i =0;i<allMarkers.size();i++){
-        }
+                places1.add(allMarkers.get(i).getPlace());
-    }
+            }
-
+            addMarkersToMap(places1);
-    private void setMapMarkerActions(final Marker selectedMarker) {
-        if (mapBox != null) {
-            mapBox.setOnInfoWindowCloseListener(marker -> {
-                if (marker == selectedMarker) {
-                    presenter.markerUnselected();
-                }
-            });
-
-            mapBox.setOnMarkerClickListener(marker -> {
-                if (marker instanceof NearbyMarker) {
-                    presenter.markerSelected(marker);
-                }
-                return false;
-            });
         }
     }
 
@@ -1721,31 +1795,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
             return;
         }
         addCurrentLocationMarker(curLatLng);
-        final CameraPosition position;
+        mMapView.getController().animateTo(new GeoPoint(curLatLng.getLatitude(),curLatLng.getLongitude()));
-
-        if (ViewUtil.isPortrait(getActivity())) {
-            position = new CameraPosition.Builder()
-                    .target(isListBottomSheetExpanded() ?
-                            new LatLng(curLatLng.getLatitude() - CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT,
-                                    curLatLng.getLongitude())
-                            : new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude(), 0)) // Sets the new camera position
-                    .zoom(isListBottomSheetExpanded() ?
-                            ZOOM_LEVEL
-                            : mapBox.getCameraPosition().zoom) // Same zoom level
-                    .build();
-        } else {
-            position = new CameraPosition.Builder()
-                    .target(isListBottomSheetExpanded() ?
-                            new LatLng(curLatLng.getLatitude() - CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE,
-                                    curLatLng.getLongitude())
-                            : new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude(), 0)) // Sets the new camera position
-                    .zoom(isListBottomSheetExpanded() ?
-                            ZOOM_LEVEL
-                            : mapBox.getCameraPosition().zoom) // Same zoom level
-                    .build();
-        }
-
-        mapBox.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
     }
 
     @Override
@@ -1958,6 +2008,73 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
         performMapReadyActions();
     }
 
+    /**
+     * Clears all markers from the map and resets certain map overlays and gestures.
+     * After clearing markers, it re-adds a scale bar overlay and rotation gesture overlay to the map.
+     */
+    private void clearAllMarkers(){
+        mMapView.getOverlayManager().clear() ;
+        mMapView.invalidate();
+
+        ScaleBarOverlay scaleBarOverlay = new ScaleBarOverlay(mMapView);
+        scaleBarOverlay.setScaleBarOffset(15,25);
+        Paint barPaint = new Paint();
+        barPaint.setARGB(200,255,250,250);
+        scaleBarOverlay.setBackgroundPaint(barPaint);
+        scaleBarOverlay.enableScaleBar();
+        mMapView.getOverlays().add(scaleBarOverlay);
+        RotationGestureOverlay rotationGestureOverlay = new RotationGestureOverlay(mMapView,compassArrow,compassBg);
+        rotationGestureOverlay.setEnabled(true);
+        mMapView.setMultiTouchControls(true);
+        mMapView.getOverlays().add(rotationGestureOverlay);
+    }
+
+    /**
+     * Recenters the map to the Center and adds a scale disk overlay and a marker at the position.
+     *
+     * @param geoPoint The GeoPoint representing the new center position of the map.
+     */
+    private void recenterMarkerToPosition(GeoPoint geoPoint){
+        if(geoPoint != null) {
+            mMapView.getController().setCenter(geoPoint);
+            List<Overlay> overlays = mMapView.getOverlays();
+            for (int i = 0; i < overlays.size(); i++) {
+                if (overlays.get(i) instanceof org.osmdroid.views.overlay.Marker) {
+                    mMapView.getOverlays().remove(i);
+                }
+                else if (overlays.get(i) instanceof ScaleDiskOverlay) {
+                    mMapView.getOverlays().remove(i);
+                }
+            }
+            ScaleDiskOverlay diskOverlay =
+                new ScaleDiskOverlay(this.getContext(),
+                    geoPoint, 2000, GeoConstants.UnitOfMeasure.foot);
+            Paint circlePaint = new Paint();
+            circlePaint.setColor(Color.rgb(128, 128, 128));
+            circlePaint.setStyle(Paint.Style.STROKE);
+            circlePaint.setStrokeWidth(2f);
+            diskOverlay.setCirclePaint2(circlePaint);
+            Paint diskPaint = new Paint();
+            diskPaint.setColor(Color.argb(40, 128, 128, 128));
+            diskPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+            diskOverlay.setCirclePaint1(diskPaint);
+            diskOverlay.setDisplaySizeMin(900);
+            diskOverlay.setDisplaySizeMax(1700);
+            mMapView.getOverlays().add(diskOverlay);
+
+            org.osmdroid.views.overlay.Marker startMarker = new org.osmdroid.views.overlay.Marker(
+                mMapView);
+            startMarker.setPosition(geoPoint);
+            startMarker.setAnchor(org.osmdroid.views.overlay.Marker.ANCHOR_CENTER,
+                org.osmdroid.views.overlay.Marker.ANCHOR_BOTTOM);
+            startMarker.setIcon(
+                ContextCompat.getDrawable(this.getContext(), R.drawable.current_location_marker));
+            startMarker.setTitle("Your Location");
+            startMarker.setTextLabelFontSize(24);
+            mMapView.getOverlays().add(startMarker);
+        }
+    }
+
     public interface  NearbyParentFragmentInstanceReadyCallback{
         void onReady();
     }

app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java

@@ -24,6 +24,7 @@ import fr.free.nrw.commons.nearby.NearbyFilterState;
 import fr.free.nrw.commons.nearby.contract.NearbyParentFragmentContract;
 import fr.free.nrw.commons.utils.LocationUtils;
 import fr.free.nrw.commons.wikidata.WikidataEditListener;
+import org.osmdroid.util.GeoPoint;
 import timber.log.Timber;
 
 import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.CUSTOM_QUERY;
@@ -243,6 +244,7 @@ public class NearbyParentFragmentPresenter
             nearbyParentFragmentView.setProgressBarVisibility(false);
             nearbyParentFragmentView.updateListFragment(nearbyPlacesInfo.placeList);
             handleCenteringTaskIfAny();
+           //TODO
             nearbyParentFragmentView.centerMapToPosition(nearbyPlacesInfo.searchLatLng);
         }
     }

app/src/main/res/drawable/compass_arrow.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="37dp"
+    android:height="55dp"
+    android:viewportWidth="37"
+    android:viewportHeight="55">
+  <path
+      android:pathData="M31.01,27.554L18.816,1.95L6.49,27.446L31.01,27.554Z"
+      android:fillColor="#F57D66"/>
+  <path
+      android:pathData="M6.49,27.446L18.684,53.05L31.01,27.554L6.49,27.446Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18.5,27.5m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"
+      android:fillColor="#000000"/>
+</vector>

app/src/main/res/drawable/compass_bg.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/black"/>
+    <stroke android:color="#8AFFFFFF" android:width="4dp"/>
+</shape>

app/src/main/res/layout/fragment_nearby_parent.xml

@@ -64,26 +64,59 @@
             android:layout_below="@id/rl_container_wlm_month_message">
 
             <com.mapbox.mapboxsdk.maps.MapView
-                android:id="@+id/map_view"
+              android:id="@+id/map_view"
-                android:layout_width="match_parent"
+              android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+              android:layout_height="match_parent"
+              android:visibility="gone" />
+
+            <org.osmdroid.views.MapView
+              android:id="@+id/map"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:visibility="visible" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@android:color/transparent" />
 
+            <LinearLayout
+              android:id="@+id/compassBg"
+              android:layout_width="50dp"
+              android:layout_height="50dp"
+              android:layout_alignParentLeft="true"
+              android:layout_alignParentBottom="true"
+              android:layout_marginStart="2dp"
+              android:layout_marginBottom="8dp"
+              android:background="@drawable/compass_bg"
+              android:orientation="horizontal"
+              android:padding="12.5dp"
+              android:visibility="invisible"
+              app:layout_constraintBottom_toBottomOf="parent"
+              app:layout_constraintStart_toStartOf="parent">
+
+                <ImageView
+                  android:id="@+id/compassArrow"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"
+                  app:srcCompat="@drawable/compass_arrow" />
+            </LinearLayout>
+
             <androidx.appcompat.widget.AppCompatTextView
               android:id="@+id/tv_attribution"
-              android:textStyle="bold"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_margin="8dp"
-              android:layout_alignParentBottom="true"
               android:layout_alignParentLeft="true"
+              android:layout_alignParentBottom="true"
+              android:layout_marginStart="8dp"
+              android:layout_marginTop="8dp"
+              android:layout_marginEnd="8dp"
+              android:layout_marginBottom="8dp"
               android:text="@string/map_attribution"
               android:textAlignment="center"
-              android:textSize="10sp" />
+              android:textSize="10sp"
+              android:textStyle="bold" />
 
         </RelativeLayout>
 
@@ -146,12 +179,12 @@
         layout="@layout/bottom_sheet_details" />
 
     <ProgressBar
-        android:id="@+id/map_progress_bar"
+      android:id="@+id/map_progress_bar"
-        android:layout_width="match_parent"
+      android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+      android:layout_height="wrap_content"
-        android:layout_gravity="center"
+      android:layout_gravity="center"
-        app:elevation="@dimen/dimen_6"
+      android:visibility="gone"
-        android:visibility="gone" />
+      app:elevation="@dimen/dimen_6" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_plus"

app/src/main/res/values/strings.xml

@@ -668,7 +668,7 @@ Upload your first media by tapping on the add button.</string>
   <string name="leaderboard_nearby">Nearby</string>
   <string name="leaderboard_used">Used</string>
   <string name="leaderboard_my_rank_button_text">My Rank</string>
-  <string name="map_attribution" translatable="false"><![CDATA[&#169; <a href="https://www.mapbox.com/about/maps/">Mapbox</a> &#169; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> <a href="https://www.mapbox.com/map-feedback/">Improve this map</a>]]></string>
+  <string name="map_attribution" translatable="false"><![CDATA[&#169; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>]]></string>
   <string name="limited_connection_enabled">Limited connection mode enabled!</string>
   <string name="limited_connection_disabled">Limited connection mode disabled. Pending uploads will resume now.</string>
   <string name="limited_connection_mode">Limited Connection Mode</string>

gradle.properties

@@ -29,6 +29,7 @@ PAGING_VERSION=2.1.2
 MULTIDEX_VERSION=2.0.1
 OKHTTP_VERSION=4.10.0
 MAPLIBRE_VERSION=10.0.1
+OSMDROID_VERSION=6.1.17
 
 systemProp.http.proxyPort=0
 systemProp.http.proxyHost=