diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 41788128c7..f5bdfd05bf 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -252,6 +252,7 @@ dependencies {
     implementation(libs.androidx.material3)
     implementation(libs.androidx.foundation)
     implementation(libs.androidx.foundation.layout)
+    implementation(libs.androidx.annotation)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
diff --git a/app/src/main/java/fr/free/nrw/commons/BaseMarker.kt b/app/src/main/java/fr/free/nrw/commons/BaseMarker.kt
index 28b01d6031..ac5ac41b69 100644
--- a/app/src/main/java/fr/free/nrw/commons/BaseMarker.kt
+++ b/app/src/main/java/fr/free/nrw/commons/BaseMarker.kt
@@ -5,59 +5,29 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import androidx.appcompat.content.res.AppCompatResources
 import fr.free.nrw.commons.location.LatLng
 import fr.free.nrw.commons.nearby.Place
+import androidx.core.graphics.createBitmap
 
 class BaseMarker {
-    private var _position: LatLng = LatLng(0.0, 0.0, 0f)
-    private var _title: String = ""
-    private var _place: Place = Place()
-    private var _icon: Bitmap? = null
+    var position: LatLng = LatLng(0.0, 0.0, 0f)
+    var title: String = ""
+    var icon: Bitmap? = null
+    var place: Place = Place()
 
-    var position: LatLng
-        get() = _position
-        set(value) {
-            _position = value
-        }
-    var title: String
-        get() = _title
-        set(value) {
-            _title = value
-        }
-
-    var place: Place
-        get() = _place
-        set(value) {
-            _place = value
-        }
-    var icon: Bitmap?
-        get() = _icon
-        set(value) {
-            _icon = value
-        }
-
-    constructor() {
-    }
-
-    fun fromResource(
-        context: Context,
-        drawableResId: Int,
-    ) {
-        val drawable: Drawable = context.resources.getDrawable(drawableResId)
-        icon =
-            if (drawable is BitmapDrawable) {
-                drawable.bitmap
-            } else {
-                val bitmap =
-                    Bitmap.createBitmap(
-                        drawable.intrinsicWidth,
-                        drawable.intrinsicHeight,
-                        Bitmap.Config.ARGB_8888,
-                    )
+    fun fromResource(context: Context, drawableResId: Int) {
+        val drawable: Drawable? = AppCompatResources.getDrawable(context, drawableResId)
+        icon = when (drawable) {
+            null -> null
+            is BitmapDrawable -> drawable.bitmap
+            else -> {
+                val bitmap = createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight)
                 val canvas = Canvas(bitmap)
                 drawable.setBounds(0, 0, canvas.width, canvas.height)
                 drawable.draw(canvas)
                 bitmap
             }
+        }
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.kt
index 2fa65b2d94..a022d91886 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.kt
@@ -43,7 +43,7 @@ abstract class BookmarkLocationsDao {
      * @return `true` if added, `false` if removed.
      */
     suspend fun updateBookmarkLocation(bookmarkLocation: Place): Boolean {
-        val exists = findBookmarkLocation(bookmarkLocation.name)
+        val exists = findBookmarkLocation(bookmarkLocation.name!!)
 
         if (exists) {
             deleteBookmarkLocation(bookmarkLocation.toBookmarksLocations())
diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarksLocations.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarksLocations.kt
index 66d670169a..e22400a634 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarksLocations.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarksLocations.kt
@@ -33,12 +33,6 @@ fun BookmarksLocations.toPlace(): Place {
         1F
     )
 
-    val builder = Sitelinks.Builder().apply {
-        setWikipediaLink(locationWikipediaLink)
-        setWikidataLink(locationWikidataLink)
-        setCommonsLink(locationCommonsLink)
-    }
-
     return Place(
         locationLanguage,
         locationName,
@@ -46,7 +40,7 @@ fun BookmarksLocations.toPlace(): Place {
         locationDescription,
         location,
         locationCategory,
-        builder.build(),
+        Sitelinks(locationWikipediaLink, locationCommonsLink, locationWikidataLink),
         locationPic,
         locationExists
     )
@@ -54,19 +48,19 @@ fun BookmarksLocations.toPlace(): Place {
 
 fun Place.toBookmarksLocations(): BookmarksLocations {
     return BookmarksLocations(
-        locationName = name,
-        locationLanguage = language,
-        locationDescription = longDescription,
-        locationCategory = category,
-        locationLat = location.latitude,
-        locationLong = location.longitude,
+        locationName = name!!,
+        locationLanguage = language!!,
+        locationDescription = longDescription!!,
+        locationCategory = category!!,
+        locationLat = location!!.latitude,
+        locationLong = location!!.longitude,
         locationLabelText = label?.text ?: "",
         locationLabelIcon = label?.icon,
-        locationImageUrl = pic,
-        locationWikipediaLink = siteLinks.wikipediaLink.toString(),
-        locationWikidataLink = siteLinks.wikidataLink.toString(),
-        locationCommonsLink = siteLinks.commonsLink.toString(),
-        locationPic = pic,
-        locationExists = exists
+        locationImageUrl = pic!!,
+        locationWikipediaLink = siteLinks?.wikipediaLink ?: "",
+        locationWikidataLink = siteLinks?.wikidataLink ?: "",
+        locationCommonsLink = siteLinks?.commonsLink ?: "",
+        locationPic = pic!!,
+        locationExists = exists!!
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.kt
index 537d805c54..52dc4c8bcb 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.kt
@@ -542,7 +542,7 @@ class ContributionsFragment : CommonsDaggerSupportFragment(), FragmentManager.On
             return
         }
 
-        binding!!.cardViewNearby.permissionRequestButton.setOnClickListener { v: View? ->
+        binding!!.cardViewNearby.permissionRequestButton?.setOnClickListener {
             showNearbyCardPermissionRationale()
         }
 
@@ -658,7 +658,7 @@ class ContributionsFragment : CommonsDaggerSupportFragment(), FragmentManager.On
             var closestNearbyPlace: Place? = null
             // Find the first nearby place that has no image and exists
             for (place in nearbyPlacesInfo.placeList) {
-                if (place.pic == "" && place.exists) {
+                if (place.pic == "" && place.exists == true) {
                     closestNearbyPlace = place
                     break
                 }
@@ -668,8 +668,8 @@ class ContributionsFragment : CommonsDaggerSupportFragment(), FragmentManager.On
                 binding!!.cardViewNearby.visibility = View.GONE
             } else {
                 val distance = formatDistanceBetween(currentLatLng, closestNearbyPlace.location)
-                closestNearbyPlace.setDistance(distance)
-                direction = computeBearing(currentLatLng!!, closestNearbyPlace.location).toFloat()
+                closestNearbyPlace.distance = distance
+                direction = computeBearing(currentLatLng!!, closestNearbyPlace.location!!).toFloat()
                 binding!!.cardViewNearby.updateContent(closestNearbyPlace)
             }
         } else {
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapController.kt b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapController.kt
index 0873572d1d..1a051f1bf1 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapController.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapController.kt
@@ -163,13 +163,13 @@ class ExploreMapController @Inject constructor(
                 for (explorePlace in placeList) {
                     val baseMarker = BaseMarker()
                     val distance = formatDistanceBetween(currentLatLng, explorePlace.location)
-                    explorePlace.setDistance(distance)
+                    explorePlace.distance = distance
 
                     baseMarker.title =
-                        explorePlace.name.substring(5, explorePlace.name.lastIndexOf("."))
+                        explorePlace.name!!.substring(5, explorePlace.name!!.lastIndexOf("."))
                     baseMarker.position = LatLng(
-                        explorePlace.location.latitude,
-                        explorePlace.location.longitude, 0f
+                        explorePlace.location!!.latitude,
+                        explorePlace.location!!.longitude, 0f
                     )
                     baseMarker.place = explorePlace
 
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt
index 93cbdb0409..9937f05b61 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt
@@ -648,12 +648,12 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi
      */
     private fun passInfoToSheet(place: Place) {
         binding!!.bottomSheetDetailsBinding.directionsButton.setOnClickListener {
-            handleGeoCoordinates(requireActivity(), place.getLocation(), binding!!.mapView.zoomLevelDouble)
+            handleGeoCoordinates(requireActivity(), place.location!!, binding!!.mapView.zoomLevelDouble)
         }
 
         binding!!.bottomSheetDetailsBinding.commonsButton.visibility = if (place.hasCommonsLink()) View.VISIBLE else View.GONE
         binding!!.bottomSheetDetailsBinding.commonsButton.setOnClickListener {
-            handleWebUrl(requireContext(), place.siteLinks.commonsLink)
+            handleWebUrl(requireContext(), place.siteLinks!!.commonsUri!!)
         }
 
         var index = 0
@@ -666,15 +666,14 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi
             }
             index++
         }
-        binding!!.bottomSheetDetailsBinding.title.text = place.name.substring(5, place.name.lastIndexOf("."))
+        binding!!.bottomSheetDetailsBinding.title.text = place.name!!.substring(5, place.name!!.lastIndexOf("."))
         binding!!.bottomSheetDetailsBinding.category.text = place.distance
         // Remove label since it is double information
-        var descriptionText = place.longDescription
-            .replace(place.getName() + " (", "")
+        var descriptionText = place.longDescription?.replace(place.name + " (", "")
         descriptionText = (if (descriptionText == place.longDescription)
             descriptionText
         else
-            descriptionText.replaceFirst(".$".toRegex(), ""))
+            descriptionText?.replaceFirst(".$".toRegex(), ""))
         // Set the short description after we remove place name from long description
         binding!!.bottomSheetDetailsBinding.description.text = descriptionText
     }
@@ -735,8 +734,8 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi
             val items = mutableListOf<OverlayItem?>()
             val d: Drawable = nearbyBaseMarker.icon!!.toDrawable(resources)
             val point = GeoPoint(
-                nearbyBaseMarker.place.location.latitude,
-                nearbyBaseMarker.place.location.longitude
+                nearbyBaseMarker.place.location!!.latitude,
+                nearbyBaseMarker.place.location!!.longitude
             )
 
             val markerMedia = getMediaFromImageURL(nearbyBaseMarker.place.pic)
@@ -752,7 +751,7 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi
 
             var title = nearbyBaseMarker.place.name
             // Remove "File:" if present at start
-            if (title.startsWith("File:")) {
+            if (title!!.startsWith("File:")) {
                 title = title.substring(5)
             }
             // Remove extensions like .jpg, .jpeg, .png, .svg (case insensitive)
@@ -870,7 +869,7 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi
      */
     private fun removeMarker(nearbyBaseMarker: BaseMarker?) {
         if (nearbyBaseMarker == null ||
-            nearbyBaseMarker.place.getName() == null ||
+            nearbyBaseMarker.place.name == null ||
             baseMarkerOverlayMap == null ||
             !baseMarkerOverlayMap!!.containsKey(nearbyBaseMarker)) {
             return
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.java b/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.java
deleted file mode 100644
index 323f9756ff..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.CompoundButton;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatCheckBox;
-
-import java.util.List;
-
-import fr.free.nrw.commons.R;
-
-/**
- * Base on https://stackoverflow.com/a/40939367/3950497 answer.
- */
-public class CheckBoxTriStates extends AppCompatCheckBox {
-
-    static public final int UNKNOWN = -1;
-
-    static public final int UNCHECKED = 0;
-
-    static public final int CHECKED = 1;
-
-    private int state=UNKNOWN;
-
-    private Callback callback;
-
-    public interface Callback{
-        void filterByMarkerType(@Nullable List<Label> selectedLabels, int state, boolean b, boolean b1);
-    }
-
-    public void setCallback(Callback callback) {
-        this.callback = callback;
-    }
-
-    /**
-     * This is the listener set to the super class which is going to be evoke each
-     * time the check state has changed.
-     */
-    private final OnCheckedChangeListener privateListener = new CompoundButton.OnCheckedChangeListener() {
-
-        // checkbox status is changed from uncheck to checked.
-        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-            switch (state) {
-                case UNKNOWN:
-                    setState(UNCHECKED);
-                    break;
-                case UNCHECKED:
-                    setState(CHECKED);
-                    break;
-                case CHECKED:
-                    setState(UNKNOWN);
-                    break;
-            }
-        }
-    };
-
-    /**
-     * Holds a reference to the listener set by a client, if any.
-     */
-    private OnCheckedChangeListener clientListener;
-
-
-    public CheckBoxTriStates(Context context) {
-        super(context);
-        init();
-    }
-
-    public CheckBoxTriStates(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public CheckBoxTriStates(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    public int getState() {
-        return state;
-    }
-
-    public void setState(int state) {
-        if(this.state != state) {
-            this.state = state;
-
-            if(this.clientListener != null) {
-                this.clientListener.onCheckedChanged(this, this.isChecked());
-            }
-
-            if (NearbyController.currentLocation != null) {
-                callback.filterByMarkerType(null, state, false, true);
-            }
-            updateBtn();
-        }
-    }
-
-    @Override
-    public void setOnCheckedChangeListener(@Nullable OnCheckedChangeListener listener) {
-
-        // we never truly set the listener to the client implementation, instead we only hold
-        // a reference to it and evoke it when needed.
-        if(this.privateListener != listener) {
-            this.clientListener = listener;
-        }
-
-        // always use our implementation
-        super.setOnCheckedChangeListener(privateListener);
-    }
-
-    private void init() {
-        state = UNKNOWN;
-        updateBtn();
-    }
-
-    public void addAction() {
-        setOnCheckedChangeListener(this.privateListener);
-    }
-
-    private void updateBtn() {
-        int btnDrawable = R.drawable.ic_indeterminate_check_box_black_24dp;
-        switch (state) {
-            case UNKNOWN:
-                btnDrawable = R.drawable.ic_indeterminate_check_box_black_24dp;
-                break;
-            case UNCHECKED:
-                btnDrawable = R.drawable.ic_check_box_outline_blank_black_24dp;
-                break;
-            case CHECKED:
-                btnDrawable = R.drawable.ic_check_box_black_24dp;
-                break;
-        }
-        setButtonDrawable(btnDrawable);
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.kt b/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.kt
new file mode 100644
index 0000000000..af36a1a339
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.kt
@@ -0,0 +1,107 @@
+package fr.free.nrw.commons.nearby
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatCheckBox
+import fr.free.nrw.commons.R
+
+/**
+ * Base on https://stackoverflow.com/a/40939367/3950497 answer.
+ */
+class CheckBoxTriStates : AppCompatCheckBox {
+    private var state: Int = UNKNOWN
+    var callback: Callback? = null
+
+    /**
+     * This is the listener set to the super class which is going to be evoke each
+     * time the check state has changed.
+     */
+    private val privateListener = OnCheckedChangeListener { _, _ ->
+        when (state) {
+            UNKNOWN -> setState(UNCHECKED)
+            UNCHECKED -> setState(CHECKED)
+            CHECKED -> setState(UNKNOWN)
+        }
+    }
+
+    /**
+     * Holds a reference to the listener set by a client, if any.
+     */
+    private var clientListener: OnCheckedChangeListener? = null
+
+
+    constructor(context: Context) : super(context) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init()
+    }
+
+    fun getState(): Int {
+        return state
+    }
+
+    fun setState(state: Int) {
+        if (this.state != state) {
+            this.state = state
+
+            if (clientListener != null) {
+                clientListener!!.onCheckedChanged(this, isChecked())
+            }
+
+            if (NearbyController.currentLocation != null) {
+                callback!!.filterByMarkerType(null, state, false, true)
+            }
+            updateBtn()
+        }
+    }
+
+    override fun setOnCheckedChangeListener(listener: OnCheckedChangeListener?) {
+        // we never truly set the listener to the client implementation, instead we only hold
+        // a reference to it and evoke it when needed.
+
+        if (privateListener !== listener) {
+            clientListener = listener
+        }
+
+        // always use our implementation
+        super.setOnCheckedChangeListener(privateListener)
+    }
+
+    private fun init() {
+        state = UNKNOWN
+        updateBtn()
+    }
+
+    fun addAction() = setOnCheckedChangeListener(privateListener)
+
+    private fun updateBtn() {
+        setButtonDrawable(
+            when (state) {
+                UNCHECKED -> R.drawable.ic_check_box_outline_blank_black_24dp
+                CHECKED -> R.drawable.ic_check_box_black_24dp
+                else -> R.drawable.ic_indeterminate_check_box_black_24dp
+            }
+        )
+    }
+
+    interface Callback {
+        fun filterByMarkerType(
+            selectedLabels: List<Label>?,
+            state: Int,
+            filterForPlaceState: Boolean,
+            filterForAllNoneType: Boolean
+        )
+    }
+
+    companion object {
+        const val UNKNOWN: Int = -1
+        const val UNCHECKED: Int = 0
+        const val CHECKED: Int = 1
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Label.java b/app/src/main/java/fr/free/nrw/commons/nearby/Label.java
deleted file mode 100644
index 19c175fd80..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/Label.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import android.os.Parcel;
-
-import androidx.annotation.DrawableRes;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import fr.free.nrw.commons.R;
-
-/**
- * See https://github.com/commons-app/apps-android-commons/issues/250
- * Most common types of desc: building, house, cottage, farmhouse,
- * village, civil parish, church, railway station,
- * gatehouse, milestone, inn, secondary school, hotel
- */
-public enum Label {
-
-    BOOKMARKS("BOOKMARK", R.drawable.ic_filled_star_24dp),
-    BUILDING("Q41176", R.drawable.round_icon_generic_building),
-    HOUSE("Q3947", R.drawable.round_icon_house),
-    COTTAGE("Q5783996", R.drawable.round_icon_house),
-    FARMHOUSE("Q489357", R.drawable.round_icon_house),
-    CHURCH("Q16970", R.drawable.round_icon_church), //changed from church to church building
-    RAILWAY_STATION("Q55488", R.drawable.round_icon_railway_station),
-    GATEHOUSE("Q277760", R.drawable.round_icon_gatehouse),
-    MILESTONE("Q10145", R.drawable.round_icon_milestone),
-    INN("Q256020", R.drawable.round_icon_house), //Q27686
-    HOTEL("Q27686", R.drawable.round_icon_house),
-    CITY("Q515", R.drawable.round_icon_city),
-    UNIVERSITY("Q3918", R.drawable.round_icon_school), //added university
-    SCHOOL("Q3914", R.drawable.round_icon_school), //changed from "secondary school" to school
-    EDUCATION("Q8434", R.drawable.round_icon_school), //changed from edu to education, there is no id for "edu"
-    ISLE("Q23442", R.drawable.round_icon_island),
-    MOUNTAIN("Q8502", R.drawable.round_icon_mountain),
-    AIRPORT("Q1248784", R.drawable.round_icon_airport),
-    BRIDGE("Q12280", R.drawable.round_icon_bridge),
-    ROAD("Q34442", R.drawable.round_icon_road),
-    FOREST("Q4421", R.drawable.round_icon_forest),
-    PARK("Q22698", R.drawable.round_icon_park),
-    RIVER("Q4022", R.drawable.round_icon_river),
-    WATERFALL("Q34038", R.drawable.round_icon_waterfall),
-    TEMPLE("Q44539", R.drawable.round_icon_church),
-    UNKNOWN("?", R.drawable.round_icon_unknown);
-
-    public static final Map<String, Label> TEXT_TO_DESCRIPTION
-            = new HashMap<>(Label.values().length);
-
-    static {
-        for (Label label : values()) {
-            TEXT_TO_DESCRIPTION.put(label.text, label);
-        }
-    }
-
-    private final String text;
-    @DrawableRes
-    private final int icon;
-    private boolean selected;
-
-    Label(String text, @DrawableRes int icon) {
-        this.text = text;
-        this.icon = icon;
-    }
-
-    Label(Parcel in) {
-        this.text = in.readString();
-        this.icon = in.readInt();
-    }
-
-    /**
-     * Will be used for nearby filter, to determine if place type is selected or not
-     * @param isSelected true if user selected the place type
-     */
-    public void setSelected(boolean isSelected) {
-        this.selected = isSelected;
-    }
-
-    public boolean isSelected() {
-        return selected;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    @DrawableRes
-    public int getIcon() {
-        return icon;
-    }
-
-    public static Label fromText(String text) {
-        Label label = TEXT_TO_DESCRIPTION.get(text);
-        return label == null ? UNKNOWN : label;
-    }
-
-    public static List<Label> valuesAsList() {
-        return Arrays.asList(Label.values());
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Label.kt b/app/src/main/java/fr/free/nrw/commons/nearby/Label.kt
new file mode 100644
index 0000000000..cdee74ea14
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/Label.kt
@@ -0,0 +1,67 @@
+package fr.free.nrw.commons.nearby
+
+import androidx.annotation.DrawableRes
+import fr.free.nrw.commons.R
+import java.util.Arrays
+
+/**
+ * See https://github.com/commons-app/apps-android-commons/issues/250
+ * Most common types of desc: building, house, cottage, farmhouse,
+ * village, civil parish, church, railway station,
+ * gatehouse, milestone, inn, secondary school, hotel
+ */
+enum class Label {
+    BOOKMARKS("BOOKMARK", R.drawable.ic_filled_star_24dp),
+    BUILDING("Q41176", R.drawable.round_icon_generic_building),
+    HOUSE("Q3947", R.drawable.round_icon_house),
+    COTTAGE("Q5783996", R.drawable.round_icon_house),
+    FARMHOUSE("Q489357", R.drawable.round_icon_house),
+    CHURCH("Q16970", R.drawable.round_icon_church),  //changed from church to church building
+    RAILWAY_STATION("Q55488", R.drawable.round_icon_railway_station),
+    GATEHOUSE("Q277760", R.drawable.round_icon_gatehouse),
+    MILESTONE("Q10145", R.drawable.round_icon_milestone),
+    INN("Q256020", R.drawable.round_icon_house),  //Q27686
+    HOTEL("Q27686", R.drawable.round_icon_house),
+    CITY("Q515", R.drawable.round_icon_city),
+    UNIVERSITY("Q3918", R.drawable.round_icon_school),  //added university
+    SCHOOL("Q3914", R.drawable.round_icon_school),  //changed from "secondary school" to school
+    EDUCATION("Q8434", R.drawable.round_icon_school),  //changed from edu to education, there is no id for "edu"
+    ISLE("Q23442", R.drawable.round_icon_island),
+    MOUNTAIN("Q8502", R.drawable.round_icon_mountain),
+    AIRPORT("Q1248784", R.drawable.round_icon_airport),
+    BRIDGE("Q12280", R.drawable.round_icon_bridge),
+    ROAD("Q34442", R.drawable.round_icon_road),
+    FOREST("Q4421", R.drawable.round_icon_forest),
+    PARK("Q22698", R.drawable.round_icon_park),
+    RIVER("Q4022", R.drawable.round_icon_river),
+    WATERFALL("Q34038", R.drawable.round_icon_waterfall),
+    TEMPLE("Q44539", R.drawable.round_icon_church),
+    UNKNOWN("?", R.drawable.round_icon_unknown);
+
+    @JvmField
+    val text: String?
+
+    @JvmField
+    val icon: Int
+
+    /**
+     * Will be used for nearby filter, to determine if place type is selected or not
+     * @param isSelected true if user selected the place type
+     */
+    var isSelected: Boolean = false
+
+    constructor(text: String, @DrawableRes icon: Int) {
+        this.text = text
+        this.icon = icon
+    }
+
+    companion object {
+        val TEXT_TO_DESCRIPTION : MutableMap<String, Label> =
+            Label.entries.associateBy { it.text!! }.toMutableMap()
+
+        @JvmStatic
+        fun fromText(text: String?): Label {
+            return TEXT_TO_DESCRIPTION.getOrDefault(text, UNKNOWN)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/MarkerPlaceGroup.java b/app/src/main/java/fr/free/nrw/commons/nearby/MarkerPlaceGroup.java
deleted file mode 100644
index c2474adc33..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/MarkerPlaceGroup.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-/**
- * This class groups visual map item Marker with the reated data of displayed place and information
- * of bookmark
- */
-public class MarkerPlaceGroup {
-    private boolean isBookmarked; // True if user bookmarked the place
-    private Place place; // Place of the location displayed by the marker
-
-    public MarkerPlaceGroup(boolean isBookmarked, Place place) {
-        this.isBookmarked = isBookmarked;
-        this.place = place;
-    }
-
-    public Place getPlace() {
-        return place;
-    }
-
-    public boolean getIsBookmarked() {
-        return isBookmarked;
-    }
-
-    public void setIsBookmarked(boolean isBookmarked) {
-        this.isBookmarked = isBookmarked;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/MarkerPlaceGroup.kt b/app/src/main/java/fr/free/nrw/commons/nearby/MarkerPlaceGroup.kt
new file mode 100644
index 0000000000..f2808e8acb
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/MarkerPlaceGroup.kt
@@ -0,0 +1,12 @@
+package fr.free.nrw.commons.nearby
+
+/**
+ * This class groups visual map item Marker with the reated data of displayed place and information
+ * of bookmark
+ */
+class MarkerPlaceGroup(
+    // True if user bookmarked the place
+    var isBookmarked: Boolean,
+    // Place of the location displayed by the marker
+    @JvmField val place: Place
+)
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java
deleted file mode 100644
index 4038135195..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java
+++ /dev/null
@@ -1,324 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween;
-import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
-
-import androidx.annotation.MainThread;
-import androidx.annotation.Nullable;
-import fr.free.nrw.commons.BaseMarker;
-import fr.free.nrw.commons.MapController;
-import fr.free.nrw.commons.location.LatLng;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Locale;
-import java.util.Map;
-import javax.inject.Inject;
-import timber.log.Timber;
-
-public class NearbyController extends MapController {
-
-    private final NearbyPlaces nearbyPlaces;
-    public static final int MAX_RESULTS = 1000;
-    public static double currentLocationSearchRadius = 10.0; //in kilometers
-    public static LatLng currentLocation; // Users latest fetched location
-    public static LatLng latestSearchLocation; // Can be current and camera target on search this area button is used
-    public static double latestSearchRadius = 10.0; // Any last search radius except closest result search
-
-    public static List<MarkerPlaceGroup> markerLabelList = new ArrayList<>();
-
-    @Inject
-    public NearbyController(NearbyPlaces nearbyPlaces) {
-        this.nearbyPlaces = nearbyPlaces;
-    }
-
-
-    /**
-     * Prepares Place list to make their distance information update later.
-     *
-     * @param currentLatLng       current location for user
-     * @param searchLatLng        the location user wants to search around
-     * @param returnClosestResult if this search is done to find closest result or all results
-     * @param customQuery         if this search is done via an advanced query
-     * @return NearbyPlacesInfo a variable holds Place list without distance information and
-     * boundary coordinates of current Place List
-     */
-    public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng currentLatLng,
-        final LatLng searchLatLng,
-        final boolean returnClosestResult, final boolean checkingAroundCurrentLocation,
-        @Nullable final String customQuery) throws Exception {
-
-        Timber.d("Loading attractions near %s", searchLatLng);
-        NearbyPlacesInfo nearbyPlacesInfo = new NearbyPlacesInfo();
-        if (searchLatLng == null) {
-            Timber.d("Loading attractions nearby, but currentLatLng is null");
-            return null;
-        }
-        List<Place> places = nearbyPlaces
-            .radiusExpander(searchLatLng, Locale.getDefault().getLanguage(), returnClosestResult,
-                customQuery);
-
-        if (null != places && places.size() > 0) {
-            LatLng[] boundaryCoordinates = {
-                places.get(0).location, // south
-                places.get(0).location, // north
-                places.get(0).location, // west
-                places.get(0).location};// east, init with a random location
-
-            if (currentLatLng != null) {
-                Timber.d("Sorting places by distance...");
-                final Map<Place, Double> distances = new HashMap<>();
-                for (Place place : places) {
-                    distances.put(place, computeDistanceBetween(place.location, currentLatLng));
-                    // Find boundaries with basic find max approach
-                    if (place.location.getLatitude() < boundaryCoordinates[0].getLatitude()) {
-                        boundaryCoordinates[0] = place.location;
-                    }
-                    if (place.location.getLatitude() > boundaryCoordinates[1].getLatitude()) {
-                        boundaryCoordinates[1] = place.location;
-                    }
-                    if (place.location.getLongitude() < boundaryCoordinates[2].getLongitude()) {
-                        boundaryCoordinates[2] = place.location;
-                    }
-                    if (place.location.getLongitude() > boundaryCoordinates[3].getLongitude()) {
-                        boundaryCoordinates[3] = place.location;
-                    }
-                }
-                Collections.sort(places,
-                    (lhs, rhs) -> {
-                        double lhsDistance = distances.get(lhs);
-                        double rhsDistance = distances.get(rhs);
-                        return (int) (lhsDistance - rhsDistance);
-                    }
-                );
-            }
-            nearbyPlacesInfo.currentLatLng = currentLatLng;
-            nearbyPlacesInfo.searchLatLng = searchLatLng;
-            nearbyPlacesInfo.placeList = places;
-            nearbyPlacesInfo.boundaryCoordinates = boundaryCoordinates;
-
-            // Returning closes result means we use the controller for nearby card. So no need to set search this area flags
-            if (!returnClosestResult) {
-                // To remember latest search either around user or any point on map
-                latestSearchLocation = searchLatLng;
-                latestSearchRadius = nearbyPlaces.radius * 1000; // to meter
-
-                // Our radius searched around us, will be used to understand when user search their own location, we will follow them
-                if (checkingAroundCurrentLocation) {
-                    currentLocationSearchRadius = nearbyPlaces.radius * 1000; // to meter
-                    currentLocation = currentLatLng;
-                }
-            }
-
-
-        }
-        return nearbyPlacesInfo;
-    }
-
-    public String getPlacesAsKML(LatLng currentLocation) throws Exception {
-        return nearbyPlaces.getPlacesAsKML(
-            calculateSouthWest(currentLocation.getLatitude(), currentLocation.getLongitude(), 10),
-            calculateNorthEast(currentLocation.getLatitude(), currentLocation.getLongitude(), 10)
-        );
-    }
-
-    public String getPlacesAsGPX(LatLng currentLocation) throws Exception {
-        return nearbyPlaces.getPlacesAsGPX(
-            calculateSouthWest(currentLocation.getLatitude(), currentLocation.getLongitude(), 10),
-            calculateNorthEast(currentLocation.getLatitude(), currentLocation.getLongitude(), 10)
-        );
-    }
-
-    /**
-     * Retrieves a list of places based on the provided list of places and language.
-     *
-     * @param placeList A list of Place objects for which to fetch information.
-     * @return A list of Place objects obtained from the Wikidata query.
-     * @throws Exception If an error occurs during the retrieval process.
-     */
-    public List<Place> getPlaces(List<Place> placeList) throws Exception {
-        return nearbyPlaces.getPlaces(placeList, Locale.getDefault().getLanguage());
-    }
-
-    public static LatLng calculateNorthEast(double latitude, double longitude, double distance) {
-        double lat1 = Math.toRadians(latitude);
-        double deltaLat = distance * 0.008;
-        double deltaLon = distance / Math.cos(lat1)*0.008;
-        double lat2 = latitude + deltaLat;
-        double lon2 = longitude + deltaLon;
-
-        return new LatLng(lat2, lon2, 0);
-    }
-
-    public static LatLng calculateSouthWest(double latitude, double longitude, double distance) {
-        double lat1 = Math.toRadians(latitude);
-        double deltaLat = distance * 0.008;
-        double deltaLon = distance / Math.cos(lat1)*0.008;
-        double lat2 = latitude - deltaLat;
-        double lon2 = longitude - deltaLon;
-
-        return new LatLng(lat2, lon2, 0);
-    }
-
-    /**
-     * Prepares Place list to make their distance information update later.
-     *
-     * @param currentLatLng                 The current latitude and longitude.
-     * @param screenTopRight                The top right corner of the screen (latitude,
-     *                                      longitude).
-     * @param screenBottomLeft              The bottom left corner of the screen (latitude,
-     *                                      longitude).
-     * @param searchLatLng                  The latitude and longitude of the search location.
-     * @param returnClosestResult           Flag indicating whether to return the closest result.
-     * @param checkingAroundCurrentLocation Flag indicating whether to check around the current
-     *                                      location.
-     * @param shouldQueryForMonuments       Flag indicating whether to include monuments in the
-     *                                      query.
-     * @param customQuery                   Optional custom SPARQL query to use instead of default
-     *                                      queries.
-     * @return An object containing information about nearby places.
-     * @throws Exception If an error occurs during the retrieval process.
-     */
-    public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng currentLatLng,
-        final fr.free.nrw.commons.location.LatLng screenTopRight,
-        final fr.free.nrw.commons.location.LatLng screenBottomLeft, final LatLng searchLatLng,
-        final boolean returnClosestResult, final boolean checkingAroundCurrentLocation,
-        final boolean shouldQueryForMonuments, @Nullable final String customQuery)
-        throws Exception {
-
-        Timber.d("Loading attractions near %s", searchLatLng);
-        NearbyPlacesInfo nearbyPlacesInfo = new NearbyPlacesInfo();
-
-        if (searchLatLng == null) {
-            Timber.d("Loading attractions nearby, but currentLatLng is null");
-            return null;
-        }
-
-        List<Place> places = nearbyPlaces.getFromWikidataQuery(currentLatLng, screenTopRight,
-            screenBottomLeft, Locale.getDefault().getLanguage(), shouldQueryForMonuments,
-            customQuery);
-
-        if (null != places && places.size() > 0) {
-            LatLng[] boundaryCoordinates = {
-                places.get(0).location, // south
-                places.get(0).location, // north
-                places.get(0).location, // west
-                places.get(0).location};// east, init with a random location
-
-            if (currentLatLng != null) {
-                Timber.d("Sorting places by distance...");
-                final Map<Place, Double> distances = new HashMap<>();
-                for (Place place : places) {
-                    distances.put(place, computeDistanceBetween(place.location, currentLatLng));
-                    // Find boundaries with basic find max approach
-                    if (place.location.getLatitude() < boundaryCoordinates[0].getLatitude()) {
-                        boundaryCoordinates[0] = place.location;
-                    }
-                    if (place.location.getLatitude() > boundaryCoordinates[1].getLatitude()) {
-                        boundaryCoordinates[1] = place.location;
-                    }
-                    if (place.location.getLongitude() < boundaryCoordinates[2].getLongitude()) {
-                        boundaryCoordinates[2] = place.location;
-                    }
-                    if (place.location.getLongitude() > boundaryCoordinates[3].getLongitude()) {
-                        boundaryCoordinates[3] = place.location;
-                    }
-                }
-                Collections.sort(places,
-                    (lhs, rhs) -> {
-                        double lhsDistance = distances.get(lhs);
-                        double rhsDistance = distances.get(rhs);
-                        return (int) (lhsDistance - rhsDistance);
-                    }
-                );
-            }
-            nearbyPlacesInfo.currentLatLng = currentLatLng;
-            nearbyPlacesInfo.searchLatLng = searchLatLng;
-            nearbyPlacesInfo.placeList = places;
-            nearbyPlacesInfo.boundaryCoordinates = boundaryCoordinates;
-
-            // Returning closes result means we use the controller for nearby card. So no need to set search this area flags
-            if (!returnClosestResult) {
-                // To remember latest search either around user or any point on map
-                latestSearchLocation = searchLatLng;
-                latestSearchRadius = nearbyPlaces.radius * 1000; // to meter
-
-                // Our radius searched around us, will be used to understand when user search their own location, we will follow them
-                if (checkingAroundCurrentLocation) {
-                    currentLocationSearchRadius = nearbyPlaces.radius * 1000; // to meter
-                    currentLocation = currentLatLng;
-                }
-            }
-        }
-        return nearbyPlacesInfo;
-    }
-
-    /**
-     * Prepares Place list to make their distance information update later.
-     *
-     * @param currentLatLng       current location for user
-     * @param searchLatLng        the location user wants to search around
-     * @param returnClosestResult if this search is done to find closest result or all results
-     * @return NearbyPlacesInfo a variable holds Place list without distance information and
-     * boundary coordinates of current Place List
-     */
-    public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng currentLatLng,
-        final LatLng searchLatLng,
-        final boolean returnClosestResult, final boolean checkingAroundCurrentLocation)
-        throws Exception {
-        return loadAttractionsFromLocation(currentLatLng, searchLatLng, returnClosestResult,
-            checkingAroundCurrentLocation, null);
-    }
-
-    /**
-     * Loads attractions from location for map view, we need to return BaseMarkerOption data type.
-     *
-     * @param currentLatLng users current location
-     * @param placeList     list of nearby places in Place data type
-     * @return BaseMarkerOptions list that holds nearby places
-     */
-    public static List<BaseMarker> loadAttractionsFromLocationToBaseMarkerOptions(
-        LatLng currentLatLng,
-        List<Place> placeList) {
-        List<BaseMarker> baseMarkersList = new ArrayList<>();
-
-        if (placeList == null) {
-            return baseMarkersList;
-        }
-        placeList = placeList.subList(0, Math.min(placeList.size(), MAX_RESULTS));
-        for (Place place : placeList) {
-            BaseMarker baseMarker = new BaseMarker();
-            String distance = formatDistanceBetween(currentLatLng, place.location);
-            place.setDistance(distance);
-            baseMarker.setTitle(place.name);
-            baseMarker.setPosition(
-                new fr.free.nrw.commons.location.LatLng(
-                    place.location.getLatitude(),
-                    place.location.getLongitude(), 0));
-            baseMarker.setPlace(place);
-            baseMarkersList.add(baseMarker);
-        }
-        return baseMarkersList;
-    }
-
-
-    /**
-     * Updates makerLabelList item isBookmarked value
-     *
-     * @param place        place which is bookmarked
-     * @param isBookmarked true is bookmarked, false if bookmark removed
-     */
-    @MainThread
-    public static void updateMarkerLabelListBookmark(Place place, boolean isBookmarked) {
-        for (ListIterator<MarkerPlaceGroup> iter = markerLabelList.listIterator();
-            iter.hasNext(); ) {
-            MarkerPlaceGroup markerPlaceGroup = iter.next();
-            if (markerPlaceGroup.getPlace().getWikiDataEntityId()
-                .equals(place.getWikiDataEntityId())) {
-                iter.set(new MarkerPlaceGroup(isBookmarked, place));
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.kt b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.kt
new file mode 100644
index 0000000000..952ec3fd27
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.kt
@@ -0,0 +1,334 @@
+package fr.free.nrw.commons.nearby
+
+import androidx.annotation.MainThread
+import fr.free.nrw.commons.BaseMarker
+import fr.free.nrw.commons.MapController
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween
+import fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween
+import timber.log.Timber
+import java.util.Collections
+import java.util.Locale
+import javax.inject.Inject
+import kotlin.math.cos
+import kotlin.math.min
+
+class NearbyController @Inject constructor(
+    private val nearbyPlaces: NearbyPlaces
+) : MapController() {
+    /**
+     * Prepares Place list to make their distance information update later.
+     *
+     * @param currentLatLng       current location for user
+     * @param searchLatLng        the location user wants to search around
+     * @param returnClosestResult if this search is done to find closest result or all results
+     * @param customQuery         if this search is done via an advanced query
+     * @return NearbyPlacesInfo a variable holds Place list without distance information and
+     * boundary coordinates of current Place List
+     */
+    @Throws(Exception::class)
+    fun loadAttractionsFromLocation(
+        currentLatLng: LatLng?,
+        searchLatLng: LatLng?,
+        returnClosestResult: Boolean, checkingAroundCurrentLocation: Boolean,
+        customQuery: String?
+    ): NearbyPlacesInfo? {
+        Timber.d("Loading attractions near %s", searchLatLng)
+        val nearbyPlacesInfo = NearbyPlacesInfo()
+        if (searchLatLng == null) {
+            Timber.d("Loading attractions nearby, but currentLatLng is null")
+            return null
+        }
+        val places = nearbyPlaces
+            .radiusExpander(
+                searchLatLng, Locale.getDefault().getLanguage(), returnClosestResult,
+                customQuery
+            )
+
+        if (null != places && places.size > 0) {
+            val boundaryCoordinates = arrayOf<LatLng>(
+                places.get(0).location!!,  // south
+                places.get(0).location!!,  // north
+                places.get(0).location!!,  // west
+                places.get(0).location!!
+            ) // east, init with a random location
+
+            if (currentLatLng != null) {
+                Timber.d("Sorting places by distance...")
+                val distances: MutableMap<Place, Double> = mutableMapOf()
+                for (place in places) {
+                    distances.put(place, computeDistanceBetween(place.location!!, currentLatLng))
+                    // Find boundaries with basic find max approach
+                    if (place.location!!.latitude < boundaryCoordinates[0].latitude) {
+                        boundaryCoordinates[0] = place.location!!
+                    }
+                    if (place.location!!.latitude > boundaryCoordinates[1].latitude) {
+                        boundaryCoordinates[1] = place.location!!
+                    }
+                    if (place.location!!.longitude < boundaryCoordinates[2].longitude) {
+                        boundaryCoordinates[2] = place.location!!
+                    }
+                    if (place.location!!.longitude > boundaryCoordinates[3].longitude) {
+                        boundaryCoordinates[3] = place.location!!
+                    }
+                }
+                Collections.sort(
+                    places,
+                    Comparator { lhs: Place?, rhs: Place? ->
+                        val lhsDistance: Double = distances[lhs]!!
+                        val rhsDistance: Double = distances[rhs]!!
+                        (lhsDistance - rhsDistance).toInt()
+                    }
+                )
+            }
+            nearbyPlacesInfo.currentLatLng = currentLatLng
+            nearbyPlacesInfo.searchLatLng = searchLatLng
+            nearbyPlacesInfo.placeList = places
+            nearbyPlacesInfo.boundaryCoordinates = boundaryCoordinates
+
+            // Returning closes result means we use the controller for nearby card. So no need to set search this area flags
+            if (!returnClosestResult) {
+                // To remember latest search either around user or any point on map
+                latestSearchLocation = searchLatLng
+                latestSearchRadius = nearbyPlaces.radius * 1000 // to meter
+
+                // Our radius searched around us, will be used to understand when user search their own location, we will follow them
+                if (checkingAroundCurrentLocation) {
+                    currentLocationSearchRadius = nearbyPlaces.radius * 1000 // to meter
+                    currentLocation = currentLatLng
+                }
+            }
+        }
+        return nearbyPlacesInfo
+    }
+
+    @Throws(Exception::class)
+    fun getPlacesAsKML(currentLocation: LatLng): String? {
+        return nearbyPlaces.getPlacesAsKML(
+            calculateSouthWest(currentLocation.latitude, currentLocation.longitude, 10.0),
+            calculateNorthEast(currentLocation.latitude, currentLocation.longitude, 10.0)
+        )
+    }
+
+    @Throws(Exception::class)
+    fun getPlacesAsGPX(currentLocation: LatLng): String? {
+        return nearbyPlaces.getPlacesAsGPX(
+            calculateSouthWest(currentLocation.latitude, currentLocation.longitude, 10.0),
+            calculateNorthEast(currentLocation.latitude, currentLocation.longitude, 10.0)
+        )
+    }
+
+    /**
+     * Retrieves a list of places based on the provided list of places and language.
+     *
+     * @param placeList A list of Place objects for which to fetch information.
+     * @return A list of Place objects obtained from the Wikidata query.
+     * @throws Exception If an error occurs during the retrieval process.
+     */
+    @Throws(Exception::class)
+    fun getPlaces(placeList: List<Place>?): List<Place>? {
+        return nearbyPlaces.getPlaces(placeList, Locale.getDefault().getLanguage())
+    }
+
+    /**
+     * Prepares Place list to make their distance information update later.
+     *
+     * @param currentLatLng                 The current latitude and longitude.
+     * @param screenTopRight                The top right corner of the screen (latitude,
+     * longitude).
+     * @param screenBottomLeft              The bottom left corner of the screen (latitude,
+     * longitude).
+     * @param searchLatLng                  The latitude and longitude of the search location.
+     * @param returnClosestResult           Flag indicating whether to return the closest result.
+     * @param checkingAroundCurrentLocation Flag indicating whether to check around the current
+     * location.
+     * @param shouldQueryForMonuments       Flag indicating whether to include monuments in the
+     * query.
+     * @param customQuery                   Optional custom SPARQL query to use instead of default
+     * queries.
+     * @return An object containing information about nearby places.
+     * @throws Exception If an error occurs during the retrieval process.
+     */
+    @Throws(Exception::class)
+    fun loadAttractionsFromLocation(
+        currentLatLng: LatLng,
+        screenTopRight: LatLng,
+        screenBottomLeft: LatLng,
+        searchLatLng: LatLng,
+        returnClosestResult: Boolean, checkingAroundCurrentLocation: Boolean,
+        shouldQueryForMonuments: Boolean, customQuery: String?
+    ): NearbyPlacesInfo? {
+        Timber.d("Loading attractions near %s", searchLatLng)
+        val nearbyPlacesInfo = NearbyPlacesInfo()
+
+        if (searchLatLng == null) {
+            Timber.d("Loading attractions nearby, but currentLatLng is null")
+            return null
+        }
+
+        val places = nearbyPlaces.getFromWikidataQuery(
+            currentLatLng, screenTopRight,
+            screenBottomLeft, Locale.getDefault().getLanguage(), shouldQueryForMonuments,
+            customQuery
+        )
+
+        if (null != places && places.size > 0) {
+            val boundaryCoordinates = arrayOf<LatLng>(
+                places.get(0).location!!,  // south
+                places.get(0).location!!,  // north
+                places.get(0).location!!,  // west
+                places.get(0).location!!
+            ) // east, init with a random location
+
+            if (currentLatLng != null) {
+                Timber.d("Sorting places by distance...")
+                val distances: MutableMap<Place, Double> = mutableMapOf()
+                for (place in places) {
+                    distances.put(place, computeDistanceBetween(place.location!!, currentLatLng))
+                    // Find boundaries with basic find max approach
+                    if (place.location!!.latitude < boundaryCoordinates[0].latitude) {
+                        boundaryCoordinates[0] = place.location!!
+                    }
+                    if (place.location!!.latitude > boundaryCoordinates[1].latitude) {
+                        boundaryCoordinates[1] = place.location!!
+                    }
+                    if (place.location!!.longitude < boundaryCoordinates[2].longitude) {
+                        boundaryCoordinates[2] = place.location!!
+                    }
+                    if (place.location!!.longitude > boundaryCoordinates[3].longitude) {
+                        boundaryCoordinates[3] = place.location!!
+                    }
+                }
+                Collections.sort<Place?>(
+                    places,
+                    Comparator { lhs: Place?, rhs: Place? ->
+                        val lhsDistance: Double = distances[lhs]!!
+                        val rhsDistance: Double = distances[rhs]!!
+                        (lhsDistance - rhsDistance).toInt()
+                    }
+                )
+            }
+            nearbyPlacesInfo.currentLatLng = currentLatLng
+            nearbyPlacesInfo.searchLatLng = searchLatLng
+            nearbyPlacesInfo.placeList = places
+            nearbyPlacesInfo.boundaryCoordinates = boundaryCoordinates
+
+            // Returning closes result means we use the controller for nearby card. So no need to set search this area flags
+            if (!returnClosestResult) {
+                // To remember latest search either around user or any point on map
+                latestSearchLocation = searchLatLng
+                latestSearchRadius = nearbyPlaces.radius * 1000 // to meter
+
+                // Our radius searched around us, will be used to understand when user search their own location, we will follow them
+                if (checkingAroundCurrentLocation) {
+                    currentLocationSearchRadius = nearbyPlaces.radius * 1000 // to meter
+                    currentLocation = currentLatLng
+                }
+            }
+        }
+        return nearbyPlacesInfo
+    }
+
+    /**
+     * Prepares Place list to make their distance information update later.
+     *
+     * @param currentLatLng       current location for user
+     * @param searchLatLng        the location user wants to search around
+     * @param returnClosestResult if this search is done to find closest result or all results
+     * @return NearbyPlacesInfo a variable holds Place list without distance information and
+     * boundary coordinates of current Place List
+     */
+    @Throws(Exception::class)
+    fun loadAttractionsFromLocation(
+        currentLatLng: LatLng?,
+        searchLatLng: LatLng?,
+        returnClosestResult: Boolean, checkingAroundCurrentLocation: Boolean
+    ): NearbyPlacesInfo? {
+        return loadAttractionsFromLocation(
+            currentLatLng, searchLatLng, returnClosestResult,
+            checkingAroundCurrentLocation, null
+        )
+    }
+
+    companion object {
+        const val MAX_RESULTS: Int = 1000
+        var currentLocationSearchRadius: Double = 10.0 //in kilometers
+        var currentLocation: LatLng? = null // Users latest fetched location
+        var latestSearchLocation: LatLng? =
+            null // Can be current and camera target on search this area button is used
+        var latestSearchRadius: Double = 10.0 // Any last search radius except closest result search
+
+        var markerLabelList: MutableList<MarkerPlaceGroup> = mutableListOf()
+
+        fun calculateNorthEast(latitude: Double, longitude: Double, distance: Double): LatLng {
+            val lat1 = Math.toRadians(latitude)
+            val deltaLat = distance * 0.008
+            val deltaLon = distance / cos(lat1) * 0.008
+            val lat2 = latitude + deltaLat
+            val lon2 = longitude + deltaLon
+
+            return LatLng(lat2, lon2, 0f)
+        }
+
+        fun calculateSouthWest(latitude: Double, longitude: Double, distance: Double): LatLng {
+            val lat1 = Math.toRadians(latitude)
+            val deltaLat = distance * 0.008
+            val deltaLon = distance / cos(lat1) * 0.008
+            val lat2 = latitude - deltaLat
+            val lon2 = longitude - deltaLon
+
+            return LatLng(lat2, lon2, 0f)
+        }
+
+        /**
+         * Loads attractions from location for map view, we need to return BaseMarkerOption data type.
+         *
+         * @param currentLatLng users current location
+         * @param placeList     list of nearby places in Place data type
+         * @return BaseMarkerOptions list that holds nearby places
+         */
+        fun loadAttractionsFromLocationToBaseMarkerOptions(
+            currentLatLng: LatLng?,
+            placeList: List<Place>?
+        ): MutableList<BaseMarker> {
+            var placeList = placeList
+            val baseMarkersList: MutableList<BaseMarker> = mutableListOf()
+
+            if (placeList == null) {
+                return baseMarkersList
+            }
+            placeList = placeList.subList(0, min(placeList.size, MAX_RESULTS))
+            for (place in placeList) {
+                val baseMarker = BaseMarker()
+                val distance = formatDistanceBetween(currentLatLng, place.location)
+                place.distance = distance
+                baseMarker.title = place.name!!
+                baseMarker.position = LatLng(
+                    place.location!!.latitude,
+                    place.location!!.longitude, 0f
+                )
+                baseMarker.place = place
+                baseMarkersList.add(baseMarker)
+            }
+            return baseMarkersList
+        }
+
+
+        /**
+         * Updates makerLabelList item isBookmarked value
+         *
+         * @param place        place which is bookmarked
+         * @param isBookmarked true is bookmarked, false if bookmark removed
+         */
+        @MainThread
+        fun updateMarkerLabelListBookmark(place: Place, isBookmarked: Boolean) {
+            val iter: MutableListIterator<MarkerPlaceGroup> = markerLabelList.listIterator()
+            while (iter.hasNext()) {
+                val markerPlaceGroup = iter.next()
+                if (markerPlaceGroup.place.wikiDataEntityId == place.wikiDataEntityId) {
+                    iter.set(MarkerPlaceGroup(isBookmarked, place))
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java
deleted file mode 100644
index 53e9970a65..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Filter;
-import android.widget.Filterable;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearSmoothScroller;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-
-import fr.free.nrw.commons.R;
-import java.util.Locale;
-
-public class NearbyFilterSearchRecyclerViewAdapter
-        extends RecyclerView.Adapter<NearbyFilterSearchRecyclerViewAdapter.RecyclerViewHolder>
-        implements Filterable {
-
-    private final LayoutInflater inflater;
-    private Context context;
-    private ArrayList<Label> labels;
-    private ArrayList<Label> displayedLabels;
-    public ArrayList<Label> selectedLabels = new ArrayList<>();
-
-    private int state;
-
-    private Callback callback;
-
-    RecyclerView.SmoothScroller smoothScroller;
-
-    public void setCallback(Callback callback) {
-        this.callback = callback;
-    }
-
-    public NearbyFilterSearchRecyclerViewAdapter(Context context, ArrayList<Label> labels, RecyclerView recyclerView) {
-        this.context = context;
-        this.labels = labels;
-        this.displayedLabels = labels;
-        smoothScroller = new
-                LinearSmoothScroller(context) {
-                    @Override protected int getVerticalSnapPreference() {
-                        return LinearSmoothScroller.SNAP_TO_START;
-                    }
-                };
-        inflater = LayoutInflater.from(context);
-    }
-
-    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
-        public TextView placeTypeLabel;
-        public ImageView placeTypeIcon;
-        public LinearLayout placeTypeLayout;
-
-        public RecyclerViewHolder(View view) {
-            super(view);
-            placeTypeLabel = view.findViewById(R.id.place_text);
-            placeTypeIcon = view.findViewById(R.id.place_icon);
-            placeTypeLayout = view.findViewById(R.id.search_list_item);
-        }
-    }
-
-    @NonNull
-    @Override
-    public RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View itemView = inflater.inflate(callback.isDarkTheme() ? R.layout.nearby_search_list_item_dark : R.layout.nearby_search_list_item, parent, false);
-        return new RecyclerViewHolder(itemView);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerViewHolder holder, int position) {
-        Label label = displayedLabels.get(position);
-        holder.placeTypeIcon.setImageResource(label.getIcon());
-        holder.placeTypeLabel.setText(label.toString());
-        holder.placeTypeLayout.setSelected(label.isSelected());
-
-        holder.placeTypeLayout.setOnClickListener(view -> {
-            callback.setCheckboxUnknown();
-
-            if (label.isSelected()) {
-                selectedLabels.remove(label);
-            } else {
-                selectedLabels.add(label);
-            }
-
-            label.setSelected(!label.isSelected());
-            holder.placeTypeLayout.setSelected(label.isSelected());
-
-            NearbyFilterState.setSelectedLabels(new ArrayList<>(selectedLabels));
-            callback.filterByMarkerType(selectedLabels, 0, false, false);
-        });
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return displayedLabels.get(position).hashCode();
-    }
-
-    @Override
-    public int getItemCount() {
-        return displayedLabels.size();
-    }
-
-    @Override
-    public Filter getFilter() {
-        return new Filter() {
-            @Override
-            protected FilterResults performFiltering(CharSequence constraint) {
-                FilterResults results = new FilterResults();
-                ArrayList<Label> filteredArrayList = new ArrayList<>();
-
-                if (labels == null) {
-                    labels = new ArrayList<>(displayedLabels);
-                }
-
-                if (constraint == null || constraint.length() == 0) {
-                    // set the Original result to return
-                    results.count = labels.size();
-                    results.values = labels;
-                } else {
-                    constraint = constraint.toString().toLowerCase(Locale.ROOT);
-
-                    for (Label label : labels) {
-                        String data = label.toString();
-                        if (data.toLowerCase(Locale.ROOT).startsWith(constraint.toString())) {
-                            filteredArrayList.add(Label.fromText(label.getText()));
-                        }
-                    }
-
-                    // set the Filtered result to return
-                    results.count = filteredArrayList.size();
-                    results.values = filteredArrayList;
-                }
-                return results;
-            }
-
-            @Override
-            protected void publishResults(CharSequence constraint, FilterResults results) {
-                displayedLabels = (ArrayList<Label>) results.values; // has the filtered values
-                notifyDataSetChanged();  // notifies the data with new filtered values
-            }
-        };
-    }
-
-    public void setRecyclerViewAdapterItemsGreyedOut() {
-        state = CheckBoxTriStates.UNCHECKED;
-        for (Label label : labels) {
-            label.setSelected(false);
-            selectedLabels.remove(label);
-        }
-        NearbyFilterState.setSelectedLabels(new ArrayList<>(selectedLabels));
-        notifyDataSetChanged();
-    }
-
-    public void setRecyclerViewAdapterAllSelected() {
-        state = CheckBoxTriStates.CHECKED;
-        for (Label label : labels) {
-            label.setSelected(true);
-            if (!selectedLabels.contains(label)) {
-                selectedLabels.add(label);
-            }
-        }
-        NearbyFilterState.setSelectedLabels(new ArrayList<>(selectedLabels));
-        notifyDataSetChanged();
-    }
-
-    public interface  Callback {
-
-        void setCheckboxUnknown();
-
-        void filterByMarkerType(ArrayList<Label> selectedLabels, int i, boolean b, boolean b1);
-
-        boolean isDarkTheme();
-    }
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.kt b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.kt
new file mode 100644
index 0000000000..c6908dd527
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.kt
@@ -0,0 +1,136 @@
+package fr.free.nrw.commons.nearby
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Filter
+import android.widget.Filterable
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.nearby.Label.Companion.fromText
+import fr.free.nrw.commons.nearby.NearbyFilterSearchRecyclerViewAdapter.RecyclerViewHolder
+
+class NearbyFilterSearchRecyclerViewAdapter(
+    context: Context, labels: MutableList<Label>
+) : RecyclerView.Adapter<RecyclerViewHolder?>(), Filterable {
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+    private var labels: MutableList<Label>? = labels
+    private var displayedLabels: MutableList<Label> = labels
+    var callback: Callback? = null
+    var selectedLabels: MutableList<Label> = mutableListOf()
+
+    class RecyclerViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        var placeTypeLabel: TextView? = view.findViewById(R.id.place_text)
+        var placeTypeIcon: ImageView? = view.findViewById(R.id.place_icon)
+        var placeTypeLayout: LinearLayout? = view.findViewById(R.id.search_list_item)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerViewHolder {
+        return RecyclerViewHolder(
+            inflater.inflate(
+                if (callback!!.isDarkTheme) R.layout.nearby_search_list_item_dark else R.layout.nearby_search_list_item,
+                parent,
+                false
+            )
+        )
+    }
+
+    override fun onBindViewHolder(holder: RecyclerViewHolder, position: Int) {
+        val label = displayedLabels[position]
+        holder.placeTypeIcon?.setImageResource(label.icon)
+        holder.placeTypeLabel?.text = label.toString()
+        holder.placeTypeLayout?.isSelected = label.isSelected
+
+        holder.placeTypeLayout?.setOnClickListener {
+            callback!!.setCheckboxUnknown()
+            if (label.isSelected) {
+                selectedLabels.remove(label)
+            } else {
+                selectedLabels.add(label)
+            }
+
+            label.isSelected = !label.isSelected
+            holder.placeTypeLayout?.isSelected = label.isSelected
+
+            NearbyFilterState.setSelectedLabels(selectedLabels)
+            callback!!.filterByMarkerType(selectedLabels, 0, false, false)
+        }
+    }
+
+    override fun getItemId(position: Int): Long = displayedLabels[position].hashCode().toLong()
+
+    override fun getItemCount(): Int = displayedLabels.size
+
+    override fun getFilter(): Filter {
+        return object : Filter() {
+            override fun performFiltering(constraint: CharSequence?): FilterResults {
+                var constraint = constraint
+                val results = FilterResults()
+                val filteredArrayList = mutableListOf<Label>()
+
+                if (labels == null) {
+                    labels = mutableListOf()
+                }
+
+                if (constraint == null || constraint.length == 0) {
+                    // set the Original result to return
+                    results.count = labels!!.size
+                    results.values = labels
+                } else {
+                    constraint = constraint.toString().lowercase()
+
+                    for (label in labels!!) {
+                        val data = label.toString()
+                        if (data.lowercase().startsWith(constraint)) {
+                            filteredArrayList.add(fromText(label.text))
+                        }
+                    }
+
+                    // set the Filtered result to return
+                    results.count = filteredArrayList.size
+                    results.values = filteredArrayList
+                }
+                return results
+            }
+
+            override fun publishResults(constraint: CharSequence?, results: FilterResults) {
+                displayedLabels = results.values as ArrayList<Label> // has the filtered values
+                notifyDataSetChanged() // notifies the data with new filtered values
+            }
+        }
+    }
+
+    fun setRecyclerViewAdapterItemsGreyedOut() {
+        for (label in labels!!) {
+            label.isSelected = false
+            selectedLabels.remove(label)
+        }
+        NearbyFilterState.setSelectedLabels(selectedLabels)
+        notifyDataSetChanged()
+    }
+
+    fun setRecyclerViewAdapterAllSelected() {
+        for (label in labels!!) {
+            label.isSelected = true
+            if (!selectedLabels.contains(label)) {
+                selectedLabels.add(label)
+            }
+        }
+        NearbyFilterState.setSelectedLabels(selectedLabels)
+        notifyDataSetChanged()
+    }
+
+    interface Callback {
+        fun setCheckboxUnknown()
+
+        fun filterByMarkerType(
+            selectedLabels: List<Label>, i: Int, filterForPlaceState: Boolean, filterForAllNoneType: Boolean
+        )
+
+        val isDarkTheme: Boolean
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterState.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterState.java
deleted file mode 100644
index d0aec96afd..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterState.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import java.util.ArrayList;
-
-public class NearbyFilterState {
-    private boolean existsSelected;
-    private boolean needPhotoSelected;
-    private boolean wlmSelected;
-    private int checkBoxTriState;
-    private ArrayList<Label> selectedLabels;
-
-    private static NearbyFilterState nearbyFilterStateInstance;
-
-    /**
-     * Define initial filter values here
-     */
-    private NearbyFilterState() {
-        existsSelected = true;
-        needPhotoSelected = true;
-        wlmSelected = true;
-        checkBoxTriState = -1; // Unknown
-        selectedLabels = new ArrayList<>(); // Initially empty
-    }
-
-    public static NearbyFilterState getInstance() {
-        if (nearbyFilterStateInstance == null) {
-            nearbyFilterStateInstance = new NearbyFilterState();
-        }
-        return nearbyFilterStateInstance;
-    }
-
-    public static void setSelectedLabels(ArrayList<Label> selectedLabels) {
-        getInstance().selectedLabels = selectedLabels;
-    }
-
-    public static void setExistsSelected(boolean existsSelected) {
-        getInstance().existsSelected = existsSelected;
-    }
-
-    public static void setNeedPhotoSelected(boolean needPhotoSelected) {
-        getInstance().needPhotoSelected = needPhotoSelected;
-    }
-
-    public static void setWlmSelected(final boolean wlmSelected) {
-        getInstance().wlmSelected = wlmSelected;
-    }
-
-    public boolean isWlmSelected() {
-        return wlmSelected;
-    }
-
-    public boolean isExistsSelected() {
-        return existsSelected;
-    }
-
-    public boolean isNeedPhotoSelected() {
-        return needPhotoSelected;
-    }
-
-    public int getCheckBoxTriState() {
-        return checkBoxTriState;
-    }
-
-    public ArrayList<Label> getSelectedLabels() {
-        return selectedLabels;
-    }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterState.kt b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterState.kt
new file mode 100644
index 0000000000..64020bcb33
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterState.kt
@@ -0,0 +1,29 @@
+package fr.free.nrw.commons.nearby
+
+object NearbyFilterState {
+    var isExistsSelected: Boolean = true
+        private set
+    var isNeedPhotoSelected: Boolean = true
+        private set
+    var isWlmSelected: Boolean = true
+        private set
+    val checkBoxTriState: Int = -1
+    var selectedLabels: List<Label> = emptyList()
+        private set
+
+    fun setSelectedLabels(labels: List<Label>) {
+        selectedLabels = labels
+    }
+
+    fun setExistsSelected(existsSelected: Boolean) {
+        isExistsSelected = existsSelected
+    }
+
+    fun setNeedPhotoSelected(needPhotoSelected: Boolean) {
+        isNeedPhotoSelected = needPhotoSelected
+    }
+
+    fun setWlmSelected(wlmSelected: Boolean) {
+        isWlmSelected = wlmSelected
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java
deleted file mode 100644
index 495c2d2f6f..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.contributions.MainActivity;
-import fr.free.nrw.commons.utils.SwipableCardView;
-import fr.free.nrw.commons.utils.ViewUtil;
-import timber.log.Timber;
-
-/**
- * Custom card view for nearby notification card view on main screen, above contributions list
- */
-public class NearbyNotificationCardView extends SwipableCardView {
-    public Button permissionRequestButton;
-    private LinearLayout contentLayout;
-    private TextView notificationTitle;
-    private TextView notificationDistance;
-    private ImageView notificationIcon;
-    private ImageView notificationCompass;
-    private ProgressBar progressBar;
-
-    public CardViewVisibilityState cardViewVisibilityState;
-
-    public PermissionType permissionType;
-
-    public NearbyNotificationCardView(@NonNull Context context) {
-        super(context);
-        cardViewVisibilityState = CardViewVisibilityState.INVISIBLE;
-        init();
-    }
-
-    public NearbyNotificationCardView(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        cardViewVisibilityState = CardViewVisibilityState.INVISIBLE;
-        init();
-    }
-
-    public NearbyNotificationCardView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        cardViewVisibilityState = CardViewVisibilityState.INVISIBLE;
-        init();
-    }
-
-    /**
-     * Initializes views and action listeners
-     */
-    private void init() {
-        View rootView = inflate(getContext(), R.layout.nearby_card_view, this);
-
-        permissionRequestButton = rootView.findViewById(R.id.permission_request_button);
-        contentLayout = rootView.findViewById(R.id.content_layout);
-
-        notificationTitle = rootView.findViewById(R.id.nearby_title);
-        notificationDistance = rootView.findViewById(R.id.nearby_distance);
-
-        notificationIcon = rootView.findViewById(R.id.nearby_icon);
-        notificationCompass = rootView.findViewById(R.id.nearby_compass);
-
-        progressBar = rootView.findViewById(R.id.progressBar);
-
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        // If you don't setVisibility after getting layout params, then you will se an empty space in place of nearby NotificationCardView
-        if (getContext() instanceof MainActivity && ((MainActivity)getContext()).defaultKvStore.getBoolean("displayNearbyCardView", true) && this.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
-            setVisibility(VISIBLE);
-        } else {
-            setVisibility(GONE);
-        }
-    }
-
-
-    private void setActionListeners(Place place) {
-        this.setOnClickListener(view -> {
-            ((MainActivity) getContext()).centerMapToPlace(place);
-        });
-    }
-
-    @Override public boolean onSwipe(View view) {
-        view.setVisibility(GONE);
-        // Save shared preference for nearby card view accordingly
-        ((MainActivity) getContext()).defaultKvStore.putBoolean("displayNearbyCardView", false);
-        ViewUtil.showLongToast(getContext(),
-            getResources().getString(R.string.nearby_notification_dismiss_message));
-        return true;
-    }
-
-    /**
-     * Time is up, data for card view is not ready, so do not display it
-     */
-    private void errorOccurred() {
-        this.setVisibility(GONE);
-    }
-
-    /**
-     * Data for card view is ready, display card view
-     */
-    private void succeeded() {
-        this.setVisibility(VISIBLE);
-    }
-
-    /**
-     * Pass place information to views
-     *
-     * @param place Closes place where we will get information from
-     */
-    public void updateContent(Place place) {
-        Timber.d("Update nearby card notification content");
-        this.setVisibility(VISIBLE);
-        cardViewVisibilityState = CardViewVisibilityState.READY;
-        permissionRequestButton.setVisibility(GONE);
-        contentLayout.setVisibility(VISIBLE);
-        // Make progress bar invisible once data is ready
-        progressBar.setVisibility(GONE);
-        setActionListeners(place);
-        // And content views visible since they are ready
-        notificationTitle.setVisibility(VISIBLE);
-        notificationDistance.setVisibility(VISIBLE);
-        notificationIcon.setVisibility(VISIBLE);
-        notificationTitle.setText(place.name);
-        notificationDistance.setText(place.distance);
-    }
-
-    @Override
-    protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
-        super.onVisibilityChanged(changedView, visibility);
-        if (visibility == VISIBLE) {
-            /*
-              Sometimes we need to preserve previous state of notification card view without getting
-              any data from user. Ie. wen user came back from Media Details fragment to Contrib List
-              fragment, we need to know what was the state of card view, and set it to exact same state.
-             */
-            switch (cardViewVisibilityState) {
-                case READY:
-                    permissionRequestButton.setVisibility(GONE);
-                    contentLayout.setVisibility(VISIBLE);
-                    // Make progress bar invisible once data is ready
-                    progressBar.setVisibility(GONE);
-                    // And content views visible since they are ready
-                    notificationTitle.setVisibility(VISIBLE);
-                    notificationDistance.setVisibility(VISIBLE);
-                    notificationIcon.setVisibility(VISIBLE);
-                    notificationCompass.setVisibility(VISIBLE);
-                    break;
-                case LOADING:
-                    permissionRequestButton.setVisibility(GONE);
-                    contentLayout.setVisibility(VISIBLE);
-                    // Set visibility of elements in content layout once it become visible
-                    progressBar.setVisibility(VISIBLE);
-                    notificationTitle.setVisibility(GONE);
-                    notificationDistance.setVisibility(GONE);
-                    notificationIcon.setVisibility(GONE);
-                    notificationCompass.setVisibility(GONE);
-                    permissionRequestButton.setVisibility(GONE);
-                    break;
-                case ASK_PERMISSION:
-                    contentLayout.setVisibility(GONE);
-                    permissionRequestButton.setVisibility(VISIBLE);
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    /**
-     * This states will help us to preserve progress bar and content layout states
-     */
-    public enum CardViewVisibilityState {
-        LOADING,
-        READY,
-        INVISIBLE,
-        ASK_PERMISSION,
-        ERROR_OCCURRED
-    }
-
-    /**
-     * We need to know which kind of permission we need to request, then update permission request
-     * button action accordingly
-     */
-    public enum PermissionType {
-        ENABLE_GPS,
-        ENABLE_LOCATION_PERMISSION, // For only after Marshmallow
-        NO_PERMISSION_NEEDED
-    }
-
-    /**
-     * Rotates the compass arrow in tandem with the rotation of device
-     *
-     * @param rotateDegree Degree by which device was rotated
-     * @param direction Direction in which arrow has to point
-     */
-    public void rotateCompass(float rotateDegree, float direction){
-        notificationCompass.setRotation(-(rotateDegree-direction));
-    }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.kt b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.kt
new file mode 100644
index 0000000000..7acfce5683
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.kt
@@ -0,0 +1,195 @@
+package fr.free.nrw.commons.nearby
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.ProgressBar
+import android.widget.TextView
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.contributions.MainActivity
+import fr.free.nrw.commons.nearby.NearbyNotificationCardView.CardViewVisibilityState.READY
+import fr.free.nrw.commons.utils.SwipableCardView
+import fr.free.nrw.commons.utils.ViewUtil.showLongToast
+import timber.log.Timber
+
+/**
+ * Custom card view for nearby notification card view on main screen, above contributions list
+ */
+class NearbyNotificationCardView : SwipableCardView {
+    var permissionRequestButton: Button? = null
+    private var contentLayout: LinearLayout? = null
+    private var notificationTitle: TextView? = null
+    private var notificationDistance: TextView? = null
+    private var notificationIcon: ImageView? = null
+    private var notificationCompass: ImageView? = null
+    private var progressBar: ProgressBar? = null
+    var cardViewVisibilityState: CardViewVisibilityState
+    var permissionType: PermissionType? = null
+
+    constructor(context: Context) : super(context) {
+        cardViewVisibilityState = CardViewVisibilityState.INVISIBLE
+        initUI()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        cardViewVisibilityState = CardViewVisibilityState.INVISIBLE
+        initUI()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        cardViewVisibilityState = CardViewVisibilityState.INVISIBLE
+        initUI()
+    }
+
+    /**
+     * Initializes views and action listeners
+     */
+    private fun initUI() {
+        val rootView = inflate(context, R.layout.nearby_card_view, this)
+
+        permissionRequestButton = rootView.findViewById(R.id.permission_request_button)
+        contentLayout = rootView.findViewById(R.id.content_layout)
+
+        notificationTitle = rootView.findViewById(R.id.nearby_title)
+        notificationDistance = rootView.findViewById(R.id.nearby_distance)
+
+        notificationIcon = rootView.findViewById(R.id.nearby_icon)
+        notificationCompass = rootView.findViewById(R.id.nearby_compass)
+
+        progressBar = rootView.findViewById(R.id.progressBar)
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        // If you don't setVisibility after getting layout params, then you will se an empty space in place of nearby NotificationCardView
+        if (context is MainActivity && (context as MainActivity).defaultKvStore.getBoolean("displayNearbyCardView", true) && cardViewVisibilityState == READY) {
+            visibility = VISIBLE
+        } else {
+            visibility = GONE
+        }
+    }
+
+
+    private fun setActionListeners(place: Place?) {
+        setOnClickListener { (context as MainActivity).centerMapToPlace(place) }
+    }
+
+    override fun onSwipe(view: View): Boolean {
+        view.visibility = GONE
+        // Save shared preference for nearby card view accordingly
+        (context as MainActivity).defaultKvStore.putBoolean("displayNearbyCardView", false)
+        showLongToast(
+            context,
+            resources.getString(R.string.nearby_notification_dismiss_message)
+        )
+        return true
+    }
+
+    /**
+     * Time is up, data for card view is not ready, so do not display it
+     */
+    private fun errorOccurred() {
+        visibility = GONE
+    }
+
+    /**
+     * Data for card view is ready, display card view
+     */
+    private fun succeeded() {
+        visibility = VISIBLE
+    }
+
+    /**
+     * Pass place information to views
+     */
+    fun updateContent(place: Place) {
+        Timber.d("Update nearby card notification content")
+        visibility = VISIBLE
+        cardViewVisibilityState = READY
+        permissionRequestButton!!.visibility = GONE
+        contentLayout!!.visibility = VISIBLE
+        // Make progress bar invisible once data is ready
+        progressBar!!.visibility = GONE
+        setActionListeners(place)
+        // And content views visible since they are ready
+        notificationTitle!!.visibility = VISIBLE
+        notificationDistance!!.visibility = VISIBLE
+        notificationIcon!!.setVisibility(VISIBLE)
+        notificationTitle!!.text = place.name
+        notificationDistance!!.text = place.distance
+    }
+
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        super.onVisibilityChanged(changedView, visibility)
+        if (visibility == VISIBLE) {
+            /*
+              Sometimes we need to preserve previous state of notification card view without getting
+              any data from user. Ie. wen user came back from Media Details fragment to Contrib List
+              fragment, we need to know what was the state of card view, and set it to exact same state.
+             */
+            when (cardViewVisibilityState) {
+                READY -> {
+                    permissionRequestButton!!.visibility = GONE
+                    contentLayout!!.visibility = VISIBLE
+                    // Make progress bar invisible once data is ready
+                    progressBar!!.visibility = GONE
+                    // And content views visible since they are ready
+                    notificationTitle!!.visibility = VISIBLE
+                    notificationDistance!!.visibility = VISIBLE
+                    notificationIcon!!.setVisibility(VISIBLE)
+                    notificationCompass!!.setVisibility(VISIBLE)
+                }
+
+                CardViewVisibilityState.LOADING -> {
+                    permissionRequestButton!!.visibility = GONE
+                    contentLayout!!.visibility = VISIBLE
+                    // Set visibility of elements in content layout once it become visible
+                    progressBar!!.visibility = VISIBLE
+                    notificationTitle!!.visibility = GONE
+                    notificationDistance!!.visibility = GONE
+                    notificationIcon!!.setVisibility(GONE)
+                    notificationCompass!!.setVisibility(GONE)
+                    permissionRequestButton!!.visibility = GONE
+                }
+
+                CardViewVisibilityState.ASK_PERMISSION -> {
+                    contentLayout!!.visibility = GONE
+                    permissionRequestButton!!.visibility = VISIBLE
+                }
+
+                else -> {}
+            }
+        }
+    }
+
+    /**
+     * This states will help us to preserve progress bar and content layout states
+     */
+    enum class CardViewVisibilityState {
+        LOADING,
+        READY,
+        INVISIBLE,
+        ASK_PERMISSION,
+        ERROR_OCCURRED
+    }
+
+    /**
+     * We need to know which kind of permission we need to request, then update permission request
+     * button action accordingly
+     */
+    enum class PermissionType {
+        ENABLE_GPS,
+        ENABLE_LOCATION_PERMISSION,  // For only after Marshmallow
+        NO_PERMISSION_NEEDED
+    }
+
+    /**
+     * Rotates the compass arrow in tandem with the rotation of device
+     */
+    fun rotateCompass(rotateDegree: Float, direction: Float) {
+        notificationCompass!!.rotation = -(rotateDegree - direction)
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
deleted file mode 100644
index 3bb2f549f0..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import static java.util.Collections.emptyList;
-
-import android.location.Location;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import fr.free.nrw.commons.nearby.model.NearbyQueryParams;
-import fr.free.nrw.commons.nearby.model.NearbyQueryParams.Radial;
-import fr.free.nrw.commons.nearby.model.NearbyQueryParams.Rectangular;
-import java.io.IOException;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
-import timber.log.Timber;
-
-/**
- * Handles the Wikidata query to obtain Places around search location
- */
-@Singleton
-public class NearbyPlaces {
-
-    private static final double INITIAL_RADIUS = 0.3; // in kilometers
-    private static final double RADIUS_MULTIPLIER = 2.0;
-    public double radius = INITIAL_RADIUS;
-
-    private final OkHttpJsonApiClient okHttpJsonApiClient;
-
-    /**
-     * Reads Wikidata query to check nearby wikidata items which needs picture, with a circular
-     * search. As a point is center of a circle with a radius will be set later.
-     *
-     * @param okHttpJsonApiClient
-     */
-    @Inject
-    public NearbyPlaces(OkHttpJsonApiClient okHttpJsonApiClient) {
-        this.okHttpJsonApiClient = okHttpJsonApiClient;
-    }
-
-    /**
-     * Expands the radius as needed for the Wikidata query
-     *
-     * @param currentLatLng           coordinates of search location
-     * @param lang                user's language
-     * @param returnClosestResult true if only the nearest point is desired
-     * @param customQuery
-     * @return list of places obtained
-     */
-    @NonNull
-    List<Place> radiusExpander(final LatLng currentLatLng, final String lang,
-        final boolean returnClosestResult, @Nullable final String customQuery) throws Exception {
-
-        final int minResults;
-        final double maxRadius;
-
-        List<Place> places = emptyList();
-
-        // If returnClosestResult is true, then this means that we are trying to get closest point
-        // to use in cardView in Contributions fragment
-        if (returnClosestResult) {
-            minResults = 1; // Return closest nearby place
-            maxRadius = 5;  // Return places only in 5 km area
-            radius = INITIAL_RADIUS; // refresh radius again, otherwise increased radius is grater than MAX_RADIUS, thus returns null
-        } else {
-            minResults = 20;
-            maxRadius = 300.0; // in kilometers
-            radius = INITIAL_RADIUS;
-        }
-
-        // Increase the radius gradually to find a satisfactory number of nearby places
-        while (radius <= maxRadius) {
-            places = getFromWikidataQuery(currentLatLng, lang, radius, customQuery);
-            Timber.d("%d results at radius: %f", places.size(), radius);
-            if (places.size() >= minResults) {
-                break;
-            }
-            radius *= RADIUS_MULTIPLIER;
-        }
-        // make sure we will be able to send at least one request next time
-        if (radius > maxRadius) {
-            radius = maxRadius;
-        }
-        return places;
-    }
-
-    /**
-     * Runs the Wikidata query to populate the Places around search location
-     *
-     * @param cur         coordinates of search location
-     * @param lang        user's language
-     * @param radius      radius for search, as determined by radiusExpander()
-     * @param customQuery
-     * @return list of places obtained
-     * @throws IOException if query fails
-     */
-    public List<Place> getFromWikidataQuery(final LatLng cur, final String lang,
-        final double radius,
-        @Nullable final String customQuery) throws Exception {
-        return okHttpJsonApiClient
-            .getNearbyPlaces(cur, lang, radius, customQuery);
-    }
-
-    /**
-     * Retrieves a list of places from a Wikidata query based on screen coordinates and optional
-     * parameters.
-     *
-     * @param centerPoint             The center of the map, used for radius queries if required.
-     * @param screenTopRight          The top right corner of the screen (latitude, longitude).
-     * @param screenBottomLeft        The bottom left corner of the screen (latitude, longitude).
-     * @param lang                    The language for the query.
-     * @param shouldQueryForMonuments Flag indicating whether to include monuments in the query.
-     * @param customQuery             Optional custom SPARQL query to use instead of default
-     *                                queries.
-     * @return A list of places obtained from the Wikidata query.
-     * @throws Exception If an error occurs during the retrieval process.
-     */
-    @NonNull
-    public List<Place> getFromWikidataQuery(
-        final fr.free.nrw.commons.location.LatLng centerPoint,
-        final fr.free.nrw.commons.location.LatLng screenTopRight,
-        final fr.free.nrw.commons.location.LatLng screenBottomLeft, final String lang,
-        final boolean shouldQueryForMonuments,
-        @Nullable final String customQuery) throws Exception {
-        if (customQuery != null) {
-            final List<Place> nearbyPlaces = okHttpJsonApiClient.getNearbyPlaces(
-                    new Rectangular(screenTopRight, screenBottomLeft), lang,
-                    shouldQueryForMonuments,
-                    customQuery);
-            return nearbyPlaces != null ? nearbyPlaces : emptyList();
-        }
-
-        final int lowerLimit = 1000, upperLimit = 1500;
-
-        final float[] results = new float[1];
-        Location.distanceBetween(centerPoint.getLatitude(), screenTopRight.getLongitude(),
-            centerPoint.getLatitude(), screenBottomLeft.getLongitude(), results);
-        final float longGap = results[0] / 1000f;
-        Location.distanceBetween(screenTopRight.getLatitude(), centerPoint.getLongitude(),
-            screenBottomLeft.getLatitude(), centerPoint.getLongitude(), results);
-        final float latGap = results[0] / 1000f;
-
-        if (Math.max(longGap, latGap) < 100f) {
-            final int itemCount = okHttpJsonApiClient.getNearbyItemCount(
-                new NearbyQueryParams.Rectangular(screenTopRight, screenBottomLeft));
-            if (itemCount < upperLimit) {
-                final List<Place> nearbyPlaces = okHttpJsonApiClient.getNearbyPlaces(
-                    new Rectangular(screenTopRight, screenBottomLeft), lang,
-                    shouldQueryForMonuments, null);
-                return nearbyPlaces != null ? nearbyPlaces : emptyList();
-            }
-        }
-
-        // minRadius, targetRadius and maxRadius are radii in decameters
-        // unlike other radii here, which are in kilometers, to avoid looping over
-        // floating point values
-        int minRadius = 0, maxRadius = Math.round(Math.min(300f, Math.min(longGap, latGap))) * 100;
-        int targetRadius = maxRadius / 2;
-        while (minRadius < maxRadius) {
-            targetRadius = minRadius + (maxRadius - minRadius + 1) / 2;
-            final int itemCount = okHttpJsonApiClient.getNearbyItemCount(
-                new NearbyQueryParams.Radial(centerPoint, targetRadius / 100f));
-            if (itemCount >= lowerLimit && itemCount < upperLimit) {
-                break;
-            }
-            if (targetRadius > maxRadius / 2 && itemCount < lowerLimit / 5) { // fast forward
-                minRadius = targetRadius;
-                targetRadius = minRadius + (maxRadius - minRadius + 1) / 2;
-                minRadius = targetRadius;
-                if (itemCount < lowerLimit / 10 && minRadius < maxRadius) { // fast forward again
-                    targetRadius = minRadius + (maxRadius - minRadius + 1) / 2;
-                    minRadius = targetRadius;
-                }
-                continue;
-            }
-            if (itemCount < upperLimit) {
-                minRadius = targetRadius;
-            } else {
-                maxRadius = targetRadius - 1;
-            }
-        }
-        final List<Place> nearbyPlaces = okHttpJsonApiClient.getNearbyPlaces(
-            new Radial(centerPoint, targetRadius / 100f), lang, shouldQueryForMonuments,
-            null);
-        return nearbyPlaces != null ? nearbyPlaces : emptyList();
-    }
-
-    /**
-     * Retrieves a list of places based on the provided list of places and language.
-     *
-     * This method fetches place information from a Wikidata query using the specified language.
-     *
-     * @param placeList A list of Place objects for which to fetch information.
-     * @param lang      The language code to use for the query.
-     * @return A list of Place objects obtained from the Wikidata query.
-     * @throws Exception If an error occurs during the retrieval process.
-     */
-    public List<Place> getPlaces(final List<Place> placeList,
-        final String lang) throws Exception {
-        return okHttpJsonApiClient
-            .getPlaces(placeList, lang);
-    }
-
-    /**
-     * Runs the Wikidata query to retrieve the KML String
-     *
-     * @param leftLatLng  coordinates of Left Most position
-     * @param rightLatLng coordinates of Right Most position
-     * @throws IOException if query fails
-     */
-    public String getPlacesAsKML(LatLng leftLatLng, LatLng rightLatLng) throws Exception {
-        return okHttpJsonApiClient.getPlacesAsKML(leftLatLng, rightLatLng);
-    }
-
-    /**
-     * Runs the Wikidata query to retrieve the GPX String
-     *
-     * @param leftLatLng  coordinates of Left Most position
-     * @param rightLatLng coordinates of Right Most position
-     * @throws IOException if query fails
-     */
-    public String getPlacesAsGPX(LatLng leftLatLng, LatLng rightLatLng) throws Exception {
-        return okHttpJsonApiClient.getPlacesAsGPX(leftLatLng, rightLatLng);
-    }
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.kt b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.kt
new file mode 100644
index 0000000000..67ab9b2914
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.kt
@@ -0,0 +1,194 @@
+package fr.free.nrw.commons.nearby
+
+import android.location.Location
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
+import fr.free.nrw.commons.nearby.model.NearbyQueryParams.Radial
+import fr.free.nrw.commons.nearby.model.NearbyQueryParams.Rectangular
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * Handles the Wikidata query to obtain Places around search location.
+ * Reads Wikidata query to check nearby wikidata items which needs picture, with a circular
+ * search. As a point is center of a circle with a radius will be set later.
+ */
+@Singleton
+class NearbyPlaces @Inject constructor(private val okHttpJsonApiClient: OkHttpJsonApiClient) {
+    var radius: Double = INITIAL_RADIUS
+
+    /**
+     * Expands the radius as needed for the Wikidata query
+     */
+    @Throws(Exception::class)
+    fun radiusExpander(
+        currentLatLng: LatLng, lang: String, returnClosestResult: Boolean, customQuery: String?
+    ): List<Place>? {
+        val minResults: Int
+        val maxRadius: Double
+
+        var places: List<Place>? = emptyList()
+
+        // If returnClosestResult is true, then this means that we are trying to get closest point
+        // to use in cardView in Contributions fragment
+        if (returnClosestResult) {
+            minResults = 1 // Return closest nearby place
+            maxRadius = 5.0 // Return places only in 5 km area
+            radius = INITIAL_RADIUS // refresh radius again, otherwise increased radius is grater than MAX_RADIUS, thus returns null
+        } else {
+            minResults = 20
+            maxRadius = 300.0 // in kilometers
+            radius = INITIAL_RADIUS
+        }
+
+        // Increase the radius gradually to find a satisfactory number of nearby places
+        while (radius <= maxRadius) {
+            places = getFromWikidataQuery(currentLatLng, lang, radius, customQuery)
+            val size = places?.size ?: 0
+            Timber.d("%d results at radius: %f", size, radius)
+            if (size >= minResults) {
+                break
+            }
+            radius *= RADIUS_MULTIPLIER
+        }
+        // make sure we will be able to send at least one request next time
+        if (radius > maxRadius) {
+            radius = maxRadius
+        }
+        return places
+    }
+
+    /**
+     * Runs the Wikidata query to populate the Places around search location
+     */
+    @Throws(Exception::class)
+    fun getFromWikidataQuery(
+        cur: LatLng, lang: String, radius: Double, customQuery: String?
+    ): List<Place>? = okHttpJsonApiClient.getNearbyPlaces(cur, lang, radius, customQuery)
+
+    /**
+     * Retrieves a list of places from a Wikidata query based on screen coordinates and optional
+     * parameters.
+     */
+    @Throws(Exception::class)
+    fun getFromWikidataQuery(
+        centerPoint: LatLng,
+        screenTopRight: LatLng,
+        screenBottomLeft: LatLng,
+        lang: String,
+        shouldQueryForMonuments: Boolean,
+        customQuery: String?
+    ): List<Place>? {
+        if (customQuery != null) {
+            val nearbyPlaces: List<Place>? = okHttpJsonApiClient.getNearbyPlaces(
+                Rectangular(screenTopRight, screenBottomLeft),
+                lang,
+                shouldQueryForMonuments,
+                customQuery
+            )
+            return nearbyPlaces ?: listOf()
+        }
+
+        val lowerLimit = 1000
+        val upperLimit = 1500
+
+        val results = FloatArray(1)
+        Location.distanceBetween(
+            centerPoint.latitude,
+            screenTopRight.longitude,
+            centerPoint.latitude,
+            screenBottomLeft.longitude,
+            results
+        )
+        val longGap = results[0] / 1000f
+        Location.distanceBetween(
+            screenTopRight.latitude,
+            centerPoint.longitude,
+            screenBottomLeft.latitude,
+            centerPoint.longitude,
+            results
+        )
+        val latGap = results[0] / 1000f
+
+        if (max(longGap, latGap) < 100f) {
+            val itemCount = okHttpJsonApiClient.getNearbyItemCount(
+                Rectangular(screenTopRight, screenBottomLeft)
+            )
+            if (itemCount < upperLimit) {
+                val nearbyPlaces: List<Place>? = okHttpJsonApiClient.getNearbyPlaces(
+                    Rectangular(screenTopRight, screenBottomLeft),
+                    lang,
+                    shouldQueryForMonuments,
+                    null
+                )
+                return nearbyPlaces ?: emptyList()
+            }
+        }
+
+        // minRadius, targetRadius and maxRadius are radii in decameters
+        // unlike other radii here, which are in kilometers, to avoid looping over
+        // floating point values
+        var minRadius = 0
+        var maxRadius = Math.round(min(300f, min(longGap, latGap))) * 100
+        var targetRadius = maxRadius / 2
+        while (minRadius < maxRadius) {
+            targetRadius = minRadius + (maxRadius - minRadius + 1) / 2
+            val itemCount = okHttpJsonApiClient.getNearbyItemCount(
+                Radial(centerPoint, targetRadius / 100f)
+            )
+            if (itemCount >= lowerLimit && itemCount < upperLimit) {
+                break
+            }
+            if (targetRadius > maxRadius / 2 && itemCount < lowerLimit / 5) { // fast forward
+                minRadius = targetRadius
+                targetRadius = minRadius + (maxRadius - minRadius + 1) / 2
+                minRadius = targetRadius
+                if (itemCount < lowerLimit / 10 && minRadius < maxRadius) { // fast forward again
+                    targetRadius = minRadius + (maxRadius - minRadius + 1) / 2
+                    minRadius = targetRadius
+                }
+                continue
+            }
+            if (itemCount < upperLimit) {
+                minRadius = targetRadius
+            } else {
+                maxRadius = targetRadius - 1
+            }
+        }
+        val nearbyPlaces: List<Place>? = okHttpJsonApiClient.getNearbyPlaces(
+            Radial(centerPoint, targetRadius / 100f), lang, shouldQueryForMonuments, null
+        )
+        return nearbyPlaces ?: emptyList()
+    }
+
+    /**
+     * Retrieves a list of places based on the provided list of places and language.
+     * This method fetches place information from a Wikidata query using the specified language.
+     */
+    @Throws(Exception::class)
+    fun getPlaces(
+        placeList: List<Place>?, lang: String
+    ): List<Place>? = okHttpJsonApiClient.getPlaces(placeList ?: emptyList(), lang)
+
+    /**
+     * Runs the Wikidata query to retrieve the KML String
+     */
+    @Throws(Exception::class)
+    fun getPlacesAsKML(leftLatLng: LatLng, rightLatLng: LatLng): String? =
+        okHttpJsonApiClient.getPlacesAsKML(leftLatLng, rightLatLng)
+
+    /**
+     * Runs the Wikidata query to retrieve the GPX String
+     */
+    @Throws(Exception::class)
+    fun getPlacesAsGPX(leftLatLng: LatLng, rightLatLng: LatLng): String? =
+        okHttpJsonApiClient.getPlacesAsGPX(leftLatLng, rightLatLng)
+
+    companion object {
+        private const val INITIAL_RADIUS = 0.3 // in kilometers
+        private const val RADIUS_MULTIPLIER = 2.0
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyfilterSearchListView.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyfilterSearchListView.java
deleted file mode 100644
index 491c1abffb..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyfilterSearchListView.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.ListView;
-
-public class NearbyfilterSearchListView extends ListView {
-    public NearbyfilterSearchListView(Context context) {
-        super(context);
-    }
-
-    public NearbyfilterSearchListView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public NearbyfilterSearchListView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyfilterSearchListView.kt b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyfilterSearchListView.kt
new file mode 100644
index 0000000000..a81e82edea
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyfilterSearchListView.kt
@@ -0,0 +1,13 @@
+package fr.free.nrw.commons.nearby
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.ListView
+
+class NearbyfilterSearchListView : ListView {
+    constructor(context: Context?) : super(context)
+
+    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
+
+    constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PageEditHelper.java b/app/src/main/java/fr/free/nrw/commons/nearby/PageEditHelper.java
deleted file mode 100644
index 9d4b1069c4..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PageEditHelper.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-
-import static fr.free.nrw.commons.notification.NotificationHelper.NOTIFICATION_DELETE;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-import androidx.appcompat.app.AlertDialog;
-import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.actions.PageEditClient;
-import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException;
-import fr.free.nrw.commons.notification.NotificationHelper;
-import fr.free.nrw.commons.utils.ViewUtilWrapper;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-import timber.log.Timber;
-
-/**
- * Singleton class for making edits to wiki pages asynchronously using RxJava.
- *
- * @property notificationHelper A helper class for displaying notifications.
- * @property pageEditClient      A client for making page edit requests.
- * @property viewUtil            A utility class for common view operations.
- * @property username            The username used for page edits.
- * @constructor Initializes the PageEditHelper with required dependencies.
- */
-@Singleton
-public class PageEditHelper {
-
-    private final NotificationHelper notificationHelper;
-    private final PageEditClient pageEditClient;
-    private final ViewUtilWrapper viewUtil;
-    private final String username;
-    private AlertDialog d;
-    private DialogInterface.OnMultiChoiceClickListener listener;
-
-    @Inject
-    public PageEditHelper(NotificationHelper notificationHelper,
-        @Named("wikidata-page-edit") PageEditClient pageEditClient,
-        ViewUtilWrapper viewUtil,
-        @Named("username") String username) {
-        this.notificationHelper = notificationHelper;
-        this.pageEditClient = pageEditClient;
-        this.viewUtil = viewUtil;
-        this.username = username;
-    }
-
-    /**
-     * Public interface to make a page edit request asynchronously.
-     *
-     * @param context     The context for displaying messages.
-     * @param title       The title of the page to edit.
-     * @param preText     The existing content of the page.
-     * @param description The description of the issue to be fixed.
-     * @param details     Additional details about the issue.
-     * @param lat         The latitude of the location related to the page.
-     * @param lng         The longitude of the location related to the page.
-     * @return A Single emitting true if the edit was successful, false otherwise.
-     */
-    public Single<Boolean> makePageEdit(Context context, String title, String preText,
-        String description,
-        String details, Double lat, Double lng) {
-        viewUtil.showShortToast(context, "Trying to edit " + title);
-
-        return editPage(title, preText, description, details, lat, lng)
-            .flatMapSingle(result -> Single.just(showNotification(context, title, result)))
-            .firstOrError()
-            .onErrorResumeNext(throwable -> {
-                if (throwable instanceof InvalidLoginTokenException) {
-                    return Single.error(throwable);
-                }
-                return Single.error(throwable);
-            });
-    }
-
-    /**
-     * Creates the text content for the page edit based on provided parameters.
-     *
-     * @param title       The title of the page to edit.
-     * @param preText     The existing content of the page.
-     * @param description The description of the issue to be fixed.
-     * @param details     Additional details about the issue.
-     * @param lat         The latitude of the location related to the page.
-     * @param lng         The longitude of the location related to the page.
-     * @return An Observable emitting true if the edit was successful, false otherwise.
-     */
-    private Observable<Boolean> editPage(String title, String preText, String description,
-        String details, Double lat, Double lng) {
-        Timber.d("thread is edit %s", Thread.currentThread().getName());
-        String summary = "Please fix this item";
-        String text = "";
-        String marker = "Please anyone fix the item accordingly, then reply to mark this section as fixed. Thanks a lot for your cooperation!";
-        int markerIndex = preText.indexOf(marker);
-        if (preText == "" || markerIndex == -1) {
-            text = "==Please fix this item==\n"
-                + "Someone using the [[Commons:Mobile_app|Commons Android app]] went to this item's geographical location ("
-                + lat + "," + lng
-                + ") and noted the following problem(s):\n"
-                + "* <i><nowiki>" + description + "</nowiki></i>\n"
-                + "\n"
-                + "Details: <i><nowiki>" + details + "</nowiki></i>\n"
-                + "\n"
-                + "Please anyone fix the item accordingly, then reply to mark this section as fixed. Thanks a lot for your cooperation!\n"
-                + "\n"
-                + "~~~~";
-        } else {
-            text = preText.substring(0, markerIndex);
-            text = text + "* <i><nowiki>" + description + "</nowiki></i>\n"
-                + "\n"
-                + "Details: <i><nowiki>" + details + "</nowiki></i>\n"
-                + "\n"
-                + "Please anyone fix the item accordingly, then reply to mark this section as fixed. Thanks a lot for your cooperation!\n"
-                + "\n"
-                + "~~~~";
-        }
-
-        return pageEditClient.postCreate(title, text, summary);
-    }
-
-    /**
-     * Displays a notification based on the result of the page edit.
-     *
-     * @param context The context for displaying the notification.
-     * @param title   The title of the page edited.
-     * @param result  The result of the edit operation.
-     * @return true if the edit was successful, false otherwise.
-     */
-    private boolean showNotification(Context context, String title, boolean result) {
-        String message;
-
-        if (result) {
-            message = title + " Edited Successfully";
-        } else {
-            message = context.getString(R.string.delete_helper_show_deletion_message_else);
-        }
-
-        String url = BuildConfig.WIKIDATA_URL + "/wiki/" + title;
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-        notificationHelper.showNotification(context, title, message, NOTIFICATION_DELETE,
-            browserIntent);
-        return result;
-    }
-
-    /**
-     * returns the instance of shown AlertDialog, used for taking reference during unit test
-     */
-    public AlertDialog getDialog() {
-        return d;
-    }
-
-    /**
-     * returns the instance of shown DialogInterface.OnMultiChoiceClickListener, used for taking
-     * reference during unit test
-     */
-    public DialogInterface.OnMultiChoiceClickListener getListener() {
-        return listener;
-    }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PageEditHelper.kt b/app/src/main/java/fr/free/nrw/commons/nearby/PageEditHelper.kt
new file mode 100644
index 0000000000..bd22ae3372
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PageEditHelper.kt
@@ -0,0 +1,134 @@
+package fr.free.nrw.commons.nearby
+
+import android.content.Context
+import android.content.Intent
+import androidx.annotation.VisibleForTesting
+import androidx.core.net.toUri
+import fr.free.nrw.commons.BuildConfig
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.actions.PageEditClient
+import fr.free.nrw.commons.notification.NotificationHelper
+import fr.free.nrw.commons.notification.NotificationHelper.Companion.NOTIFICATION_DELETE
+import fr.free.nrw.commons.utils.ViewUtilWrapper
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.functions.Function
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+
+/**
+ * Singleton class for making edits to wiki pages asynchronously using RxJava.
+ */
+@Singleton
+class PageEditHelper @Inject constructor(
+    private val notificationHelper: NotificationHelper,
+    @param:Named("wikidata-page-edit") private val pageEditClient: PageEditClient,
+    private val viewUtil: ViewUtilWrapper
+) {
+    /**
+     * Public interface to make a page edit request asynchronously.
+     *
+     * @param context     The context for displaying messages.
+     * @param title       The title of the page to edit.
+     * @param preText     The existing content of the page.
+     * @param description The description of the issue to be fixed.
+     * @param details     Additional details about the issue.
+     * @param lat         The latitude of the location related to the page.
+     * @param lng         The longitude of the location related to the page.
+     * @return A Single emitting true if the edit was successful, false otherwise.
+     */
+    fun makePageEdit(
+        context: Context, title: String, preText: String,
+        description: String?,
+        details: String?, lat: Double?, lng: Double?
+    ): Single<Boolean?> {
+        viewUtil.showShortToast(context, "Trying to edit " + title)
+
+        return editPage(title, preText, description, details, lat, lng)
+            .flatMapSingle<Boolean?>(Function { result: Boolean? ->
+                Single.just<Boolean?>(
+                    showNotification(context, title, result!!)
+                )
+            })
+            .firstOrError()
+            .onErrorResumeNext(Function { exception: Throwable? -> Single.error(exception) })
+    }
+
+    /**
+     * Creates the text content for the page edit based on provided parameters.
+     *
+     * @param title       The title of the page to edit.
+     * @param preText     The existing content of the page.
+     * @param description The description of the issue to be fixed.
+     * @param details     Additional details about the issue.
+     * @param lat         The latitude of the location related to the page.
+     * @param lng         The longitude of the location related to the page.
+     * @return An Observable emitting true if the edit was successful, false otherwise.
+     */
+    @VisibleForTesting
+    fun editPage(
+        title: String, preText: String, description: String?,
+        details: String?, lat: Double?, lng: Double?
+    ): Observable<Boolean> {
+        val summary = "Please fix this item"
+        val marker =
+            "Please anyone fix the item accordingly, then reply to mark this section as fixed. Thanks a lot for your cooperation!"
+        val markerIndex = preText.indexOf(marker)
+        val text = if (preText.isEmpty() || markerIndex == -1) {
+            """
+                ==Please fix this item==
+                Someone using the [[Commons:Mobile_app|Commons Android app]] went to this item's geographical location ($lat,$lng) and noted the following problem(s):
+                * <i><nowiki>$description</nowiki></i>
+                
+                Details: <i><nowiki>$details</nowiki></i>
+                
+                Please anyone fix the item accordingly, then reply to mark this section as fixed. Thanks a lot for your cooperation!
+                
+                ~~~~
+                """.trimIndent()
+        } else {
+            preText.substring(0, markerIndex) +
+                    """
+            * <i><nowiki>$description</nowiki></i>
+
+            Details: <i><nowiki>$details</nowiki></i>
+            
+            Please anyone fix the item accordingly, then reply to mark this section as fixed. Thanks a lot for your cooperation!
+            
+            ~~~~
+            """.trimIndent()
+        }
+
+        return pageEditClient.postCreate(title, text, summary)
+    }
+
+    /**
+     * Displays a notification based on the result of the page edit.
+     *
+     * @param context The context for displaying the notification.
+     * @param title   The title of the page edited.
+     * @param result  The result of the edit operation.
+     * @return true if the edit was successful, false otherwise.
+     */
+    private fun showNotification(context: Context, title: String, result: Boolean): Boolean {
+        val message = if (result) {
+            "$title Edited Successfully"
+        } else {
+            context.getString(R.string.delete_helper_show_deletion_message_else)
+        }
+
+        notificationHelper.showNotification(
+            context,
+            title,
+            message,
+            NOTIFICATION_DELETE,
+            Intent(
+                Intent.ACTION_VIEW,
+                "${BuildConfig.WIKIDATA_URL}/wiki/$title".toUri()
+            )
+        )
+        return result
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java
deleted file mode 100644
index cff2ed4de9..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java
+++ /dev/null
@@ -1,412 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.room.Embedded;
-import androidx.room.Entity;
-import androidx.room.PrimaryKey;
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.nearby.model.NearbyResultItem;
-import fr.free.nrw.commons.utils.LocationUtils;
-import fr.free.nrw.commons.utils.PlaceUtils;
-import org.apache.commons.lang3.StringUtils;
-import timber.log.Timber;
-
-/**
- * A single geolocated Wikidata item
- */
-@Entity(tableName = "place")
-public class Place implements Parcelable {
-
-    public String language;
-    public String name;
-    private Label label;
-    private String longDescription;
-    @Embedded
-    public LatLng location;
-    @PrimaryKey @NonNull
-    public String entityID;
-    private String category;
-    public String pic;
-    // exists boolean will tell whether the place exists or not,
-    // For a place to be existing both destroyed and endTime property should be null but it is also not necessary for a non-existing place to have both properties either one property is enough (in such case that not given property will be considered as null).
-    public Boolean exists;
-
-    public String distance;
-    public Sitelinks siteLinks;
-    private boolean isMonument;
-    private String thumb;
-
-    public Place() {
-        language = null;
-        name = null;
-        label = null;
-        longDescription = null;
-        location = null;
-        category = null;
-        pic = null;
-        exists = null;
-        siteLinks = null;
-        entityID = null;
-    }
-
-    public Place(String language, String name, Label label, String longDescription, LatLng location,
-        String category, Sitelinks siteLinks, String pic, Boolean exists, String entityID) {
-        this.language = language;
-        this.name = name;
-        this.label = label;
-        this.longDescription = longDescription;
-        this.location = location;
-        this.category = category;
-        this.siteLinks = siteLinks;
-        this.pic = (pic == null) ? "" : pic;
-        this.exists = exists;
-        this.entityID = entityID;
-    }
-
-    public Place(String language, String name, Label label, String longDescription, LatLng location,
-        String category, Sitelinks siteLinks, String pic, Boolean exists) {
-        this.language = language;
-        this.name = name;
-        this.label = label;
-        this.longDescription = longDescription;
-        this.location = location;
-        this.category = category;
-        this.siteLinks = siteLinks;
-        this.pic = (pic == null) ? "" : pic;
-        this.exists = exists;
-    }
-
-    public Place(String name, String longDescription, LatLng location, String category,
-        Sitelinks siteLinks, String pic, String thumb, String entityID) {
-        this.name = name;
-        this.longDescription = longDescription;
-        this.location = location;
-        this.category = category;
-        this.siteLinks = siteLinks;
-        this.pic = (pic == null) ? "" : pic;
-        this.thumb = thumb;
-        this.language = null;
-        this.label = null;
-        this.exists = true;
-        this.entityID = entityID;
-    }
-
-    public Place(Parcel in) {
-        this.language = in.readString();
-        this.name = in.readString();
-        this.label = (Label) in.readSerializable();
-        this.longDescription = in.readString();
-        this.location = in.readParcelable(LatLng.class.getClassLoader());
-        this.category = in.readString();
-        this.siteLinks = in.readParcelable(Sitelinks.class.getClassLoader());
-        String picString = in.readString();
-        this.pic = (picString == null) ? "" : picString;
-        String existString = in.readString();
-        this.exists = Boolean.parseBoolean(existString);
-        this.isMonument = in.readInt() == 1;
-        this.entityID = in.readString();
-    }
-
-    public static Place from(NearbyResultItem item) {
-        String itemClass = item.getClassName().getValue();
-        String classEntityId = "";
-        if (!StringUtils.isBlank(itemClass)) {
-            classEntityId = itemClass.replace("http://www.wikidata.org/entity/", "");
-        }
-        String entityId = "";
-        if (!StringUtils.isBlank(item.getItem().getValue())){
-            entityId = item.getItem().getValue().replace("http://www.wikidata.org/entity/", "");
-        }
-        // Set description when not null and not empty
-        String description =
-            (item.getDescription().getValue() != null && !item.getDescription().getValue()
-                .isEmpty()) ? item.getDescription().getValue() : "";
-        // When description is "?" but we have a valid label, just use the label. So replace "?" by "" in description
-        description = (description.equals("?")
-            && (item.getLabel().getValue() != null
-            && !item.getLabel().getValue().isEmpty()) ? "" : description);
-        /*
-         * If we have a valid label
-         *     - If have a valid label add the description at the end of the string with parenthesis
-         *     - If we don't have a valid label, string will include only the description. So add it without paranthesis
-         */
-        description = ((item.getLabel().getValue() != null && !item.getLabel().getValue().isEmpty())
-            ? item.getLabel().getValue()
-            + ((description != null && !description.isEmpty())
-            ? " (" + description + ")" : "")
-            : description);
-        return new Place(
-            item.getLabel().getLanguage(),
-            item.getLabel().getValue(),
-            Label.fromText(classEntityId), // list
-            description, // description and label of Wikidata item
-            PlaceUtils.latLngFromPointString(item.getLocation().getValue()),
-            item.getCommonsCategory().getValue(),
-            new Sitelinks.Builder()
-                .setWikipediaLink(item.getWikipediaArticle().getValue())
-                .setCommonsLink(item.getCommonsArticle().getValue())
-                .setWikidataLink(item.getItem().getValue())
-                .build(),
-            item.getPic().getValue(),
-            // Checking if the place exists or not
-            (item.getDestroyed().getValue() == "") && (item.getEndTime().getValue() == "")
-                && (item.getDateOfOfficialClosure().getValue() == "")
-                && (item.getPointInTime().getValue()==""),
-            entityId);
-    }
-
-    /**
-     * Gets the language of the caption ie name.
-     *
-     * @return language
-     */
-    public String getLanguage() {
-        return language;
-    }
-
-    /**
-     * Gets the name of the place
-     *
-     * @return name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the distance between place and curLatLng
-     *
-     * @param curLatLng
-     * @return name
-     */
-    public Double getDistanceInDouble(LatLng curLatLng) {
-        return LocationUtils.calculateDistance(curLatLng.getLatitude(), curLatLng.getLongitude(),
-            getLocation().getLatitude(), getLocation().getLongitude());
-    }
-
-    /**
-     * Gets the label of the place e.g. "building", "city", etc
-     *
-     * @return label
-     */
-    public Label getLabel() {
-        return label;
-    }
-
-    public LatLng getLocation() {
-        return location;
-    }
-
-    /**
-     * Gets the long description of the place
-     *
-     * @return long description
-     */
-    public String getLongDescription() {
-        return longDescription;
-    }
-
-    /**
-     * Gets the Commons category of the place
-     *
-     * @return Commons category
-     */
-    public String getCategory() {
-        return category;
-    }
-
-    /**
-     * Sets the distance of the place from the user's location
-     *
-     * @param distance distance of place from user's location
-     */
-    public void setDistance(String distance) {
-        this.distance = distance;
-    }
-
-    /**
-     * Extracts the entity id from the wikidata link
-     *
-     * @return returns the entity id if wikidata link destroyed
-     */
-    @Nullable
-    public String getWikiDataEntityId() {
-        if (this.entityID != null && !this.entityID.equals("")) {
-            return this.entityID;
-        }
-
-        if (!hasWikidataLink()) {
-            Timber.d("Wikidata entity ID is null for place with sitelink %s", siteLinks.toString());
-            return null;
-        }
-
-        //Determine entityID from link
-        String wikiDataLink = siteLinks.getWikidataLink().toString();
-
-        if (wikiDataLink.contains("http://www.wikidata.org/entity/")) {
-            this.entityID = wikiDataLink.substring("http://www.wikidata.org/entity/".length());
-            return this.entityID;
-        }
-        return null;
-    }
-
-    /**
-     * Checks if the Wikidata item has a Wikipedia page associated with it
-     *
-     * @return true if there is a Wikipedia link
-     */
-    public boolean hasWikipediaLink() {
-        return !(siteLinks == null || Uri.EMPTY.equals(siteLinks.getWikipediaLink()));
-    }
-
-    /**
-     * Checks if the Wikidata item has a Wikidata page associated with it
-     *
-     * @return true if there is a Wikidata link
-     */
-    public boolean hasWikidataLink() {
-        return !(siteLinks == null || Uri.EMPTY.equals(siteLinks.getWikidataLink()));
-    }
-
-    /**
-     * Checks if the Wikidata item has a Commons page associated with it
-     *
-     * @return true if there is a Commons link
-     */
-    public boolean hasCommonsLink() {
-        return !(siteLinks == null || Uri.EMPTY.equals(siteLinks.getCommonsLink()));
-    }
-
-    /**
-     * Sets that this place in nearby is a WikiData monument
-     *
-     * @param monument
-     */
-    public void setMonument(final boolean monument) {
-        isMonument = monument;
-    }
-
-    /**
-     * Returns if this place is a WikiData monument
-     *
-     * @return
-     */
-    public boolean isMonument() {
-        return isMonument;
-    }
-
-    /**
-     * Check if we already have the exact same Place
-     *
-     * @param o Place being tested
-     * @return true if name and location of Place is exactly the same
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (o instanceof Place) {
-            Place that = (Place) o;
-            return this.name.equals(that.name) && this.location.equals(that.location);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return this.name.hashCode() * 31 + this.location.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return "Place{" +
-            "name='" + name + '\'' +
-            ", lang='" + language + '\'' +
-            ", label='" + label + '\'' +
-            ", longDescription='" + longDescription + '\'' +
-            ", location='" + location + '\'' +
-            ", category='" + category + '\'' +
-            ", distance='" + distance + '\'' +
-            ", siteLinks='" + siteLinks.toString() + '\'' +
-            ", pic='" + pic + '\'' +
-            ", exists='" + exists.toString() + '\'' +
-            ", entityID='" + entityID + '\'' +
-            '}';
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(language);
-        dest.writeString(name);
-        dest.writeSerializable(label);
-        dest.writeString(longDescription);
-        dest.writeParcelable(location, 0);
-        dest.writeString(category);
-        dest.writeParcelable(siteLinks, 0);
-        dest.writeString(pic);
-        dest.writeString(entityID);
-        dest.writeString(exists.toString());
-        dest.writeInt(isMonument ? 1 : 0);
-    }
-
-    public static final Creator<Place> CREATOR = new Creator<Place>() {
-        @Override
-        public Place createFromParcel(Parcel in) {
-            return new Place(in);
-        }
-
-        @Override
-        public Place[] newArray(int size) {
-            return new Place[size];
-        }
-    };
-
-    public String getThumb() {
-        return thumb;
-    }
-
-    /**
-     * Sets the thumbnail URL for the place.
-     *
-     * @param thumb the thumbnail URL to set
-     */
-    public void setThumb(String thumb) {
-        this.thumb = thumb;
-    }
-
-    /**
-     * Sets the label for the place.
-     *
-     * @param label the label to set
-     */
-    public void setLabel(Label label) {
-        this.label = label;
-    }
-
-    /**
-     * Sets the long description for the place.
-     *
-     * @param longDescription the long description to set
-     */
-    public void setLongDescription(String longDescription) {
-        this.longDescription = longDescription;
-    }
-
-    /**
-     * Sets the Commons category for the place.
-     *
-     * @param category the category to set
-     */
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Place.kt b/app/src/main/java/fr/free/nrw/commons/nearby/Place.kt
new file mode 100644
index 0000000000..fb086fdf4c
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/Place.kt
@@ -0,0 +1,316 @@
+package fr.free.nrw.commons.nearby
+
+import android.os.Parcel
+import android.os.Parcelable
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.nearby.Label.Companion.fromText
+import fr.free.nrw.commons.nearby.model.NearbyResultItem
+import fr.free.nrw.commons.utils.LocationUtils.calculateDistance
+import fr.free.nrw.commons.utils.PlaceUtils.latLngFromPointString
+import org.apache.commons.lang3.StringUtils
+import timber.log.Timber
+
+/**
+ * A single geolocated Wikidata item
+ */
+@Entity(tableName = "place")
+class Place : Parcelable {
+    var language: String?
+    var name: String?
+    var label: Label?
+    var longDescription: String?
+    var category: String?
+    var pic: String?
+    var distance: String? = null
+    var siteLinks: Sitelinks?
+    var isMonument: Boolean = false
+    var thumb: String? = null
+
+    @Embedded
+    var location: LatLng?
+
+    @PrimaryKey
+    var entityID: String = "dummy"
+
+    // exists boolean will tell whether the place exists or not,
+    // For a place to be existing both destroyed and endTime property should be null but it is also not necessary for a non-existing place to have both properties either one property is enough (in such case that not given property will be considered as null).
+    var exists: Boolean?
+
+    constructor() {
+        language = null
+        name = null
+        label = null
+        longDescription = null
+        location = null
+        category = null
+        pic = null
+        exists = null
+        siteLinks = null
+        entityID = "dummy"
+    }
+
+    constructor(
+        language: String?,
+        name: String?,
+        label: Label?,
+        longDescription: String?,
+        location: LatLng?,
+        category: String?,
+        siteLinks: Sitelinks?,
+        pic: String?,
+        exists: Boolean?,
+        entityID: String
+    ) {
+        this.language = language
+        this.name = name
+        this.label = label
+        this.longDescription = longDescription
+        this.location = location
+        this.category = category
+        this.siteLinks = siteLinks
+        this.pic = pic ?: ""
+        this.exists = exists
+        this.entityID = entityID
+    }
+
+    constructor(
+        language: String?,
+        name: String?,
+        label: Label?,
+        longDescription: String?,
+        location: LatLng?,
+        category: String?,
+        siteLinks: Sitelinks?,
+        pic: String?,
+        exists: Boolean?
+    ) {
+        this.language = language
+        this.name = name
+        this.label = label
+        this.longDescription = longDescription
+        this.location = location
+        this.category = category
+        this.siteLinks = siteLinks
+        this.pic = pic ?: ""
+        this.exists = exists
+    }
+
+    constructor(
+        name: String?, longDescription: String?, location: LatLng?, category: String?,
+        siteLinks: Sitelinks?, pic: String?, thumb: String?, entityID: String
+    ) {
+        this.name = name
+        this.longDescription = longDescription
+        this.location = location
+        this.category = category
+        this.siteLinks = siteLinks
+        this.pic = pic ?: ""
+        this.thumb = thumb
+        language = null
+        label = null
+        exists = true
+        this.entityID = entityID
+    }
+
+    constructor(`in`: Parcel) {
+        language = `in`.readString()
+        name = `in`.readString()
+        label = `in`.readSerializable() as Label?
+        longDescription = `in`.readString()
+        location = `in`.readParcelable<LatLng?>(LatLng::class.java.classLoader)
+        category = `in`.readString()
+        siteLinks = `in`.readParcelable<Sitelinks?>(Sitelinks::class.java.classLoader)
+        val picString = `in`.readString()
+        pic = picString ?: ""
+        val existString: String = `in`.readString()!!
+        exists = existString.toBoolean()
+        isMonument = `in`.readInt() == 1
+        entityID = `in`.readString()!!
+    }
+
+    /**
+     * Gets the distance between place and curLatLng
+     */
+    fun getDistanceInDouble(curLatLng: LatLng): Double {
+        return calculateDistance(
+            curLatLng.latitude, curLatLng.longitude,
+            this.location!!.latitude, this.location!!.longitude
+        )
+    }
+
+
+    val wikiDataEntityId: String?
+        /**
+         * Extracts the entity id from the wikidata link
+         *
+         * @return returns the entity id if wikidata link destroyed
+         */
+        get() {
+            if (!entityID.isEmpty()) {
+                return entityID
+            }
+
+            if (!hasWikidataLink()) {
+                Timber.d(
+                    "Wikidata entity ID is null for place with sitelink %s",
+                    siteLinks.toString()
+                )
+                return null
+            }
+
+            //Determine entityID from link
+            val wikiDataLink = siteLinks!!.wikidataUri.toString()
+
+            if (wikiDataLink.contains("http://www.wikidata.org/entity/")) {
+                entityID = wikiDataLink.substring("http://www.wikidata.org/entity/".length)
+                return entityID
+            }
+            return null
+        }
+
+    /**
+     * Checks if the Wikidata item has a Wikipedia page associated with it
+     *
+     * @return true if there is a Wikipedia link
+     */
+    fun hasWikipediaLink(): Boolean {
+        return !siteLinks?.wikipediaUri?.toString().isNullOrEmpty()
+    }
+
+    /**
+     * Checks if the Wikidata item has a Wikidata page associated with it
+     *
+     * @return true if there is a Wikidata link
+     */
+    fun hasWikidataLink(): Boolean {
+        return !siteLinks?.wikidataUri?.toString().isNullOrEmpty()
+    }
+
+    /**
+     * Checks if the Wikidata item has a Commons page associated with it
+     *
+     * @return true if there is a Commons link
+     */
+    fun hasCommonsLink(): Boolean {
+        return !siteLinks?.commonsUri?.toString().isNullOrEmpty()
+    }
+
+    /**
+     * Check if we already have the exact same Place
+     *
+     * @param other Place being tested
+     * @return true if name and location of Place is exactly the same
+     */
+    override fun equals(other: Any?): Boolean {
+        if (other is Place) {
+            val that = other
+            return name == that.name && location == that.location
+        } else {
+            return false
+        }
+    }
+
+    override fun hashCode(): Int {
+        return name.hashCode() * 31 + location.hashCode()
+    }
+
+    override fun toString(): String {
+        return "Place{" +
+                "name='" + name + '\'' +
+                ", lang='" + language + '\'' +
+                ", label='" + label + '\'' +
+                ", longDescription='" + longDescription + '\'' +
+                ", location='" + location + '\'' +
+                ", category='" + category + '\'' +
+                ", distance='" + distance + '\'' +
+                ", siteLinks='" + siteLinks.toString() + '\'' +
+                ", pic='" + pic + '\'' +
+                ", exists='" + exists.toString() + '\'' +
+                ", entityID='" + entityID + '\'' +
+                '}'
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(language)
+        dest.writeString(name)
+        dest.writeSerializable(label)
+        dest.writeString(longDescription)
+        dest.writeParcelable(location, 0)
+        dest.writeString(category)
+        dest.writeParcelable(siteLinks, 0)
+        dest.writeString(pic)
+        dest.writeString(entityID)
+        dest.writeString(exists.toString())
+        dest.writeInt(if (isMonument) 1 else 0)
+    }
+
+    companion object {
+        fun from(item: NearbyResultItem): Place {
+            val itemClass = item.getClassName().value
+            var classEntityId = ""
+            if (!StringUtils.isBlank(itemClass)) {
+                classEntityId = itemClass.replace("http://www.wikidata.org/entity/", "")
+            }
+            var entityId = ""
+            if (!StringUtils.isBlank(item.getItem().value)) {
+                entityId = item.getItem().value.replace("http://www.wikidata.org/entity/", "")
+            }
+            // Set description when not null and not empty
+            var description =
+                if (item.getDescription().value != null && !item.getDescription().value
+                        .isEmpty()
+                ) item.getDescription().value else ""
+            // When description is "?" but we have a valid label, just use the label. So replace "?" by "" in description
+            description = (if (description == "?"
+                && (item.getLabel().value != null
+                        && !item.getLabel().value.isEmpty())
+            ) "" else description)
+            /*
+         * If we have a valid label
+         *     - If have a valid label add the description at the end of the string with parenthesis
+         *     - If we don't have a valid label, string will include only the description. So add it without paranthesis
+         */
+            description = (if (item.getLabel().value != null && !item.getLabel().value.isEmpty())
+                (item.getLabel().value
+                        + (if (description != null && !description.isEmpty()) " (" + description + ")" else ""))
+            else
+                description)
+            return Place(
+                item.getLabel().language,
+                item.getLabel().value,
+                fromText(classEntityId),  // list
+                description,  // description and label of Wikidata item
+                latLngFromPointString(item.getLocation().value),
+                item.getCommonsCategory().value,
+                Sitelinks(
+                    wikipediaLink = item.getWikipediaArticle().value,
+                    commonsLink = item.getCommonsArticle().value,
+                    wikidataLink = item.getItem().value
+                ),
+                item.getPic().value,  // Checking if the place exists or not
+                (item.getDestroyed().value === "") && (item.getEndTime().value === "")
+                        && (item.getDateOfOfficialClosure().value === "")
+                        && (item.getPointInTime().value === ""),
+                entityId
+            )
+        }
+
+        @JvmField
+        val CREATOR: Parcelable.Creator<Place?> = object : Parcelable.Creator<Place?> {
+            override fun createFromParcel(`in`: Parcel): Place {
+                return Place(`in`)
+            }
+
+            override fun newArray(size: Int): Array<Place?> {
+                return arrayOfNulls(size)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt
index d9a76c25d2..32ebe2922d 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt
@@ -79,7 +79,7 @@ fun placeAdapterDelegate(
         nearbyButtonLayout.directionsButton.setOnClickListener { onDirectionsClicked(item) }
         bind {
             tvName.text = item.name
-            val descriptionText: String = item.longDescription
+            val descriptionText: String = item.longDescription!!
             if (descriptionText == "?") {
                 tvDesc.setText(R.string.no_description_found)
                 tvDesc.visibility = INVISIBLE
@@ -91,7 +91,7 @@ fun placeAdapterDelegate(
                         .substringBeforeLast(")")
             }
             distance.text = item.distance
-            icon.setImageResource(item.label.icon)
+            icon.setImageResource(item.label!!.icon)
             nearbyButtonLayout.iconOverflow.visibility =
                 if (item.hasCommonsLink() || item.hasWikidataLink()) {
                     VISIBLE
@@ -101,7 +101,7 @@ fun placeAdapterDelegate(
 
             scope?.launch {
                 bookmarkButtonImage.setImageResource(
-                    if (bookmarkLocationDao.findBookmarkLocation(item.name)) {
+                    if (bookmarkLocationDao.findBookmarkLocation(item.name!!)) {
                         R.drawable.ic_round_star_filled_24px
                     } else {
                         R.drawable.ic_round_star_border_24px
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceDao.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceDao.kt
similarity index 65%
rename from app/src/main/java/fr/free/nrw/commons/nearby/PlaceDao.java
rename to app/src/main/java/fr/free/nrw/commons/nearby/PlaceDao.kt
index 269384ffab..40826deae0 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceDao.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceDao.kt
@@ -1,11 +1,11 @@
-package fr.free.nrw.commons.nearby;
+package fr.free.nrw.commons.nearby
 
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import io.reactivex.Completable;
-import java.util.List;
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import io.reactivex.Completable
+import io.reactivex.functions.Action
 
 /**
  * Data Access Object (DAO) for accessing the Place entity in the database.
@@ -13,8 +13,7 @@
  * utilized for the caching of places in the Nearby Map feature.
  */
 @Dao
-public abstract class PlaceDao {
-
+abstract class PlaceDao {
     /**
      * Inserts a Place object into the database.
      * If a conflict occurs, the existing entry will be replaced.
@@ -22,7 +21,7 @@ public abstract class PlaceDao {
      * @param place The Place object to be inserted.
      */
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    public abstract void saveSynchronous(Place place);
+    abstract fun saveSynchronous(place: Place)
 
     /**
      * Retrieves a Place object from the database based on the provided entity ID.
@@ -31,7 +30,7 @@ public abstract class PlaceDao {
      * @return The Place object with the specified entity ID.
      */
     @Query("SELECT * from place WHERE entityID=:entity")
-    public abstract Place getPlace(String entity);
+    abstract fun getPlace(entity: String?): Place?
 
     /**
      * Retrieves a list of places within the specified rectangular area.
@@ -42,31 +41,24 @@ public abstract class PlaceDao {
      * @param lngEnd Longitudinal upper bound, should be greater than `lngBegin`
      * @return The list of places within the specified rectangular geographical area.
      */
-    @Query("SELECT * from place WHERE name!='' AND latitude>=:latBegin AND longitude>=:lngBegin "
-        + "AND latitude<:latEnd AND longitude<:lngEnd")
-    public abstract List<Place> fetchPlaces(double latBegin, double lngBegin,
-        double latEnd, double lngEnd);
+    @Query("SELECT * from place WHERE name!='' AND latitude>=:latBegin AND longitude>=:lngBegin AND latitude<:latEnd AND longitude<:lngEnd")
+    abstract fun fetchPlaces(latBegin: Double, lngBegin: Double, latEnd: Double, lngEnd: Double): List<Place>?
 
     /**
      * Saves a Place object asynchronously into the database.
      */
-    public Completable save(final Place place) {
-        return Completable
-            .fromAction(() -> saveSynchronous(place));
-    }
+    fun save(place: Place): Completable = Completable.fromAction(Action { saveSynchronous(place) })
 
     /**
      * Deletes all Place objects from the database.
      */
     @Query("DELETE FROM place")
-    public abstract void deleteAllSynchronous();
+    abstract fun deleteAllSynchronous()
 
     /**
      * Deletes all Place objects from the database.
      *
      * @return A Completable that completes once the deletion operation is done.
      */
-    public Completable deleteAll() {
-        return Completable.fromAction(this::deleteAllSynchronous);
-    }
+    fun deleteAll(): Completable = Completable.fromAction(Action { deleteAllSynchronous() })
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlacesLocalDataSource.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlacesLocalDataSource.java
deleted file mode 100644
index 2d8c2733af..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlacesLocalDataSource.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import fr.free.nrw.commons.location.LatLng;
-import io.reactivex.Completable;
-import java.util.ArrayList;
-import java.util.List;
-import javax.inject.Inject;
-import timber.log.Timber;
-
-/**
- * The LocalDataSource class for Places
- */
-public class PlacesLocalDataSource {
-
-    private final PlaceDao placeDao;
-
-    @Inject
-    public PlacesLocalDataSource(
-        final PlaceDao placeDao) {
-        this.placeDao = placeDao;
-    }
-
-    /**
-     * Fetches a Place object from the database based on the provided entity ID.
-     *
-     * @param entityID The entity ID of the Place to be retrieved.
-     * @return The Place object with the specified entity ID.
-     */
-    public Place fetchPlace(String entityID){
-        return placeDao.getPlace(entityID);
-    }
-
-    /**
-     * Retrieves a list of places from the database within the geographical area
-     * specified by map's opposite corners.
-     *
-     * @param mapBottomLeft Bottom left corner of the map.
-     * @param mapTopRight Top right corner of the map.
-     * @return The list of saved places within the map's view.
-     */
-    public List<Place> fetchPlaces(final LatLng mapBottomLeft, final LatLng mapTopRight) {
-        class Constraint {
-
-            final double latBegin;
-            final double lngBegin;
-            final double latEnd;
-            final double lngEnd;
-
-            public Constraint(final double latBegin, final double lngBegin, final double latEnd,
-                final double lngEnd) {
-                this.latBegin = latBegin;
-                this.lngBegin = lngBegin;
-                this.latEnd = latEnd;
-                this.lngEnd = lngEnd;
-            }
-        }
-
-        final List<Constraint> constraints = new ArrayList<>();
-
-        if (mapTopRight.getLatitude() < mapBottomLeft.getLatitude()) {
-            if (mapTopRight.getLongitude() < mapBottomLeft.getLongitude()) {
-                constraints.add(
-                    new Constraint(mapBottomLeft.getLatitude(), mapBottomLeft.getLongitude(), 90.0,
-                        180.0));
-                constraints.add(new Constraint(mapBottomLeft.getLatitude(), -180.0, 90.0,
-                    mapTopRight.getLongitude()));
-                constraints.add(
-                    new Constraint(-90.0, mapBottomLeft.getLongitude(), mapTopRight.getLatitude(),
-                        180.0));
-                constraints.add(new Constraint(-90.0, -180.0, mapTopRight.getLatitude(),
-                    mapTopRight.getLongitude()));
-            } else {
-                constraints.add(
-                    new Constraint(mapBottomLeft.getLatitude(), mapBottomLeft.getLongitude(), 90.0,
-                        mapTopRight.getLongitude()));
-                constraints.add(
-                    new Constraint(-90.0, mapBottomLeft.getLongitude(), mapTopRight.getLatitude(),
-                        mapTopRight.getLongitude()));
-            }
-        } else {
-            if (mapTopRight.getLongitude() < mapBottomLeft.getLongitude()) {
-                constraints.add(
-                    new Constraint(mapBottomLeft.getLatitude(), mapBottomLeft.getLongitude(),
-                        mapTopRight.getLatitude(), 180.0));
-                constraints.add(
-                    new Constraint(mapBottomLeft.getLatitude(), -180.0, mapTopRight.getLatitude(),
-                        mapTopRight.getLongitude()));
-            } else {
-                constraints.add(
-                    new Constraint(mapBottomLeft.getLatitude(), mapBottomLeft.getLongitude(),
-                        mapTopRight.getLatitude(), mapTopRight.getLongitude()));
-            }
-        }
-
-        final List<Place> cachedPlaces = new ArrayList<>();
-        for (final Constraint constraint : constraints) {
-            cachedPlaces.addAll(placeDao.fetchPlaces(
-                constraint.latBegin,
-                constraint.lngBegin,
-                constraint.latEnd,
-                constraint.lngEnd
-            ));
-        }
-
-        return cachedPlaces;
-    }
-
-    /**
-     * Saves a Place object asynchronously into the database.
-     *
-     * @param place The Place object to be saved.
-     * @return A Completable that completes once the save operation is done.
-     */
-    public Completable savePlace(Place place) {
-        return placeDao.save(place);
-    }
-
-    public Completable clearCache() {
-        return placeDao.deleteAll();
-    }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlacesLocalDataSource.kt b/app/src/main/java/fr/free/nrw/commons/nearby/PlacesLocalDataSource.kt
new file mode 100644
index 0000000000..b79057cb21
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlacesLocalDataSource.kt
@@ -0,0 +1,69 @@
+package fr.free.nrw.commons.nearby
+
+import fr.free.nrw.commons.location.LatLng
+import io.reactivex.Completable
+import javax.inject.Inject
+
+/**
+ * The LocalDataSource class for Places
+ */
+class PlacesLocalDataSource @Inject constructor(private val placeDao: PlaceDao) {
+    /**
+     * Fetches a Place object from the database based on the provided entity ID.
+     *
+     * @param entityID The entity ID of the Place to be retrieved.
+     * @return The Place object with the specified entity ID.
+     */
+    fun fetchPlace(entityID: String?): Place? = placeDao.getPlace(entityID)
+
+    /**
+     * Retrieves a list of places from the database within the geographical area
+     * specified by map's opposite corners.
+     *
+     * @param mapBottomLeft Bottom left corner of the map.
+     * @param mapTopRight Top right corner of the map.
+     * @return The list of saved places within the map's view.
+     */
+    fun fetchPlaces(mapBottomLeft: LatLng, mapTopRight: LatLng): List<Place> {
+        class Constraint(val latBegin: Double, val lngBegin: Double, val latEnd: Double, val lngEnd: Double)
+
+        val constraints: MutableList<Constraint> = mutableListOf()
+
+        if (mapTopRight.latitude < mapBottomLeft.latitude) {
+            if (mapTopRight.longitude < mapBottomLeft.longitude) {
+                constraints.add(Constraint(mapBottomLeft.latitude, mapBottomLeft.longitude, 90.0, 180.0))
+                constraints.add(Constraint(mapBottomLeft.latitude, -180.0, 90.0, mapTopRight.longitude))
+                constraints.add(Constraint(-90.0, mapBottomLeft.longitude, mapTopRight.latitude, 180.0))
+                constraints.add(Constraint(-90.0, -180.0, mapTopRight.latitude, mapTopRight.longitude))
+            } else {
+                constraints.add(Constraint(mapBottomLeft.latitude, mapBottomLeft.longitude, 90.0, mapTopRight.longitude))
+                constraints.add(Constraint(-90.0, mapBottomLeft.longitude, mapTopRight.latitude, mapTopRight.longitude))
+            }
+        } else {
+            if (mapTopRight.longitude < mapBottomLeft.longitude) {
+                constraints.add(Constraint(mapBottomLeft.latitude, mapBottomLeft.longitude, mapTopRight.latitude, 180.0))
+                constraints.add(Constraint(mapBottomLeft.latitude, -180.0, mapTopRight.latitude, mapTopRight.longitude))
+            } else {
+                constraints.add(Constraint(mapBottomLeft.latitude, mapBottomLeft.longitude, mapTopRight.latitude, mapTopRight.longitude))
+            }
+        }
+
+        val cachedPlaces: List<Place> = buildList {
+            for (constraint in constraints) {
+                addAll(placeDao.fetchPlaces(constraint.latBegin, constraint.lngBegin, constraint.latEnd, constraint.lngEnd)!!)
+            }
+        }
+
+        return cachedPlaces
+    }
+
+    /**
+     * Saves a Place object asynchronously into the database.
+     *
+     * @param place The Place object to be saved.
+     * @return A Completable that completes once the save operation is done.
+     */
+    fun savePlace(place: Place): Completable = placeDao.save(place)
+
+    fun clearCache(): Completable = placeDao.deleteAll()
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlacesRepository.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlacesRepository.kt
similarity index 51%
rename from app/src/main/java/fr/free/nrw/commons/nearby/PlacesRepository.java
rename to app/src/main/java/fr/free/nrw/commons/nearby/PlacesRepository.kt
index c2edfe355f..c18754bd77 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlacesRepository.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlacesRepository.kt
@@ -1,34 +1,22 @@
-package fr.free.nrw.commons.nearby;
+package fr.free.nrw.commons.nearby
 
-import fr.free.nrw.commons.contributions.Contribution;
-import fr.free.nrw.commons.location.LatLng;
-import io.reactivex.Completable;
-import io.reactivex.schedulers.Schedulers;
-import java.util.List;
-import javax.inject.Inject;
+import fr.free.nrw.commons.location.LatLng
+import io.reactivex.Completable
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
 
 /**
  * The PlacesRepository class acts as a repository for Place entities.
  * It interacts with the PlacesLocalDataSource to perform database operations.
  */
-public class PlacesRepository {
-
-    private PlacesLocalDataSource localDataSource;
-
-    @Inject
-    public PlacesRepository(PlacesLocalDataSource localDataSource) {
-        this.localDataSource = localDataSource;
-    }
-
+class PlacesRepository @Inject constructor(private val localDataSource: PlacesLocalDataSource) {
     /**
      * Saves a Place object asynchronously into the database.
      *
      * @param place The Place object to be saved.
      * @return A Completable that completes once the save operation is done.
      */
-    public Completable save(Place place){
-        return localDataSource.savePlace(place);
-    }
+    fun save(place: Place): Completable = localDataSource.savePlace(place)
 
     /**
      * Fetches a Place object from the database based on the provided entity ID.
@@ -36,9 +24,7 @@ public Completable save(Place place){
      * @param entityID The entity ID of the Place to be retrieved.
      * @return The Place object with the specified entity ID.
      */
-    public Place fetchPlace(String entityID){
-        return localDataSource.fetchPlace(entityID);
-    }
+    fun fetchPlace(entityID: String): Place? = localDataSource.fetchPlace(entityID)
 
     /**
      * Retrieves a list of places within the geographical area specified by map's opposite corners.
@@ -47,17 +33,14 @@ public Place fetchPlace(String entityID){
      * @param mapTopRight Top right corner of the map.
      * @return The list of saved places within the map's view.
      */
-    public List<Place> fetchPlaces(final LatLng mapBottomLeft, final LatLng mapTopRight) {
-        return localDataSource.fetchPlaces(mapBottomLeft, mapTopRight);
-    }
+    fun fetchPlaces(mapBottomLeft: LatLng, mapTopRight: LatLng): List<Place> =
+        localDataSource.fetchPlaces(mapBottomLeft, mapTopRight) ?: emptyList()
 
     /**
      * Clears the Nearby cache on an IO thread.
      *
      * @return A Completable that completes once the cache has been successfully cleared.
      */
-    public Completable clearCache() {
-        return localDataSource.clearCache()
-            .subscribeOn(Schedulers.io()); // Ensure it runs on IO thread
-    }
+    fun clearCache(): Completable = localDataSource.clearCache()
+        .subscribeOn(Schedulers.io())
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.java b/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.java
deleted file mode 100644
index 93bcba7173..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package fr.free.nrw.commons.nearby;
-
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import androidx.annotation.Nullable;
-
-/**
- * Handles the links to Wikipedia, Commons, and Wikidata that are displayed for a Place
- */
-public class Sitelinks implements Parcelable {
-    private final String wikipediaLink;
-    private final String commonsLink;
-    private final String wikidataLink;
-
-
-    private Sitelinks(Parcel in) {
-        wikipediaLink = in.readString();
-        commonsLink = in.readString();
-        wikidataLink = in.readString();
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(wikipediaLink);
-        dest.writeString(commonsLink);
-        dest.writeString(wikidataLink);
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    /**
-     * Creates sitelinks from the parcel
-     */
-    public static final Creator<Sitelinks> CREATOR = new Creator<Sitelinks>() {
-        @Override
-        public Sitelinks createFromParcel(Parcel in) {
-            return new Sitelinks(in);
-        }
-
-        @Override
-        public Sitelinks[] newArray(int size) {
-            return new Sitelinks[size];
-        }
-    };
-
-    /**
-     * Gets the Wikipedia link for a Place
-     * @return Wikipedia link
-     */
-    public Uri getWikipediaLink() {
-        return sanitiseString(wikipediaLink);
-    }
-
-    /**
-     * Gets the Commons link for a Place
-     * @return Commons link
-     */
-    public Uri getCommonsLink() {
-        return sanitiseString(commonsLink);
-    }
-
-    /**
-     * Gets the Wikidata link for a Place
-     * @return Wikidata link
-     */
-    public Uri getWikidataLink() {
-        return sanitiseString(wikidataLink);
-    }
-
-    /**
-     * Sanitises and parses the links before using them
-     * @param stringUrl unsanitised link
-     * @return sanitised and parsed link
-     */
-    private static Uri sanitiseString(String stringUrl) {
-        String sanitisedStringUrl = stringUrl.replaceAll("[<>\n\r]", "").trim();
-        return Uri.parse(sanitisedStringUrl);
-    }
-
-    @Override
-    public String toString() {
-        return "Sitelinks{" +
-                "wikipediaLink='" + wikipediaLink + '\'' +
-                ", commonsLink='" + commonsLink + '\'' +
-                ", wikidataLink='" + wikidataLink + '\'' +
-                '}';
-    }
-
-    private Sitelinks(Sitelinks.Builder builder) {
-        this.wikidataLink = builder.wikidataLink;
-        this.wikipediaLink = builder.wikipediaLink;
-        this.commonsLink = builder.commonsLink;
-    }
-
-    /**
-     * Builds a list of Sitelinks for a Place
-     */
-    public static class Builder {
-        private String wikidataLink;
-        private String commonsLink;
-        private String wikipediaLink;
-
-        public Sitelinks.Builder setWikipediaLink(String link) {
-            this.wikipediaLink = link;
-            return this;
-        }
-
-        public Sitelinks.Builder setWikidataLink(String link) {
-            this.wikidataLink = link;
-            return this;
-        }
-
-        public Sitelinks.Builder setCommonsLink(@Nullable String link) {
-            this.commonsLink = link;
-            return this;
-        }
-
-        public Sitelinks build() {
-            return new Sitelinks(this);
-        }
-    }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.kt b/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.kt
new file mode 100644
index 0000000000..bfa3dcd6bc
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.kt
@@ -0,0 +1,38 @@
+package fr.free.nrw.commons.nearby
+
+import android.net.Uri
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import androidx.core.net.toUri
+
+/**
+ * Handles the links to Wikipedia, Commons, and Wikidata that are displayed for a Place
+ */
+@Parcelize
+data class Sitelinks(
+    val wikipediaLink: String? = null,
+    val commonsLink: String? = null,
+    val wikidataLink: String? = null
+) : Parcelable {
+    val wikipediaUri: Uri?
+        get() = sanitiseString(wikipediaLink)
+
+    val commonsUri: Uri?
+        get() = sanitiseString(commonsLink)
+
+    val wikidataUri: Uri?
+        get() = sanitiseString(wikidataLink)
+
+    companion object {
+        /**
+         * Sanitises and parses the links before using them
+         * @param stringUrl unsanitised link
+         * @return sanitised and parsed link
+         */
+        private fun sanitiseString(stringUrl: String?): Uri? {
+            return stringUrl?.replace(
+                "[<>\n\r]".toRegex(), ""
+            )?.trim()?.toUri()
+        }
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
deleted file mode 100644
index 1d59fcd34f..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package fr.free.nrw.commons.nearby.contract;
-
-import android.content.Context;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.LifecycleCoroutineScope;
-import fr.free.nrw.commons.BaseMarker;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType;
-import fr.free.nrw.commons.nearby.Label;
-import fr.free.nrw.commons.nearby.MarkerPlaceGroup;
-import fr.free.nrw.commons.nearby.Place;
-import java.util.List;
-
-public interface NearbyParentFragmentContract {
-
-    interface View {
-
-        boolean isNetworkConnectionEstablished();
-
-        void updateSnackbar(boolean offlinePinsShown);
-
-        void listOptionMenuItemClicked();
-
-        void populatePlaces(LatLng currentLatLng);
-
-        void populatePlaces(LatLng currentLatLng, String customQuery);
-
-        boolean isListBottomSheetExpanded();
-
-        void askForLocationPermission();
-
-        void displayLoginSkippedWarning();
-
-        void setFABPlusAction(android.view.View.OnClickListener onClickListener);
-
-        void setFABRecenterAction(android.view.View.OnClickListener onClickListener);
-
-        void animateFABs();
-
-        void recenterMap(LatLng currentLatLng);
-
-        void openLocationSettings();
-
-        void hideBottomSheet();
-
-        void hideBottomDetailsSheet();
-
-        void setProgressBarVisibility(boolean isVisible);
-
-        boolean isDetailsBottomSheetVisible();
-
-        void setBottomSheetDetailsSmaller();
-
-        void setRecyclerViewAdapterAllSelected();
-
-        void setRecyclerViewAdapterItemsGreyedOut();
-
-        void setCheckBoxAction();
-
-        void setCheckBoxState(int state);
-
-        void setFilterState();
-
-        void disableFABRecenter();
-
-        void enableFABRecenter();
-
-        void addCurrentLocationMarker(LatLng currentLatLng);
-
-        void clearAllMarkers();
-
-        Context getContext();
-
-        void replaceMarkerOverlays(List<MarkerPlaceGroup> markerPlaceGroups);
-
-        void filterOutAllMarkers();
-
-        void filterMarkersByLabels(List<Label> selectedLabels, boolean filterForPlaceState,
-            boolean filterForAllNoneType);
-
-        LatLng getCameraTarget();
-
-        void centerMapToPlace(@Nullable Place placeToCenter);
-
-        void updateListFragment(List<Place> placeList);
-
-        LatLng getLastLocation();
-
-        LatLng getLastMapFocus();
-
-        LatLng getMapCenter();
-
-        LatLng getMapFocus();
-
-        LatLng getScreenTopRight();
-
-        LatLng getScreenBottomLeft();
-
-        boolean isAdvancedQueryFragmentVisible();
-
-        void showHideAdvancedQueryFragment(boolean shouldShow);
-
-        void stopQuery();
-    }
-
-    interface NearbyListView {
-
-        void updateListFragment(List<Place> placeList);
-    }
-
-    interface UserActions {
-
-        void updateMapAndList(LocationChangeType locationChangeType);
-
-        void lockUnlockNearby(boolean isNearbyLocked);
-
-        void attachView(View view);
-
-        void detachView();
-
-        void setActionListeners(JsonKvStore applicationKvStore);
-
-        void removeNearbyPreferences(JsonKvStore applicationKvStore);
-
-        boolean backButtonClicked();
-
-        void filterByMarkerType(List<Label> selectedLabels, int state, boolean filterForPlaceState,
-            boolean filterForAllNoneType);
-
-        void searchViewGainedFocus();
-
-        void setCheckboxUnknown();
-
-        void setAdvancedQuery(String query);
-
-        void toggleBookmarkedStatus(Place place, LifecycleCoroutineScope scope);
-
-        void handleMapScrolled(LifecycleCoroutineScope scope, boolean isNetworkAvailable);
-    }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.kt b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.kt
new file mode 100644
index 0000000000..6ea86103ea
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.kt
@@ -0,0 +1,138 @@
+package fr.free.nrw.commons.nearby.contract
+
+import android.content.Context
+import androidx.lifecycle.LifecycleCoroutineScope
+import fr.free.nrw.commons.kvstore.JsonKvStore
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType
+import fr.free.nrw.commons.nearby.CheckBoxTriStates
+import fr.free.nrw.commons.nearby.Label
+import fr.free.nrw.commons.nearby.MarkerPlaceGroup
+import fr.free.nrw.commons.nearby.Place
+
+interface NearbyParentFragmentContract {
+    interface View {
+        val isNetworkConnectionEstablished: Boolean
+
+        fun updateSnackbar(offlinePinsShown: Boolean)
+
+        fun listOptionMenuItemClicked()
+
+        fun populatePlaces(currentLatLng: LatLng)
+
+        fun populatePlaces(currentLatLng: LatLng, customQuery: String?)
+
+        val isListBottomSheetExpanded: Boolean
+
+        fun askForLocationPermission()
+
+        fun displayLoginSkippedWarning()
+
+        fun setFABPlusAction(onClickListener: android.view.View.OnClickListener?)
+
+        fun setFABRecenterAction(onClickListener: android.view.View.OnClickListener?)
+
+        fun animateFABs()
+
+        fun recenterMap(currentLatLng: LatLng?)
+
+        fun openLocationSettings()
+
+        fun hideBottomSheet()
+
+        fun hideBottomDetailsSheet()
+
+        fun setProgressBarVisibility(isVisible: Boolean)
+
+        val isDetailsBottomSheetVisible: Boolean
+
+        fun setBottomSheetDetailsSmaller()
+
+        fun setRecyclerViewAdapterAllSelected()
+
+        fun setRecyclerViewAdapterItemsGreyedOut()
+
+        fun setCheckBoxAction()
+
+        fun setCheckBoxState(state: Int)
+
+        fun setFilterState()
+
+        fun disableFABRecenter()
+
+        fun enableFABRecenter()
+
+        fun addCurrentLocationMarker(currentLatLng: LatLng?)
+
+        fun clearAllMarkers()
+
+        fun getContext(): Context?
+
+        fun replaceMarkerOverlays(markerPlaceGroups: List<MarkerPlaceGroup>)
+
+        fun filterOutAllMarkers()
+
+        fun filterMarkersByLabels(
+            selectedLabels: List<Label>?, filterForPlaceState: Boolean, filterForAllNoneType: Boolean
+        )
+
+        val cameraTarget: LatLng?
+
+        fun centerMapToPlace(placeToCenter: Place?)
+
+        fun updateListFragment(placeList: List<Place>?)
+
+        fun getLastLocation(): LatLng
+
+        fun getLastMapFocus(): LatLng
+
+        fun getMapCenter(): LatLng
+
+        fun getMapFocus(): LatLng
+
+        fun getScreenTopRight(): LatLng
+
+        fun getScreenBottomLeft(): LatLng
+
+        fun isAdvancedQueryFragmentVisible(): Boolean
+
+        fun showHideAdvancedQueryFragment(shouldShow: Boolean)
+
+        fun stopQuery()
+    }
+
+    interface NearbyListView {
+        fun updateListFragment(placeList: List<Place>?)
+    }
+
+    interface UserActions : CheckBoxTriStates.Callback {
+        fun updateMapAndList(locationChangeType: LocationChangeType?)
+
+        fun lockUnlockNearby(isNearbyLocked: Boolean)
+
+        fun attachView(view: View)
+
+        fun detachView()
+
+        fun setActionListeners(applicationKvStore: JsonKvStore?)
+
+        fun removeNearbyPreferences(applicationKvStore: JsonKvStore?)
+
+        fun backButtonClicked(): Boolean
+
+        override fun filterByMarkerType(
+            selectedLabels: List<Label>?, state: Int, filterForPlaceState: Boolean,
+            filterForAllNoneType: Boolean
+        )
+
+        fun searchViewGainedFocus()
+
+        fun setCheckboxUnknown()
+
+        fun setAdvancedQuery(query: String?)
+
+        fun toggleBookmarkedStatus(place: Place?, scope: LifecycleCoroutineScope?)
+
+        fun handleMapScrolled(scope: LifecycleCoroutineScope?, isNetworkAvailable: Boolean)
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt
index 5f4d0ab13b..d774e077af 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt
@@ -34,7 +34,7 @@ class CommonPlaceClickActions
                 if (applicationKvStore.getBoolean("login_skipped", false)) {
                     showLoginDialog()
                 } else {
-                    Timber.d("Camera button tapped. Image title: ${place.getName()}Image desc: ${place.longDescription}")
+                    Timber.d("Camera button tapped. Image title: ${place.name}Image desc: ${place.longDescription}")
                     storeSharedPrefs(place)
                     contributionController.initiateCameraPick(activity, launcher, resultLauncher)
                 }
@@ -78,7 +78,7 @@ class CommonPlaceClickActions
                 if (applicationKvStore.getBoolean("login_skipped", false)) {
                     showLoginDialog()
                 } else {
-                    Timber.d("Gallery button tapped. Image title: ${place.getName()}Image desc: ${place.getLongDescription()}")
+                    Timber.d("Gallery button tapped. Image title: ${place.name}Image desc: ${place.longDescription}")
                     storeSharedPrefs(place)
                     contributionController.initiateGalleryPick(activity, galleryPickLauncherForResult, false)
                 }
@@ -94,9 +94,9 @@ class CommonPlaceClickActions
                         enableBy(R.id.nearby_info_menu_wikipedia_article, place.hasWikipediaLink())
                         setOnMenuItemClickListener { item: MenuItem ->
                             when (item.itemId) {
-                                R.id.nearby_info_menu_commons_article -> openWebView(place.siteLinks.commonsLink)
-                                R.id.nearby_info_menu_wikidata_article -> openWebView(place.siteLinks.wikidataLink)
-                                R.id.nearby_info_menu_wikipedia_article -> openWebView(place.siteLinks.wikipediaLink)
+                                R.id.nearby_info_menu_commons_article -> openWebView(place.siteLinks!!.commonsUri!!)
+                                R.id.nearby_info_menu_wikidata_article -> openWebView(place.siteLinks!!.wikidataUri!!)
+                                R.id.nearby_info_menu_wikipedia_article -> openWebView(place.siteLinks!!.wikipediaUri!!)
                                 else -> false
                             }
                         }
@@ -105,7 +105,7 @@ class CommonPlaceClickActions
 
         fun onDirectionsClicked(): (Place) -> Unit =
             {
-                handleGeoCoordinates(activity, it.getLocation())
+                handleGeoCoordinates(activity, it.location!!)
             }
 
         private fun storeSharedPrefs(selectedPlace: Place) {
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
index 3e6e715113..3c71fdb4ad 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
@@ -46,6 +46,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
@@ -145,6 +146,9 @@ import javax.inject.Named
 import kotlin.concurrent.Volatile
 
 
+@Suppress("UNNECESSARY_SAFE_CALL", "DEPRECATION", "UNNECESSARY_NOT_NULL_ASSERTION",
+    "SENSELESS_COMPARISON", "USELESS_ELVIS"
+)
 class NearbyParentFragment : CommonsDaggerSupportFragment(),
     NearbyParentFragmentContract.View,
     WikidataP18EditListener,
@@ -335,10 +339,10 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                 if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {
                     showAlertDialog(
                         requireActivity(),
-                        getString(fr.free.nrw.commons.R.string.location_permission_title),
-                        getString(fr.free.nrw.commons.R.string.location_permission_rationale_nearby),
-                        getString(fr.free.nrw.commons.R.string.ok),
-                        getString(fr.free.nrw.commons.R.string.cancel),
+                        getString(R.string.location_permission_title),
+                        getString(R.string.location_permission_rationale_nearby),
+                        getString(R.string.ok),
+                        getString(R.string.cancel),
                         {
                             askForLocationPermission()
                         },
@@ -349,7 +353,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                     if (isPermissionDenied) {
                         locationPermissionsHelper?.showAppSettingsDialog(
                             requireActivity(),
-                            fr.free.nrw.commons.R.string.nearby_needs_location
+                            R.string.nearby_needs_location
                         )
                     }
                     Timber.d("The user checked 'Don't ask again' or denied the permission twice")
@@ -393,12 +397,12 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         menu: Menu,
         inflater: MenuInflater
     ) {
-        inflater.inflate(fr.free.nrw.commons.R.menu.nearby_fragment_menu, menu)
-        val refreshButton = menu.findItem(fr.free.nrw.commons.R.id.item_refresh)
-        val listMenu = menu.findItem(fr.free.nrw.commons.R.id.list_sheet)
-        val showInExploreButton = menu.findItem(fr.free.nrw.commons.R.id.list_item_show_in_explore)
-        val saveAsGPXButton = menu.findItem(fr.free.nrw.commons.R.id.list_item_gpx)
-        val saveAsKMLButton = menu.findItem(fr.free.nrw.commons.R.id.list_item_kml)
+        inflater.inflate(R.menu.nearby_fragment_menu, menu)
+        val refreshButton = menu.findItem(R.id.item_refresh)
+        val listMenu = menu.findItem(R.id.list_sheet)
+        val showInExploreButton = menu.findItem(R.id.list_item_show_in_explore)
+        val saveAsGPXButton = menu.findItem(R.id.list_item_gpx)
+        val saveAsKMLButton = menu.findItem(R.id.list_item_kml)
         refreshButton.setOnMenuItemClickListener {
             try {
                 emptyCache()
@@ -424,7 +428,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
 
         saveAsGPXButton.setOnMenuItemClickListener {
             try {
-                progressDialog!!.setTitle(getString(fr.free.nrw.commons.R.string.saving_gpx_file))
+                progressDialog!!.setTitle(getString(R.string.saving_gpx_file))
                 progressDialog!!.show()
                 savePlacesAsGPX()
             } catch (e: Exception) {
@@ -434,7 +438,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         }
         saveAsKMLButton.setOnMenuItemClickListener {
             try {
-                progressDialog!!.setTitle(getString(fr.free.nrw.commons.R.string.saving_kml_file))
+                progressDialog!!.setTitle(getString(R.string.saving_kml_file))
                 progressDialog!!.show()
                 savePlacesAsKML()
             } catch (e: Exception) {
@@ -462,7 +466,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                         )
                     } else {
                         controller?.locationPermissionCallback?.onLocationPermissionDenied(
-                            getString(fr.free.nrw.commons.R.string.in_app_camera_location_permission_denied)
+                            getString(R.string.in_app_camera_location_permission_denied)
                         )
                     }
                 }
@@ -555,13 +559,13 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             binding?.tvAttribution?.text = Html.fromHtml(
-                getString(fr.free.nrw.commons.R.string.map_attribution),
+                getString(R.string.map_attribution),
                 Html.FROM_HTML_MODE_LEGACY
             )
         } else {
             @Suppress("DEPRECATION")
             binding?.tvAttribution?.text =
-                Html.fromHtml(getString(fr.free.nrw.commons.R.string.map_attribution))
+                Html.fromHtml(getString(R.string.map_attribution))
         }
         binding?.tvAttribution?.movementMethod = LinkMovementMethod.getInstance()
 
@@ -597,7 +601,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                 }
             }
             childFragmentManager.beginTransaction()
-                .replace(fr.free.nrw.commons.R.id.fl_container_nearby_children, fragment)
+                .replace(R.id.fl_container_nearby_children, fragment)
                 .commit()
         }
 
@@ -639,31 +643,31 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     private fun initThemePreferences() {
         if (_isDarkTheme) {
             binding!!.bottomSheetNearby.rvNearbyList.setBackgroundColor(
-                requireContext().resources.getColor(fr.free.nrw.commons.R.color.contributionListDarkBackground)
+                requireContext().resources.getColor(R.color.contributionListDarkBackground)
             )
             binding!!.nearbyFilterList.checkboxTriStates.setTextColor(
-                requireContext().resources.getColor(fr.free.nrw.commons.R.color.white)
+                requireContext().resources.getColor(R.color.white)
             )
             binding!!.nearbyFilterList.checkboxTriStates.setTextColor(
-                requireContext().resources.getColor(fr.free.nrw.commons.R.color.white)
+                requireContext().resources.getColor(R.color.white)
             )
             binding!!.nearbyFilterList.root.setBackgroundColor(
-                requireContext().resources.getColor(fr.free.nrw.commons.R.color.contributionListDarkBackground)
+                requireContext().resources.getColor(R.color.contributionListDarkBackground)
             )
             binding!!.map.overlayManager.tilesOverlay
                 .setColorFilter(TilesOverlay.INVERT_COLORS)
         } else {
             binding!!.bottomSheetNearby.rvNearbyList.setBackgroundColor(
-                requireContext().resources.getColor(fr.free.nrw.commons.R.color.white)
+                requireContext().resources.getColor(R.color.white)
             )
             binding!!.nearbyFilterList.checkboxTriStates.setTextColor(
-                requireContext().resources.getColor(fr.free.nrw.commons.R.color.contributionListDarkBackground)
+                requireContext().resources.getColor(R.color.contributionListDarkBackground)
             )
             binding!!.nearbyFilterList.root.setBackgroundColor(
-                requireContext().resources.getColor(fr.free.nrw.commons.R.color.white)
+                requireContext().resources.getColor(R.color.white)
             )
             binding!!.nearbyFilterList.root.setBackgroundColor(
-                requireContext().resources.getColor(fr.free.nrw.commons.R.color.white)
+                requireContext().resources.getColor(R.color.white)
             )
         }
     }
@@ -676,8 +680,8 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             onPlaceClicked = { place: Place ->
                 moveCameraToPosition(
                     GeoPoint(
-                        place.location.latitude,
-                        place.location.longitude
+                        place.location!!.latitude,
+                        place.location!!.longitude
                     )
                 )
             },
@@ -693,14 +697,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     }
 
     private fun addCheckBoxCallback() {
-        binding!!.nearbyFilterList.checkboxTriStates.setCallback { o, state, b, b1 ->
-            presenter!!.filterByMarkerType(
-                o,
-                state,
-                b,
-                b1
-            )
-        }
+        binding!!.nearbyFilterList.checkboxTriStates.callback = presenter!!
     }
 
     private fun performMapReadyActions() {
@@ -910,26 +907,24 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         linearLayoutManager.orientation = LinearLayoutManager.VERTICAL
         binding!!.nearbyFilterList.searchListView.layoutManager = linearLayoutManager
         nearbyFilterSearchRecyclerViewAdapter = NearbyFilterSearchRecyclerViewAdapter(
-            context, ArrayList(Label.valuesAsList()),
-            binding!!.nearbyFilterList.searchListView
+            requireContext(), ArrayList(Label.entries)
         )
-        nearbyFilterSearchRecyclerViewAdapter!!.setCallback(
+        nearbyFilterSearchRecyclerViewAdapter!!.callback =
             object : NearbyFilterSearchRecyclerViewAdapter.Callback {
                 override fun setCheckboxUnknown() {
                     presenter!!.setCheckboxUnknown()
                 }
 
                 override fun filterByMarkerType(
-                    selectedLabels: ArrayList<Label>, i: Int,
-                    b: Boolean, b1: Boolean
+                    selectedLabels: List<Label>, i: Int, filterForPlaceState: Boolean,
+                    filterForAllNoneType: Boolean
                 ) {
-                    presenter!!.filterByMarkerType(selectedLabels, i, b, b1)
+                    presenter!!.filterByMarkerType(selectedLabels, i, filterForPlaceState, filterForAllNoneType)
                 }
 
-                override fun isDarkTheme(): Boolean {
-                    return _isDarkTheme
-                }
-            })
+                override val isDarkTheme: Boolean
+                    get() = _isDarkTheme
+            }
         restoreStoredFilterSelection()
         binding!!.nearbyFilterList.root
             .layoutParams.width = getScreenWidth(
@@ -951,12 +946,12 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
 
     private fun restoreStoredFilterSelection() {
         val adapter = nearbyFilterSearchRecyclerViewAdapter ?: return
-        val savedLabels = ArrayList(NearbyFilterState.getInstance().selectedLabels)
+        val savedLabels = ArrayList(NearbyFilterState.selectedLabels)
         adapter.selectedLabels.clear()
         val savedSet = savedLabels.toSet()
-        Label.valuesAsList().forEach { label ->
+        Label.entries.forEach { label ->
             val isSelected = savedSet.contains(label)
-            label.setSelected(isSelected)
+            label.isSelected = isSelected
             if (isSelected) {
                 adapter.selectedLabels.add(label)
             }
@@ -967,18 +962,18 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
 
     override fun setCheckBoxAction() {
         binding!!.nearbyFilterList.checkboxTriStates.addAction()
-        binding!!.nearbyFilterList.checkboxTriStates.state = CheckBoxTriStates.UNKNOWN
+        binding!!.nearbyFilterList.checkboxTriStates.setState(CheckBoxTriStates.UNKNOWN)
     }
 
     override fun setCheckBoxState(state: Int) {
-        binding!!.nearbyFilterList.checkboxTriStates.state = state
+        binding!!.nearbyFilterList.checkboxTriStates.setState(state)
     }
 
     override fun setFilterState() {
         if (NearbyController.currentLocation != null) {
             presenter!!.filterByMarkerType(
                 nearbyFilterSearchRecyclerViewAdapter!!.selectedLabels,
-                binding!!.nearbyFilterList.checkboxTriStates.state, true, false
+                binding!!.nearbyFilterList.checkboxTriStates.getState(), true, false
             )
         }
     }
@@ -1028,12 +1023,12 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
      * Loads animations will be used for FABs
      */
     private fun loadAnimations() {
-        fab_open = AnimationUtils.loadAnimation(activity, fr.free.nrw.commons.R.anim.fab_open)
-        fab_close = AnimationUtils.loadAnimation(activity, fr.free.nrw.commons.R.anim.fab_close)
+        fab_open = AnimationUtils.loadAnimation(activity, R.anim.fab_open)
+        fab_close = AnimationUtils.loadAnimation(activity, R.anim.fab_close)
         rotate_forward =
-            AnimationUtils.loadAnimation(activity, fr.free.nrw.commons.R.anim.rotate_forward)
+            AnimationUtils.loadAnimation(activity, R.anim.rotate_forward)
         rotate_backward =
-            AnimationUtils.loadAnimation(activity, fr.free.nrw.commons.R.anim.rotate_backward)
+            AnimationUtils.loadAnimation(activity, R.anim.rotate_backward)
     }
 
     /**
@@ -1044,7 +1039,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             requireContext().copyToClipboard(
                 "place", binding!!.bottomSheetDetails.title.text.toString()
             )
-            Toast.makeText(requireContext(), fr.free.nrw.commons.R.string.text_copy, Toast.LENGTH_SHORT)
+            Toast.makeText(requireContext(), R.string.text_copy, Toast.LENGTH_SHORT)
                 .show()
             true
         }
@@ -1062,14 +1057,14 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     /**
      * Centers the map in nearby fragment to a given place and updates nearestPlace
      *
-     * @param place is new center of the map
+     * @param placeToCenter is new center of the map
      */
-    override fun centerMapToPlace(place: Place?) {
+    override fun centerMapToPlace(placeToCenter: Place?) {
         Timber.d("Map is centered to place")
         val cameraShift: Double
-        if (null != place) {
-            lastPlaceToCenter = place
-            nearestPlace = place
+        if (null != placeToCenter) {
+            lastPlaceToCenter = placeToCenter
+            nearestPlace = placeToCenter
         }
 
         if (null != lastPlaceToCenter) {
@@ -1081,20 +1076,20 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             }
             recenterMap(
                 LatLng(
-                    lastPlaceToCenter!!.location.latitude - cameraShift,
-                    lastPlaceToCenter!!.getLocation().longitude, 0f
+                    lastPlaceToCenter!!.location!!.latitude - cameraShift,
+                    lastPlaceToCenter!!.location!!.longitude, 0f
                 )
             )
         }
-        highlightNearestPlace(place!!)
+        highlightNearestPlace(placeToCenter!!)
     }
 
 
-    override fun updateListFragment(placeList: List<Place>) {
+    override fun updateListFragment(placeList: List<Place>?) {
         adapter!!.clear()
-        adapter!!.items = placeList.filter{ it.name.isNotEmpty() }
+        adapter!!.items = placeList?.filter{ it.name!!.isNotEmpty() } ?: emptyList()
         binding!!.bottomSheetNearby.noResultsMessage.visibility =
-            if (placeList.isEmpty()) View.VISIBLE else View.GONE
+            if (placeList.isNullOrEmpty()) View.VISIBLE else View.GONE
     }
 
     override fun getLastLocation(): LatLng {
@@ -1155,9 +1150,8 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         isAdvancedQueryFragmentVisible = shouldShow
     }
 
-    override fun isNetworkConnectionEstablished(): Boolean {
-        return isInternetConnectionEstablished(activity)
-    }
+    override val isNetworkConnectionEstablished: Boolean
+        get() = isInternetConnectionEstablished(activity)
 
     /**
      * Adds network broadcast receiver to recognize connection established
@@ -1179,7 +1173,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                     } else {
                         if (snackbar == null) {
                             snackbar = Snackbar.make(
-                                view!!, fr.free.nrw.commons.R.string.no_internet,
+                                view!!, R.string.no_internet,
                                 Snackbar.LENGTH_INDEFINITE
                             )
                             searchable = false
@@ -1204,9 +1198,9 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             return
         }
         if (offlinePinsShown) {
-            snackbar!!.setText(fr.free.nrw.commons.R.string.nearby_showing_pins_offline)
+            snackbar!!.setText(R.string.nearby_showing_pins_offline)
         } else {
-            snackbar!!.setText(fr.free.nrw.commons.R.string.no_internet)
+            snackbar!!.setText(R.string.no_internet)
         }
     }
 
@@ -1253,8 +1247,8 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     override fun populatePlaces(currentLatLng: LatLng) {
         // these two variables have historically been assigned values the opposite of what their
         // names imply, and quite some existing code depends on this fact
-        var screenTopRightLatLng = screenBottomLeft
-        var screenBottomLeftLatLng = screenTopRight
+        var screenTopRightLatLng = getScreenBottomLeft()
+        var screenBottomLeftLatLng = getScreenTopRight()
 
         // When the nearby fragment is opened immediately upon app launch, the {screenTopRightLatLng}
         // and {screenBottomLeftLatLng} variables return {LatLng(0.0,0.0)} as output.
@@ -1283,12 +1277,12 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                 )
             ) { // Means we are checking around current location
                 populatePlacesForCurrentLocation(
-                    mapFocus, screenTopRightLatLng,
+                    getMapFocus(), screenTopRightLatLng,
                     screenBottomLeftLatLng, currentLatLng, null
                 )
             } else {
                 populatePlacesForAnotherLocation(
-                    mapFocus, screenTopRightLatLng,
+                    getMapFocus(), screenTopRightLatLng,
                     screenBottomLeftLatLng, currentLatLng, null
                 )
             }
@@ -1298,12 +1292,12 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                 )
             ) { // Means we are checking around current location
                 populatePlacesForCurrentLocation(
-                    mapFocus, screenTopRightLatLng,
+                    getMapFocus(), screenTopRightLatLng,
                     screenBottomLeftLatLng, currentLatLng, null
                 )
             } else {
                 populatePlacesForAnotherLocation(
-                    mapFocus, screenTopRightLatLng,
+                    getMapFocus(), screenTopRightLatLng,
                     screenBottomLeftLatLng, currentLatLng, null
                 )
             }
@@ -1324,19 +1318,23 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         }
         // these two variables have historically been assigned values the opposite of what their
         // names imply, and quite some existing code depends on this fact
-        val screenTopRightLatLng = screenBottomLeft
-        val screenBottomLeftLatLng = screenTopRight
+        val screenTopRightLatLng = getScreenBottomLeft()
+        val screenBottomLeftLatLng = getScreenTopRight()
 
         if (currentLatLng.equals(lastFocusLocation) || lastFocusLocation == null || recenterToUserLocation) { // Means we are checking around current location
-            populatePlacesForCurrentLocation(
-                lastKnownLocation, screenTopRightLatLng,
-                screenBottomLeftLatLng, currentLatLng, customQuery
-            )
+            lastKnownLocation?.let {
+                populatePlacesForCurrentLocation(
+                    it, screenTopRightLatLng,
+                    screenBottomLeftLatLng, currentLatLng, customQuery
+                )
+            }
         } else {
-            populatePlacesForAnotherLocation(
-                lastKnownLocation, screenTopRightLatLng,
-                screenBottomLeftLatLng, currentLatLng, customQuery
-            )
+            lastKnownLocation?.let {
+                populatePlacesForAnotherLocation(
+                    it, screenTopRightLatLng,
+                    screenBottomLeftLatLng, currentLatLng, customQuery
+                )
+            }
         }
         if (recenterToUserLocation) {
             recenterToUserLocation = false
@@ -1361,11 +1359,11 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                     for (placeGroup in NearbyController.markerLabelList) {
                         val place = Place(
                             "", "", placeGroup.place.label, "",
-                            placeGroup.place.getLocation(), "",
+                            placeGroup.place.location, "",
                             placeGroup.place.siteLinks, "", placeGroup.place.exists,
                             placeGroup.place.entityID
                         )
-                        place.setDistance(placeGroup.place.distance)
+                        place.distance= placeGroup.place.distance
                         place.isMonument = placeGroup.place.isMonument
                         newPlaceGroups.add(
                             MarkerPlaceGroup(placeGroup.isBookmarked, place)
@@ -1387,7 +1385,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     private fun savePlacesAsKML() {
         val savePlacesObservable = Observable
             .fromCallable {
-                nearbyController?.getPlacesAsKML(mapFocus)
+                nearbyController?.getPlacesAsKML(getMapFocus())
             }
         compositeDisposable.add(
             savePlacesObservable
@@ -1409,7 +1407,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                             } else {
                                 Toast.makeText(
                                     this.context,
-                                    getString(fr.free.nrw.commons.R.string.failed_to_save_kml_file),
+                                    getString(R.string.failed_to_save_kml_file),
                                     Toast.LENGTH_SHORT
                                 ).show()
                             }
@@ -1418,7 +1416,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                     { throwable: Throwable ->
                         Timber.d(throwable)
                         showErrorMessage(
-                            getString(fr.free.nrw.commons.R.string.error_fetching_nearby_places)
+                            getString(R.string.error_fetching_nearby_places)
                                 + throwable.localizedMessage
                         )
                         setProgressBarVisibility(false)
@@ -1431,7 +1429,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     private fun savePlacesAsGPX() {
         val savePlacesObservable = Observable
             .fromCallable {
-                nearbyController?.getPlacesAsGPX(mapFocus)
+                nearbyController?.getPlacesAsGPX(getMapFocus())
             }
         compositeDisposable.add(
             savePlacesObservable
@@ -1453,7 +1451,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                             } else {
                                 Toast.makeText(
                                     this.context,
-                                    getString(fr.free.nrw.commons.R.string.failed_to_save_gpx_file),
+                                    getString(R.string.failed_to_save_gpx_file),
                                     Toast.LENGTH_SHORT
                                 ).show()
                             }
@@ -1462,7 +1460,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                     { throwable: Throwable ->
                         Timber.d(throwable)
                         showErrorMessage(
-                            getString(fr.free.nrw.commons.R.string.error_fetching_nearby_places)
+                            getString(R.string.error_fetching_nearby_places)
                                 + throwable.localizedMessage
                         )
                         setProgressBarVisibility(false)
@@ -1472,7 +1470,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         )
     }
 
-    fun saveFile(string: String, fileName: String?): Boolean {
+    fun saveFile(string: String, fileName: String): Boolean {
         if (!isExternalStorageWritable) {
             return false
         }
@@ -1495,12 +1493,12 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
 
 
     private fun showOpenFileDialog(context: Context, fileName: String, isGPX: Boolean) {
-        val title = getString(fr.free.nrw.commons.R.string.file_saved_successfully)
+        val title = getString(R.string.file_saved_successfully)
         val message =
             if ((isGPX))
-                getString(fr.free.nrw.commons.R.string.do_you_want_to_open_gpx_file)
+                getString(R.string.do_you_want_to_open_gpx_file)
             else
-                getString(fr.free.nrw.commons.R.string.do_you_want_to_open_kml_file)
+                getString(R.string.do_you_want_to_open_kml_file)
         val runnable = Runnable { openFile(context, fileName, isGPX) }
         showAlertDialog(requireActivity(), title, message, runnable) {}
     }
@@ -1527,7 +1525,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             context.startActivity(intent)
         } catch (e: ActivityNotFoundException) {
             Toast.makeText(
-                context, fr.free.nrw.commons.R.string.no_application_available_to_open_gpx_files,
+                context, R.string.no_application_available_to_open_gpx_files,
                 Toast.LENGTH_SHORT
             ).show()
         }
@@ -1542,10 +1540,9 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
      * @param isBookMarked A boolean indicating if the place is bookmarked.
      */
     private fun getPlaceData(entity: String?, place: Place, marker: Marker, isBookMarked: Boolean) {
-        val getPlaceObservable = Observable
-            .fromCallable {
-                nearbyController?.getPlaces(java.util.List.of(place))
-            }
+        val getPlaceObservable: Observable<List<Place>> = Observable.fromCallable {
+            nearbyController?.getPlaces(listOf(place)) ?: emptyList()
+        }
         compositeDisposable.add(
             getPlaceObservable
                 .subscribeOn(Schedulers.io())
@@ -1556,10 +1553,8 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                         updatedPlace.distance = place.distance
                         updatedPlace.location = place.location
                         marker.title = updatedPlace.name
-                        marker.snippet = if (containsParentheses(updatedPlace.longDescription))
-                            getTextBetweenParentheses(
-                                updatedPlace.longDescription
-                            )
+                        marker.snippet = if (containsParentheses(updatedPlace.longDescription!!))
+                            getTextBetweenParentheses(updatedPlace.longDescription!!)
                         else
                             updatedPlace.longDescription
                         marker.showInfoWindow()
@@ -1580,7 +1575,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                     { throwable: Throwable ->
                         Timber.d(throwable)
                         showErrorMessage(
-                            getString(fr.free.nrw.commons.R.string.could_not_load_place_data)
+                            getString(R.string.could_not_load_place_data)
                                 + throwable.localizedMessage
                         )
                     })
@@ -1588,7 +1583,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     }
 
     private fun populatePlacesForCurrentLocation(
-        currentLatLng: LatLng?,
+        currentLatLng: LatLng,
         screenTopRight: LatLng,
         screenBottomLeft: LatLng,
         searchLatLng: LatLng,
@@ -1615,7 +1610,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                 .subscribe(
                     { nearbyPlacesInfo: NearbyPlacesInfo ->
                         if (nearbyPlacesInfo.placeList == null || nearbyPlacesInfo.placeList.isEmpty()) {
-                            showErrorMessage(getString(fr.free.nrw.commons.R.string.no_nearby_places_around))
+                            showErrorMessage(getString(R.string.no_nearby_places_around))
                             setProgressBarVisibility(false)
                             presenter!!.lockUnlockNearby(false)
                         } else {
@@ -1630,7 +1625,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                     { throwable: Throwable ->
                         Timber.d(throwable)
                         showErrorMessage(
-                            getString(fr.free.nrw.commons.R.string.error_fetching_nearby_places)
+                            getString(R.string.error_fetching_nearby_places)
                                 + throwable.localizedMessage
                         )
                         setProgressBarVisibility(false)
@@ -1641,7 +1636,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     }
 
     private fun populatePlacesForAnotherLocation(
-        currentLatLng: LatLng?,
+        currentLatLng: LatLng,
         screenTopRight: LatLng,
         screenBottomLeft: LatLng,
         searchLatLng: LatLng,
@@ -1668,7 +1663,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                 .subscribe(
                     { nearbyPlacesInfo: NearbyPlacesInfo ->
                         if (nearbyPlacesInfo.placeList == null || nearbyPlacesInfo.placeList.isEmpty()) {
-                            showErrorMessage(getString(fr.free.nrw.commons.R.string.no_nearby_places_around))
+                            showErrorMessage(getString(R.string.no_nearby_places_around))
                             setProgressBarVisibility(false)
                             presenter!!.lockUnlockNearby(false)
                         } else {
@@ -1691,7 +1686,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                     { throwable: Throwable ->
                         Timber.e(throwable)
                         showErrorMessage(
-                            getString(fr.free.nrw.commons.R.string.error_fetching_nearby_places)
+                            getString(R.string.error_fetching_nearby_places)
                                 + throwable.localizedMessage
                         )
                         setProgressBarVisibility(false)
@@ -1702,10 +1697,10 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     }
 
     fun savePlaceToDatabase(place: Place?) {
-        placesRepository?.save(place)?.subscribeOn(Schedulers.io())?.subscribe()?.let {
-            compositeDisposable.add(
-                it
-            )
+        place?.let {
+            placesRepository?.save(it)?.subscribeOn(Schedulers.io())?.subscribe()?.let {
+                compositeDisposable.add(it)
+            }
         }
     }
 
@@ -1732,14 +1727,11 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         presenter!!.updateMapMarkers(nearbyPlaces, curLatLng, scope)
     }
 
+    override val isListBottomSheetExpanded: Boolean
+        get() = bottomSheetListBehavior!!.state == BottomSheetBehavior.STATE_EXPANDED
 
-    override fun isListBottomSheetExpanded(): Boolean {
-        return bottomSheetListBehavior!!.state == BottomSheetBehavior.STATE_EXPANDED
-    }
-
-    override fun isDetailsBottomSheetVisible(): Boolean {
-        return bottomSheetDetailsBehavior!!.state != BottomSheetBehavior.STATE_HIDDEN
-    }
+    override val isDetailsBottomSheetVisible: Boolean
+        get() = bottomSheetDetailsBehavior!!.state != BottomSheetBehavior.STATE_HIDDEN
 
     override fun setBottomSheetDetailsSmaller() {
         if (bottomSheetDetailsBehavior!!.state == BottomSheetBehavior.STATE_EXPANDED) {
@@ -1799,15 +1791,15 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         binding!!.fabPlus.show()
         addAnchorToSmallFABs(
             binding!!.fabGallery,
-            requireView().findViewById<View>(fr.free.nrw.commons.R.id.empty_view).id
+            requireView().findViewById<View>(R.id.empty_view).id
         )
         addAnchorToSmallFABs(
             binding!!.fabCamera,
-            requireView().findViewById<View>(fr.free.nrw.commons.R.id.empty_view1).id
+            requireView().findViewById<View>(R.id.empty_view1).id
         )
         addAnchorToSmallFABs(
             binding!!.fabCustomGallery,
-            requireView().findViewById<View>(fr.free.nrw.commons.R.id.empty_view2).id
+            requireView().findViewById<View>(R.id.empty_view2).id
         )
     }
 
@@ -1866,10 +1858,10 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         if (applicationKvStore!!.getBoolean("login_skipped", false)) {
             // prompt the user to login
             AlertDialog.Builder(requireContext())
-                .setMessage(fr.free.nrw.commons.R.string.login_alert_message)
+                .setMessage(R.string.login_alert_message)
                 .setCancelable(false)
-                .setNegativeButton(fr.free.nrw.commons.R.string.cancel) { dialog, which -> }
-                .setPositiveButton(fr.free.nrw.commons.R.string.login) { dialog, which ->
+                .setNegativeButton(R.string.cancel) { dialog, which -> }
+                .setPositiveButton(R.string.login) { dialog, which ->
                     // logout of the app
                     val logoutListener =
                         CommonsApplication.BaseLogoutListener(
@@ -1953,11 +1945,11 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
      * onLogoutComplete is called after shared preferences and data stored in local database are
      * cleared.
      */
-    override fun setFABPlusAction(onClickListener: View.OnClickListener) {
+    override fun setFABPlusAction(onClickListener: View.OnClickListener?) {
         binding!!.fabPlus.setOnClickListener(onClickListener)
     }
 
-    override fun setFABRecenterAction(onClickListener: View.OnClickListener) {
+    override fun setFABRecenterAction(onClickListener: View.OnClickListener?) {
         binding!!.fabRecenter.setOnClickListener(onClickListener)
     }
 
@@ -2040,17 +2032,17 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                 shouldUpdateMarker = true
             } else if (displayExists && displayNeedsPhoto) {
                 // Exists and needs photo
-                if (place.exists && place.pic.trim { it <= ' ' }.isEmpty()) {
+                if (place.exists!! && place.pic!!.trim { it <= ' ' }.isEmpty()) {
                     shouldUpdateMarker = true
                 }
             } else if (displayExists) {
                 // Exists and all included needs and doesn't needs photo
-                if (place.exists) {
+                if (place.exists!!) {
                     shouldUpdateMarker = true
                 }
             } else if (displayNeedsPhoto) {
                 // All and only needs photo
-                if (place.pic.trim { it <= ' ' }.isEmpty()) {
+                if (place.pic!!.trim { it <= ' ' }.isEmpty()) {
                     shouldUpdateMarker = true
                 }
             } else {
@@ -2067,9 +2059,8 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         replaceMarkerOverlays(placeGroupsToShow)
     }
 
-    override fun getCameraTarget(): LatLng? {
-        return if (binding!!.map == null) null else mapFocus
-    }
+    override val cameraTarget: LatLng?
+        get() = if (binding!!.map == null) null else getMapFocus()
 
     /**
      * Highlights nearest place when user clicks on home nearby banner
@@ -2094,27 +2085,33 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     private fun getIconFor(place: Place, isBookmarked: Boolean): Int {
         if (nearestPlace != null && place.name == nearestPlace!!.name) {
             // Highlight nearest place only when user clicks on the home nearby banner
-//            highlightNearestPlace(place);
-            return (if (isBookmarked) fr.free.nrw.commons.R.drawable.ic_custom_map_marker_purple_bookmarked else fr.free.nrw.commons.R.drawable.ic_custom_map_marker_purple
-                )
+            //   highlightNearestPlace(place);
+            return if (isBookmarked) R.drawable.ic_custom_map_marker_purple_bookmarked else R.drawable.ic_custom_map_marker_purple
         }
 
         if (place.isMonument) {
-            return fr.free.nrw.commons.R.drawable.ic_custom_map_marker_monuments
+            return R.drawable.ic_custom_map_marker_monuments
         }
-        if (!place.pic.trim { it <= ' ' }.isEmpty()) {
-            return (if (isBookmarked) fr.free.nrw.commons.R.drawable.ic_custom_map_marker_green_bookmarked else fr.free.nrw.commons.R.drawable.ic_custom_map_marker_green
-                )
+
+        place.pic?.let {
+            if (!it.trim { it <= ' ' }.isEmpty()) {
+                return if (isBookmarked) R.drawable.ic_custom_map_marker_green_bookmarked else R.drawable.ic_custom_map_marker_green
+            }
         }
-        if (!place.exists) { // Means that the topic of the Wikidata item does not exist in the real world anymore, for instance it is a past event, or a place that was destroyed
-            return (fr.free.nrw.commons.R.drawable.ic_clear_black_24dp)
+
+        // Means that the topic of the Wikidata item does not exist in the real world anymore,
+        // for instance it is a past event, or a place that was destroyed
+        if (place.exists == false) {
+            return (R.drawable.ic_clear_black_24dp)
         }
-        if (place.name.isEmpty()) {
-            return (if (isBookmarked) fr.free.nrw.commons.R.drawable.ic_custom_map_marker_grey_bookmarked else fr.free.nrw.commons.R.drawable.ic_custom_map_marker_grey
-                )
+
+        place.name?.let {
+            if (it.isEmpty()) {
+                return if (isBookmarked) R.drawable.ic_custom_map_marker_grey_bookmarked else R.drawable.ic_custom_map_marker_grey
+            }
         }
-        return (if (isBookmarked) fr.free.nrw.commons.R.drawable.ic_custom_map_marker_red_bookmarked else fr.free.nrw.commons.R.drawable.ic_custom_map_marker_red
-            )
+
+        return if (isBookmarked) R.drawable.ic_custom_map_marker_red_bookmarked else R.drawable.ic_custom_map_marker_red
     }
 
     /**
@@ -2146,16 +2143,14 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
 
     fun convertToMarker(place: Place, isBookMarked: Boolean): Marker {
         val icon = getDrawable(requireContext(), getIconFor(place, isBookMarked))
-        val point = GeoPoint(place.location.latitude, place.location.longitude)
+        val point = GeoPoint(place.location!!.latitude, place.location!!.longitude)
         val marker = Marker(binding!!.map)
         marker.position = point
         marker.icon = icon
         if (place.name != "") {
             marker.title = place.name
-            marker.snippet = if (containsParentheses(place.longDescription))
-                getTextBetweenParentheses(
-                    place.longDescription
-                )
+            marker.snippet = if (containsParentheses(place.longDescription!!))
+                getTextBetweenParentheses(place.longDescription!!)
             else
                 place.longDescription
         }
@@ -2277,14 +2272,14 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             startActivity(intent)
             Toast.makeText(
                 context,
-                fr.free.nrw.commons.R.string.recommend_high_accuracy_mode,
+                R.string.recommend_high_accuracy_mode,
                 Toast.LENGTH_LONG
             )
                 .show()
         } else {
             Toast.makeText(
                 context,
-                fr.free.nrw.commons.R.string.cannot_open_location_settings,
+                R.string.cannot_open_location_settings,
                 Toast.LENGTH_LONG
             )
                 .show()
@@ -2343,28 +2338,28 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         (dataList as ArrayList<BottomSheetItem>).add(
             BottomSheetItem(
                 R.drawable.ic_directions_black_24dp,
-                resources.getString(fr.free.nrw.commons.R.string.nearby_directions)
+                resources.getString(R.string.nearby_directions)
             )
         )
         if (place.hasWikidataLink()) {
             (dataList as ArrayList<BottomSheetItem>).add(
                 BottomSheetItem(
                     R.drawable.ic_wikidata_logo_24dp,
-                    resources.getString(fr.free.nrw.commons.R.string.nearby_wikidata)
+                    resources.getString(R.string.nearby_wikidata)
                 )
             )
         }
         (dataList as ArrayList<BottomSheetItem>).add(
             BottomSheetItem(
                 R.drawable.ic_feedback_black_24dp,
-                resources.getString(fr.free.nrw.commons.R.string.nearby_wikitalk)
+                resources.getString(R.string.nearby_wikitalk)
             )
         )
         if (place.hasWikipediaLink()) {
             (dataList as ArrayList<BottomSheetItem>).add(
                 BottomSheetItem(
                     R.drawable.ic_wikipedia_logo_24dp,
-                    resources.getString(fr.free.nrw.commons.R.string.nearby_wikipedia)
+                    resources.getString(R.string.nearby_wikipedia)
                 )
             )
         }
@@ -2372,7 +2367,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             (dataList as ArrayList<BottomSheetItem>).add(
                 BottomSheetItem(
                     R.drawable.ic_commons_icon_vector,
-                    resources.getString(fr.free.nrw.commons.R.string.nearby_commons)
+                    resources.getString(R.string.nearby_commons)
                 )
             )
         }
@@ -2403,7 +2398,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             Glide.with(binding!!.bottomSheetDetails.icon.context)
                 .load("https://commons.wikimedia.org/wiki/Special:Redirect/file/$imageName?width=25")
                 .placeholder(loadingDrawable)
-                .error(selectedPlace!!.label.icon)
+                .error(selectedPlace?.label!!.icon)
                 .listener(object : RequestListener<Drawable> {
                     override fun onLoadFailed(
                         e: GlideException?,
@@ -2419,7 +2414,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                         resource: Drawable,
                         model: Any,
                         target: Target<Drawable>?,
-                        dataSource: com.bumptech.glide.load.DataSource,
+                        dataSource: DataSource,
                         isFirstResource: Boolean
                     ): Boolean {
                         binding!!.bottomSheetDetails.icon.clearAnimation()
@@ -2438,14 +2433,14 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                 handleMediaClick(imageName)
             }
         } ?: run {
-            binding!!.bottomSheetDetails.icon.setImageResource(selectedPlace!!.label.icon)
+            binding!!.bottomSheetDetails.icon.setImageResource(selectedPlace!!.label!!.icon)
         }
 
         binding!!.bottomSheetDetails.title.text = selectedPlace!!.name
         binding!!.bottomSheetDetails.category.text = selectedPlace!!.distance
         // Remove label since it is double information
-        var descriptionText = selectedPlace!!.longDescription
-            .replace(selectedPlace!!.getName() + " (", "")
+        var descriptionText = selectedPlace!!.longDescription!!
+            .replace(selectedPlace!!.name + " (", "")
         descriptionText = (if (descriptionText == selectedPlace!!.longDescription)
             descriptionText
         else
@@ -2603,7 +2598,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     private fun updateBookmarkButtonImage(place: Place) {
         NearbyUtil.getBookmarkLocationExists(
             bookmarkLocationDao,
-            place.getName(),
+            place.name!!,
             scope,
             bottomSheetAdapter!!
         )
@@ -2651,6 +2646,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {
         super.setUserVisibleHint(isVisibleToUser)
         this.isVisibleToUser = isVisibleToUser
@@ -2806,7 +2802,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
         currentLocationOverlay.icon =
             getDrawable(
                 this.requireContext(),
-                fr.free.nrw.commons.R.drawable.current_location_marker
+                R.drawable.current_location_marker
             )
         currentLocationOverlay.title = "Your Location"
         currentLocationOverlay.textLabelFontSize = 24
@@ -2877,13 +2873,13 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
 
             R.drawable.ic_directions_black_24dp -> {
                 selectedPlace?.let {
-                    handleGeoCoordinates(requireContext(), it.getLocation())
+                    handleGeoCoordinates(requireContext(), it.location!!)
                     binding?.map?.zoomLevelDouble ?: 0.0
                 }
             }
 
             R.drawable.ic_wikidata_logo_24dp -> {
-                selectedPlace?.siteLinks?.wikidataLink?.let {
+                selectedPlace?.siteLinks?.wikidataUri?.let {
                     handleWebUrl(requireContext(), it)
                 }
             }
@@ -2891,8 +2887,8 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             R.drawable.ic_feedback_black_24dp -> {
                 selectedPlace?.let {
                     val intent = Intent(this.context, WikidataFeedback::class.java).apply {
-                        putExtra("lat", it.location.latitude)
-                        putExtra("lng", it.location.longitude)
+                        putExtra("lat", it.location!!.latitude)
+                        putExtra("lng", it.location!!.longitude)
                         putExtra("place", it.name)
                         putExtra("qid", it.wikiDataEntityId)
                     }
@@ -2901,13 +2897,13 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             }
 
             R.drawable.ic_wikipedia_logo_24dp -> {
-                selectedPlace?.siteLinks?.wikipediaLink?.let {
+                selectedPlace?.siteLinks?.wikipediaUri?.let {
                     handleWebUrl(requireContext(), it)
                 }
             }
 
             R.drawable.ic_commons_icon_vector -> {
-                selectedPlace?.siteLinks?.commonsLink?.let {
+                selectedPlace?.siteLinks?.commonsUri?.let { it: Uri ->
                     handleWebUrl(requireContext(), it)
                 }
             }
@@ -2920,13 +2916,13 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     override fun onBottomSheetItemLongClick(view: View?, position: Int) {
         val item = dataList!![position]
         val message = when (item.imageResourceId) {
-            R.drawable.ic_round_star_border_24px -> getString(fr.free.nrw.commons.R.string.menu_bookmark)
-            R.drawable.ic_round_star_filled_24px -> getString(fr.free.nrw.commons.R.string.menu_bookmark)
-            R.drawable.ic_directions_black_24dp -> getString(fr.free.nrw.commons.R.string.nearby_directions)
-            R.drawable.ic_wikidata_logo_24dp -> getString(fr.free.nrw.commons.R.string.nearby_wikidata)
-            R.drawable.ic_feedback_black_24dp -> getString(fr.free.nrw.commons.R.string.nearby_wikitalk)
-            R.drawable.ic_wikipedia_logo_24dp -> getString(fr.free.nrw.commons.R.string.nearby_wikipedia)
-            R.drawable.ic_commons_icon_vector -> getString(fr.free.nrw.commons.R.string.nearby_commons)
+            R.drawable.ic_round_star_border_24px -> getString(R.string.menu_bookmark)
+            R.drawable.ic_round_star_filled_24px -> getString(R.string.menu_bookmark)
+            R.drawable.ic_directions_black_24dp -> getString(R.string.nearby_directions)
+            R.drawable.ic_wikidata_logo_24dp -> getString(R.string.nearby_wikidata)
+            R.drawable.ic_feedback_black_24dp -> getString(R.string.nearby_wikitalk)
+            R.drawable.ic_wikipedia_logo_24dp -> getString(R.string.nearby_wikipedia)
+            R.drawable.ic_commons_icon_vector -> getString(R.string.nearby_commons)
             else -> "Long click"
         }
         Toast.makeText(this.context, message, Toast.LENGTH_SHORT).show()
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt
index 6ec1064be2..414c618281 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt
@@ -1,7 +1,6 @@
 package fr.free.nrw.commons.nearby.presenter
 
 import android.location.Location
-import android.view.View
 import androidx.annotation.MainThread
 import androidx.lifecycle.LifecycleCoroutineScope
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao
@@ -25,55 +24,38 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.job
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
-import okhttp3.internal.wait
 import timber.log.Timber
-import java.io.IOException
 import java.lang.reflect.InvocationHandler
 import java.lang.reflect.Method
 import java.lang.reflect.Proxy
 import java.util.concurrent.CopyOnWriteArrayList
 
-class NearbyParentFragmentPresenter
-    (
+class NearbyParentFragmentPresenter(
     val bookmarkLocationDao: BookmarkLocationsDao,
     val placesRepository: PlacesRepository,
     val nearbyController: NearbyController
-) :
-    NearbyParentFragmentContract.UserActions,
-    WikidataP18EditListener, LocationUpdateListener {
+) : NearbyParentFragmentContract.UserActions, WikidataP18EditListener, LocationUpdateListener {
 
     private var isNearbyLocked = false
     private var currentLatLng: LatLng? = null
-
     private var placesLoadedOnce = false
-
     private var customQuery: String? = null
-
     private var nearbyParentFragmentView: NearbyParentFragmentContract.View = DUMMY
-
     private var placeSearchJob: Job? = null
     private var isSearchInProgress = false
     private var localPlaceSearchJob: Job? = null
-
     private val clickedPlaces = CopyOnWriteArrayList<Place>()
-
-    /**
-     * used to tell the asynchronous place detail loading job that a pin was clicked
-     * so as to prevent it from turning grey on the next pin detail update
-     *
-     * @param place the place whose details have already been loaded because clicked pin
-     */
-    fun handlePinClicked(place: Place) {
-        clickedPlaces.add(place)
-    }
+    private var schedulePlacesUpdateJob: Job? = null
 
     // the currently running job for async loading of pin details, cancelled when new pins are come
     private var loadPlacesDataAyncJob: Job? = null
 
+    // used to tell the asynchronous place detail loading job that the places' bookmarked status
+    // changed so as to prevent inconsistencies
+    private var bookmarkChangedPlaces = CopyOnWriteArrayList<Place>()
+
     /**
      * - **batchSize**: number of places to fetch details of in a single request
      * - **connnectionCount**: number of parallel requests
@@ -83,8 +65,6 @@ class NearbyParentFragmentPresenter
         const val CONNECTION_COUNT = 20
     }
 
-    private var schedulePlacesUpdateJob: Job? = null
-
     /**
      * - **skippedCount**: stores the number of updates skipped
      * - **skipLimit**: maximum number of consecutive updates that can be skipped
@@ -98,9 +78,15 @@ class NearbyParentFragmentPresenter
         const val SKIP_DELAY_MS = 100L
     }
 
-    // used to tell the asynchronous place detail loading job that the places' bookmarked status
-    // changed so as to prevent inconsistencies
-    private var bookmarkChangedPlaces = CopyOnWriteArrayList<Place>()
+    /**
+     * used to tell the asynchronous place detail loading job that a pin was clicked
+     * so as to prevent it from turning grey on the next pin detail update
+     *
+     * @param place the place whose details have already been loaded because clicked pin
+     */
+    fun handlePinClicked(place: Place) {
+        clickedPlaces.add(place)
+    }
 
     /**
      * Schedules a UI update for the provided list of `MarkerPlaceGroup` objects. Since, the update
@@ -115,20 +101,17 @@ class NearbyParentFragmentPresenter
     private suspend fun schedulePlacesUpdate(
         markerPlaceGroups: List<MarkerPlaceGroup>,
         force: Boolean = false
-    ) =
-        withContext(Dispatchers.Main) {
-            if (markerPlaceGroups.isEmpty()) return@withContext
-            schedulePlacesUpdateJob?.cancel()
-            schedulePlacesUpdateJob = launch {
-                if (!force && SchedulePlacesUpdateOptions.skippedCount++
-                    < SchedulePlacesUpdateOptions.SKIP_LIMIT
-                ) {
-                    delay(SchedulePlacesUpdateOptions.SKIP_DELAY_MS)
-                }
-                SchedulePlacesUpdateOptions.skippedCount = 0
-                updatePlaceGroupsToControllerAndRender(markerPlaceGroups)
+    ) = withContext(Dispatchers.Main) {
+        if (markerPlaceGroups.isEmpty()) return@withContext
+        schedulePlacesUpdateJob?.cancel()
+        schedulePlacesUpdateJob = launch {
+            if (!force && SchedulePlacesUpdateOptions.skippedCount++ < SchedulePlacesUpdateOptions.SKIP_LIMIT) {
+                delay(SchedulePlacesUpdateOptions.SKIP_DELAY_MS)
             }
+            SchedulePlacesUpdateOptions.skippedCount = 0
+            updatePlaceGroupsToControllerAndRender(markerPlaceGroups)
         }
+    }
 
     /**
      * Handles the user action of toggling the bookmarked status of a given place. Updates the
@@ -146,8 +129,7 @@ class NearbyParentFragmentPresenter
         scope?.launch {
             nowBookmarked = bookmarkLocationDao.updateBookmarkLocation(place)
             bookmarkChangedPlaces.add(place)
-            val placeIndex =
-                NearbyController.markerLabelList.indexOfFirst { it.place.location == place.location }
+            val placeIndex = NearbyController.markerLabelList.indexOfFirst { it.place.location == place.location }
             NearbyController.markerLabelList[placeIndex] = MarkerPlaceGroup(
                 nowBookmarked,
                 NearbyController.markerLabelList[placeIndex].place
@@ -164,9 +146,8 @@ class NearbyParentFragmentPresenter
         nearbyParentFragmentView = DUMMY
     }
 
-    override fun removeNearbyPreferences(applicationKvStore: JsonKvStore) {
-        Timber.d("Remove place objects")
-        applicationKvStore.remove(PLACE_OBJECT)
+    override fun removeNearbyPreferences(applicationKvStore: JsonKvStore?) {
+        applicationKvStore?.remove(PLACE_OBJECT)
     }
 
     fun initializeMapOperations() {
@@ -179,32 +160,29 @@ class NearbyParentFragmentPresenter
      * Sets click listeners of FABs, and 2 bottom sheets
      */
     override fun setActionListeners(applicationKvStore: JsonKvStore?) {
-        nearbyParentFragmentView.setFABPlusAction(View.OnClickListener { v: View? ->
-            if (applicationKvStore != null && applicationKvStore.getBoolean(
-                    "login_skipped", false
-                )
-            ) {
+        nearbyParentFragmentView.setFABPlusAction {
+            if (applicationKvStore != null && applicationKvStore.getBoolean("login_skipped", false)) {
                 // prompt the user to login
                 nearbyParentFragmentView.displayLoginSkippedWarning()
             } else {
                 nearbyParentFragmentView.animateFABs()
             }
-        })
+        }
 
-        nearbyParentFragmentView.setFABRecenterAction(View.OnClickListener { v: View? ->
+        nearbyParentFragmentView.setFABRecenterAction {
             nearbyParentFragmentView.recenterMap(currentLatLng)
-        })
+        }
     }
 
     override fun backButtonClicked(): Boolean {
         if (nearbyParentFragmentView.isAdvancedQueryFragmentVisible()) {
             nearbyParentFragmentView.showHideAdvancedQueryFragment(false)
             return true
-        } else if (nearbyParentFragmentView.isListBottomSheetExpanded()) {
+        } else if (nearbyParentFragmentView.isListBottomSheetExpanded) {
             // Back should first hide the bottom sheet if it is expanded
             nearbyParentFragmentView.listOptionMenuItemClicked()
             return true
-        } else if (nearbyParentFragmentView.isDetailsBottomSheetVisible()) {
+        } else if (nearbyParentFragmentView.isDetailsBottomSheetVisible) {
             nearbyParentFragmentView.setBottomSheetDetailsSmaller()
             return true
         }
@@ -242,21 +220,13 @@ class NearbyParentFragmentPresenter
             return
         }
 
-        if (!nearbyParentFragmentView.isNetworkConnectionEstablished()) {
+        if (!nearbyParentFragmentView.isNetworkConnectionEstablished) {
             Timber.d("Network connection is not established")
             return
         }
 
         val lastLocation = nearbyParentFragmentView.getLastMapFocus()
-        currentLatLng = if (nearbyParentFragmentView.getMapCenter() != null) {
-            nearbyParentFragmentView.getMapCenter()
-        } else {
-            lastLocation
-        }
-        if (currentLatLng == null) {
-            Timber.d("Skipping update of nearby places as location is unavailable")
-            return
-        }
+        currentLatLng = nearbyParentFragmentView.getMapCenter()
 
         /**
          * Significant changed - Markers and current location will be updated together
@@ -303,12 +273,8 @@ class NearbyParentFragmentPresenter
                 ?.take(NearbyController.MAX_RESULTS)
                 ?.map {
                     // currently only the place's location is known but bookmarks are stored by name
-                    MarkerPlaceGroup(
-                        false,
-                        it
-                    )
-                }
-                ?: return
+                    MarkerPlaceGroup(false, it)
+                } ?: return
 
         lockUnlockNearby(false) // So that new location updates wont come
         nearbyParentFragmentView.setProgressBarVisibility(false)
@@ -344,7 +310,7 @@ class NearbyParentFragmentPresenter
             for (i in 0..updatedGroups.lastIndex) {
                 val repoPlace = placesRepository.fetchPlace(updatedGroups[i].place.entityID)
                 if (repoPlace != null && repoPlace.name != null && repoPlace.name != ""){
-                    updatedGroups[i].isBookmarked = bookmarkLocationDao.findBookmarkLocation(repoPlace.name)
+                    updatedGroups[i].isBookmarked = bookmarkLocationDao.findBookmarkLocation(repoPlace.name!!)
                     updatedGroups[i].place.apply {
                         name = repoPlace.name
                         isMonument = repoPlace.isMonument
@@ -378,12 +344,13 @@ class NearbyParentFragmentPresenter
                     for (indices in fetchPlacesChannel) {
                         ensureActive()
                         try {
-                            val fetchedPlaces =
-                                nearbyController.getPlaces(indices.map { updatedGroups[it].place })
+                            val fetchedPlaces = nearbyController.getPlaces(
+                                indices.map { updatedGroups[it].place }
+                            ) ?: emptyList()
                             collectResults.send(
                                 fetchedPlaces.mapIndexed { index, place ->
                                     Pair(indices[index], MarkerPlaceGroup(
-                                        bookmarkLocationDao.findBookmarkLocation(place.name),
+                                        bookmarkLocationDao.findBookmarkLocation(place.name!!),
                                         place
                                     ))
                                 }
@@ -397,11 +364,11 @@ class NearbyParentFragmentPresenter
                                     try {
                                         val fetchedPlace = nearbyController.getPlaces(
                                             mutableListOf(updatedGroups[i].place)
-                                        )
+                                        ) ?: emptyList()
 
                                         onePlaceBatch.add(Pair(i, MarkerPlaceGroup(
                                             bookmarkLocationDao.findBookmarkLocation(
-                                                fetchedPlace[0].name
+                                                fetchedPlace[0].name!!
                                             ),
                                             fetchedPlace[0]
                                         )))
@@ -439,17 +406,15 @@ class NearbyParentFragmentPresenter
                 if (clickedPlacesIndex < clickedPlaces.size) {
                     val clickedPlacesBacklog = hashMapOf<LatLng, Place>()
                     while (clickedPlacesIndex < clickedPlaces.size) {
-                        clickedPlacesBacklog.put(
-                            clickedPlaces[clickedPlacesIndex].location,
+                        clickedPlacesBacklog[clickedPlaces[clickedPlacesIndex].location!!] =
                             clickedPlaces[clickedPlacesIndex]
-                        )
                         ++clickedPlacesIndex
                     }
                     for ((index, group) in updatedGroups.withIndex()) {
                         if (clickedPlacesBacklog.containsKey(group.place.location)) {
                             updatedGroups[index] = MarkerPlaceGroup(
                                 updatedGroups[index].isBookmarked,
-                                clickedPlacesBacklog[group.place.location]
+                                clickedPlacesBacklog[group.place.location]!!
                             )
                         }
                     }
@@ -458,18 +423,14 @@ class NearbyParentFragmentPresenter
                 if (bookmarkChangedPlacesIndex < bookmarkChangedPlaces.size) {
                     val bookmarkChangedPlacesBacklog = hashMapOf<LatLng, Place>()
                     while (bookmarkChangedPlacesIndex < bookmarkChangedPlaces.size) {
-                        bookmarkChangedPlacesBacklog.put(
-                            bookmarkChangedPlaces[bookmarkChangedPlacesIndex].location,
+                        bookmarkChangedPlacesBacklog[bookmarkChangedPlaces[bookmarkChangedPlacesIndex].location!!] =
                             bookmarkChangedPlaces[bookmarkChangedPlacesIndex]
-                        )
                         ++bookmarkChangedPlacesIndex
                     }
                     for ((index, group) in updatedGroups.withIndex()) {
                         if (bookmarkChangedPlacesBacklog.containsKey(group.place.location)) {
                             updatedGroups[index] = MarkerPlaceGroup(
-                                bookmarkLocationDao
-                                    .findBookmarkLocation(updatedGroups[index].place.name),
-                                updatedGroups[index].place
+                                bookmarkLocationDao.findBookmarkLocation(updatedGroups[index].place.name!!), updatedGroups[index].place
                             )
                         }
                     }
@@ -511,8 +472,10 @@ class NearbyParentFragmentPresenter
     }
 
     override fun filterByMarkerType(
-        selectedLabels: List<Label?>?, state: Int,
-        filterForPlaceState: Boolean, filterForAllNoneType: Boolean
+        selectedLabels: List<Label>?,
+        state: Int,
+        filterForPlaceState: Boolean,
+        filterForAllNoneType: Boolean
     ) {
         if (filterForAllNoneType) { // Means we will set labels based on states
             when (state) {
@@ -549,7 +512,6 @@ class NearbyParentFragmentPresenter
     @Override
     override fun handleMapScrolled(scope: LifecycleCoroutineScope?, isNetworkAvailable: Boolean) {
         scope ?: return
-
         placeSearchJob?.cancel()
         localPlaceSearchJob?.cancel()
         if (isNetworkAvailable) {
@@ -569,14 +531,14 @@ class NearbyParentFragmentPresenter
             loadPlacesDataAyncJob?.cancel()
             localPlaceSearchJob = scope.launch(Dispatchers.IO) {
                 delay(LOCAL_SCROLL_DELAY)
-                val mapFocus = nearbyParentFragmentView.mapFocus
+                val mapFocus = nearbyParentFragmentView.getMapFocus()
                 val markerPlaceGroups = placesRepository.fetchPlaces(
-                    nearbyParentFragmentView.screenBottomLeft,
-                    nearbyParentFragmentView.screenTopRight
+                    nearbyParentFragmentView.getScreenBottomLeft(),
+                    nearbyParentFragmentView.getScreenTopRight()
                 ).sortedBy { it.getDistanceInDouble(mapFocus) }.take(NearbyController.MAX_RESULTS)
                     .map {
                         MarkerPlaceGroup(
-                            bookmarkLocationDao.findBookmarkLocation(it.name), it
+                            bookmarkLocationDao.findBookmarkLocation(it.name!!), it
                         )
                     }
                 ensureActive()
@@ -608,15 +570,15 @@ class NearbyParentFragmentPresenter
         nearbyParentFragmentView.setCheckBoxState(CheckBoxTriStates.UNKNOWN)
     }
 
-    override fun setAdvancedQuery(query: String) {
-        this.customQuery = query
+    override fun setAdvancedQuery(query: String?) {
+        customQuery = query
     }
 
     override fun searchViewGainedFocus() {
-        if (nearbyParentFragmentView.isListBottomSheetExpanded()) {
+        if (nearbyParentFragmentView.isListBottomSheetExpanded) {
             // Back should first hide the bottom sheet if it is expanded
             nearbyParentFragmentView.hideBottomSheet()
-        } else if (nearbyParentFragmentView.isDetailsBottomSheetVisible()) {
+        } else if (nearbyParentFragmentView.isDetailsBottomSheetVisible) {
             nearbyParentFragmentView.hideBottomDetailsSheet()
         }
     }
@@ -641,9 +603,6 @@ class NearbyParentFragmentPresenter
      * @return Returns true if search this area button is used around our current location
      */
     fun searchCloseToCurrentLocation(): Boolean {
-        if (null == nearbyParentFragmentView.getLastMapFocus()) {
-            return true
-        }
         //TODO
         val myLocation = Location("")
         val destLocation = Location("")
@@ -666,7 +625,7 @@ class NearbyParentFragmentPresenter
         private val DUMMY = Proxy.newProxyInstance(
             NearbyParentFragmentContract.View::class.java.getClassLoader(),
             arrayOf<Class<*>>(NearbyParentFragmentContract.View::class.java),
-            InvocationHandler { proxy: Any?, method: Method?, args: Array<Any?>? ->
+            InvocationHandler { _: Any?, method: Method?, _: Array<Any?>? ->
                 if (method!!.name == "onMyEvent") {
                     return@InvocationHandler null
                 } else if (String::class.java == method.returnType) {
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.kt b/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.kt
index cbec7559f0..c0d081a877 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.kt
@@ -193,7 +193,7 @@ class ImageProcessingService @Inject constructor(
                 if (geoLocation.isNullOrBlank()) {
                     return@flatMap Single.just<Int>(IMAGE_OK)
                 }
-                imageUtilsWrapper.checkImageGeolocationIsDifferent(geoLocation, place.getLocation())
+                imageUtilsWrapper.checkImageGeolocationIsDifferent(geoLocation, place.location)
             }
             .subscribeOn(Schedulers.io())
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt b/app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt
index 5019dd4e72..5f7158ed59 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt
@@ -17,9 +17,9 @@ data class WikidataPlace(
     Parcelable {
     constructor(place: Place) : this(
         place.wikiDataEntityId!!,
-        place.name,
-        place.pic.takeIf { it.isNotBlank() },
-        place.siteLinks.wikipediaLink?.toString() ?: "",
+        place.name!!,
+        place.pic.takeIf { it!!.isNotBlank() },
+        place.siteLinks!!.wikipediaUri?.toString() ?: "",
         place.location,
         isMonumentUpload = place.isMonument,
     )
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.kt
index b3b0679486..6228ff294d 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.kt
@@ -402,14 +402,14 @@ class UploadMediaDetailFragment : UploadBaseFragment(), UploadMediaDetailsContra
                 String.format(
                     Locale.getDefault(),
                     getString(R.string.upload_nearby_place_found_description_plural),
-                    place.getName()
+                    place.name
                 )
             } else {
                 // Use singular message if only one file is selected
                 String.format(
                     Locale.getDefault(),
                     getString(R.string.upload_nearby_place_found_description_singular),
-                    place.getName()
+                    place.name
                 )
             }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt
index 6e26e02a6c..79fa3af7a8 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt
@@ -102,8 +102,8 @@ class UploadMediaPresenter @Inject constructor(
             ).map { uploadItem: UploadItem ->
                 if (place != null && place.isMonument && place.location != null) {
                     val countryCode = countryNamesAndCodes[Coordinates2Country.country(
-                        place.location.latitude,
-                        place.location.longitude
+                        place.location!!.latitude,
+                        place.location!!.longitude
                     )]
                     if (countryCode != null && WLM_SUPPORTED_COUNTRIES.contains(countryCode.lowercase())) {
                         uploadItem.isWLMUpload = true
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt
index 4ae366535f..6dd14a5ce1 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt
@@ -44,8 +44,8 @@ data class DepictedItem constructor(
 
     constructor(entity: Entities.Entity, place: Place) : this(
         entity,
-        place.name,
-        place.longDescription,
+        place.name!!,
+        place.longDescription!!,
     )
 
     constructor(entity: Entities.Entity, name: String, description: String) : this(
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
index 21db20f1bf..70a18d9e1c 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
@@ -488,16 +488,18 @@ class UploadWorker(
                             uploadResult.filename,
                             contribution.media.captions,
                         )
-                    if (null != revisionID) {
-                        withContext(Dispatchers.IO) {
-                            val place = placesRepository.fetchPlace(wikiDataPlace.id)
-                            place.name = wikiDataPlace.name
-                            place.pic = HOME_URL + uploadResult.createCanonicalFileName()
-                            placesRepository
-                                .save(place)
-                                .subscribeOn(Schedulers.io())
-                                .blockingAwait()
-                            Timber.d("Updated WikiItem place ${place.name} with image ${place.pic}")
+                        if (null != revisionID) {
+                            withContext(Dispatchers.IO) {
+                                val place = placesRepository.fetchPlace(wikiDataPlace.id)
+                                place?.let {
+                                    it.name = wikiDataPlace.name
+                                    it.pic = HOME_URL + uploadResult.createCanonicalFileName()
+                                    placesRepository
+                                        .save(it)
+                                        .subscribeOn(Schedulers.io())
+                                        .blockingAwait()
+                                    Timber.d("Updated WikiItem place ${it.name} with image ${it.pic}")
+                                }
                             }
                         }
                     }
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/PlaceUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/PlaceUtils.kt
index 907420f21f..12c74038d8 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/PlaceUtils.kt
+++ b/app/src/main/java/fr/free/nrw/commons/utils/PlaceUtils.kt
@@ -34,11 +34,11 @@ object PlaceUtils {
                     media.fallbackDescription,
                     media.coordinates,
                     media.categories.toString(),
-                    Sitelinks.Builder()
-                        .setCommonsLink(media.pageTitle.canonicalUri)
-                        .setWikipediaLink("") // we don't necessarily have them, can be fetched later
-                        .setWikidataLink("") // we don't necessarily have them, can be fetched later
-                        .build(),
+                    Sitelinks(
+                        commonsLink = media.pageTitle.canonicalUri,
+                        wikipediaLink = "", // we don't necessarily have them, can be fetched later
+                        wikidataLink = "" // we don't necessarily have them, can be fetched later
+                    ),
                     media.imageUrl,
                     media.thumbUrl,
                     ""
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/NearbyControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/NearbyControllerTest.kt
index eae9180115..9e9e13aacb 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/NearbyControllerTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/NearbyControllerTest.kt
@@ -1,7 +1,7 @@
 package fr.free.nrw.commons
 
 import fr.free.nrw.commons.location.LatLng
-import fr.free.nrw.commons.nearby.NearbyController.loadAttractionsFromLocationToBaseMarkerOptions
+import fr.free.nrw.commons.nearby.NearbyController.Companion.loadAttractionsFromLocationToBaseMarkerOptions
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -15,11 +15,7 @@ class NearbyControllerTest {
     fun testNullAttractions() {
         val location = LatLng(0.0, 0.0, 0f)
 
-        val options =
-            loadAttractionsFromLocationToBaseMarkerOptions(
-                location,
-                null,
-            )
+        val options = loadAttractionsFromLocationToBaseMarkerOptions(location, null)
 
         assertEquals(0, options.size.toLong())
     }
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt
index 4808d85188..242fdb449c 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt
@@ -50,7 +50,6 @@ class BookMarkLocationDaoTest {
     private lateinit var exampleLabel: Label
     private lateinit var exampleUri: Uri
     private lateinit var exampleLocation: LatLng
-    private lateinit var builder: Sitelinks.Builder
 
     @Before
     fun setUp() {
@@ -65,12 +64,6 @@ class BookMarkLocationDaoTest {
 
         bookmarkLocationsDao = database.bookmarkLocationsDao()
 
-        builder = Sitelinks.Builder().apply {
-            setWikipediaLink("wikipediaLink")
-            setWikidataLink("wikidataLink")
-            setCommonsLink("commonsLink")
-        }
-
         examplePlaceBookmark =
             Place(
                 "en",
@@ -79,7 +72,11 @@ class BookMarkLocationDaoTest {
                 "placeDescription",
                 exampleLocation,
                 "placeCategory",
-                builder.build(),
+                Sitelinks(
+                    wikipediaLink = "wikipediaLink",
+                    wikidataLink = "wikidataLink",
+                    commonsLink = "commonsLink"
+                ),
                 "picName",
                 false,
             )
@@ -106,7 +103,7 @@ class BookMarkLocationDaoTest {
     fun testFindBookmarkByNameForTrue() = runBlocking {
         bookmarkLocationsDao.addBookmarkLocation(examplePlaceBookmark.toBookmarksLocations())
 
-        val exists = bookmarkLocationsDao.findBookmarkLocation(examplePlaceBookmark.name)
+        val exists = bookmarkLocationsDao.findBookmarkLocation(examplePlaceBookmark.name!!)
         assertTrue(exists)
     }
 
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt
index b2177b1d2d..7e72804ad6 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt
@@ -5,8 +5,8 @@ import androidx.test.core.app.ApplicationProvider
 import com.nhaarman.mockitokotlin2.verify
 import fr.free.nrw.commons.TestCommonsApplication
 import fr.free.nrw.commons.location.LatLng
-import fr.free.nrw.commons.nearby.CheckBoxTriStates.CHECKED
-import fr.free.nrw.commons.nearby.CheckBoxTriStates.UNCHECKED
+import fr.free.nrw.commons.nearby.CheckBoxTriStates.Companion.CHECKED
+import fr.free.nrw.commons.nearby.CheckBoxTriStates.Companion.UNCHECKED
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -34,7 +34,7 @@ class CheckBoxTriStatesTest {
     fun setUp() {
         MockitoAnnotations.openMocks(this)
         checkBoxTriStates = CheckBoxTriStates(ApplicationProvider.getApplicationContext())
-        checkBoxTriStates.setCallback(callback)
+        checkBoxTriStates.callback = callback
         checkBoxTriStates.setOnCheckedChangeListener(onCheckChangeListener)
     }
 
@@ -43,7 +43,7 @@ class CheckBoxTriStatesTest {
      */
     @Test
     fun testSetStateWhenSameState() {
-        checkBoxTriStates.state = CHECKED
+        checkBoxTriStates.setState(CHECKED)
         checkBoxTriStates.setState(CHECKED)
         verifyNoInteractions(callback)
     }
@@ -54,7 +54,7 @@ class CheckBoxTriStatesTest {
     @Test
     fun testSetStateWhenDiffState() {
         NearbyController.currentLocation = LatLng(0.0, 0.0, 0.0f)
-        checkBoxTriStates.state = CHECKED
+        checkBoxTriStates.setState(CHECKED)
         checkBoxTriStates.setState(UNCHECKED)
         verify(callback).filterByMarkerType(null, UNCHECKED, false, true)
     }
@@ -65,7 +65,7 @@ class CheckBoxTriStatesTest {
     @Test
     fun testSetStateWhenCurrLatLngNull() {
         NearbyController.currentLocation = null
-        checkBoxTriStates.state = CHECKED
+        checkBoxTriStates.setState(CHECKED)
         checkBoxTriStates.setState(UNCHECKED)
         verifyNoInteractions(callback)
     }
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt
index 60fabc8571..bd065c34ad 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt
@@ -8,8 +8,8 @@ import com.nhaarman.mockitokotlin2.eq
 import fr.free.nrw.commons.BaseMarker
 import fr.free.nrw.commons.TestCommonsApplication
 import fr.free.nrw.commons.location.LatLng
-import fr.free.nrw.commons.nearby.NearbyController.loadAttractionsFromLocationToBaseMarkerOptions
-import fr.free.nrw.commons.nearby.NearbyController.updateMarkerLabelListBookmark
+import fr.free.nrw.commons.nearby.NearbyController.Companion.loadAttractionsFromLocationToBaseMarkerOptions
+import fr.free.nrw.commons.nearby.NearbyController.Companion.updateMarkerLabelListBookmark
 import org.junit.Before
 import org.junit.Test
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -131,7 +131,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 LatLng(0.0, 0.0, 1.0F),
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "picName",
                 false,
                 "entityID",
@@ -144,7 +144,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 LatLng(-40.69, -74.04, 1.0F),
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "picName",
                 false,
                 "entityID",
@@ -175,8 +175,8 @@ class NearbyControllerTest {
             false,
             customQuery,
         )
-        assertEquals(result.currentLatLng, currentLatLng)
-        assertEquals(result.searchLatLng, searchLatLong)
+        assertEquals(result?.currentLatLng, currentLatLng)
+        assertEquals(result?.searchLatLng, searchLatLong)
     }
 
     @Test
@@ -189,7 +189,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 LatLng(0.0, 0.0, 1.0F),
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "picName",
                 false,
                 "entityID",
@@ -202,7 +202,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 LatLng(40.69, -74.04, 1.0F),
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "picName",
                 false,
                 "entityID",
@@ -223,8 +223,8 @@ class NearbyControllerTest {
                 true,
                 customQuery,
             )
-        assertEquals(result.currentLatLng, currentLatLng)
-        assertEquals(result.searchLatLng, searchLatLong)
+        assertEquals(result?.currentLatLng, currentLatLng)
+        assertEquals(result?.searchLatLng, searchLatLong)
     }
 
     @Test
@@ -237,7 +237,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 LatLng(0.0, 0.0, 1.0F),
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "picName",
                 false,
                 "entityID",
@@ -250,7 +250,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 LatLng(40.69, 74.04, 1.0F),
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "picName",
                 false,
                 "entityID",
@@ -271,8 +271,8 @@ class NearbyControllerTest {
                 true,
                 customQuery,
             )
-        assertEquals(result.currentLatLng, currentLatLng)
-        assertEquals(result.searchLatLng, searchLatLong)
+        assertEquals(result?.currentLatLng, currentLatLng)
+        assertEquals(result?.searchLatLng, searchLatLong)
     }
 
     @Test
@@ -296,7 +296,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 currentLatLng,
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "picName",
                 false,
                 "entityID",
@@ -323,7 +323,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 currentLatLng,
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "picName",
                 false,
                 "entityID",
@@ -350,7 +350,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 currentLatLng,
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "",
                 false,
                 "entityID",
@@ -377,7 +377,7 @@ class NearbyControllerTest {
                 "placeDescription",
                 currentLatLng,
                 "placeCategory",
-                Sitelinks.Builder().build(),
+                Sitelinks(),
                 "",
                 true,
                 "entityID",
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapterUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapterUnitTests.kt
index 7432cdf45a..f92c1eafa9 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapterUnitTests.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapterUnitTests.kt
@@ -46,7 +46,7 @@ class NearbyFilterSearchRecyclerViewAdapterUnitTests {
     fun setUp() {
         MockitoAnnotations.openMocks(this)
         context = ApplicationProvider.getApplicationContext()
-        adapter = NearbyFilterSearchRecyclerViewAdapter(context, ArrayList<Label>(Label.valuesAsList()), recyclerView)
+        adapter = NearbyFilterSearchRecyclerViewAdapter(context, ArrayList<Label>(Label.entries))
         viewHolder.placeTypeIcon = imageView
         viewHolder.placeTypeLabel = textView
         viewHolder.placeTypeLayout = linearLayout
@@ -61,7 +61,7 @@ class NearbyFilterSearchRecyclerViewAdapterUnitTests {
     @Test
     @Throws(Exception::class)
     fun testSetCallback() {
-        adapter.setCallback(callback)
+        adapter.callback = callback
     }
 
     @Test
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt
index 96098e2a03..0b1ccda713 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt
@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.nearby
 
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import com.nhaarman.mockitokotlin2.whenever
@@ -72,12 +74,11 @@ class NearbyParentFragmentPresenterTest {
         nearbyPresenter.initializeMapOperations()
         verify(nearbyParentFragmentView).enableFABRecenter()
         expectMapAndListUpdate()
-        whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getLastMapFocus()).thenReturn(LatLng(2.0, 1.0, 0.0F))
         nearbyPresenter.updateMapAndList(LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED)
         verify(nearbyParentFragmentView).disableFABRecenter()
-        verify(nearbyParentFragmentView).`setProgressBarVisibility`(true)
-        assertTrue(null == nearbyParentFragmentView.mapCenter)
-        verify(nearbyParentFragmentView).populatePlaces(null)
+        verify(nearbyParentFragmentView).setProgressBarVisibility(true)
+        verify(nearbyParentFragmentView).populatePlaces(anyOrNull<LatLng>())
         verify(nearbyParentFragmentView).setCheckBoxAction()
     }
 
@@ -116,10 +117,10 @@ class NearbyParentFragmentPresenterTest {
     @Test
     fun testUpdateMapAndListWhenNoNetworkConnection() {
         nearbyPresenter.lockUnlockNearby(false)
-        whenever(nearbyParentFragmentView.isNetworkConnectionEstablished()).thenReturn(false)
+        whenever(nearbyParentFragmentView.isNetworkConnectionEstablished).thenReturn(false)
         nearbyPresenter.updateMapAndList(null)
         verify(nearbyParentFragmentView).enableFABRecenter()
-        verify(nearbyParentFragmentView).isNetworkConnectionEstablished()
+        verify(nearbyParentFragmentView).isNetworkConnectionEstablished
     }
 
     /**
@@ -127,14 +128,14 @@ class NearbyParentFragmentPresenterTest {
      */
     @Test
     fun testUpdateMapAndListWhenLastLocationIsNull() {
-        whenever(nearbyParentFragmentView.isNetworkConnectionEstablished()).thenReturn(true)
+        whenever(nearbyParentFragmentView.isNetworkConnectionEstablished).thenReturn(true)
         whenever(nearbyParentFragmentView.getLastLocation()).thenReturn(null)
         whenever(nearbyParentFragmentView.getLastMapFocus()).thenReturn(null)
         whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(null)
         nearbyPresenter.updateMapAndList(null)
         verify(nearbyParentFragmentView).isNetworkConnectionEstablished
-        verify(nearbyParentFragmentView).lastMapFocus
-        verify(nearbyParentFragmentView).mapCenter
+        verify(nearbyParentFragmentView).getLastMapFocus()
+        verify(nearbyParentFragmentView).getMapCenter()
     }
 
     /**
@@ -144,7 +145,7 @@ class NearbyParentFragmentPresenterTest {
     @Test
     fun testPlacesPopulatedForLatestLocationWhenLocationSignificantlyChanged() {
         expectMapAndListUpdate()
-        whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(LatLng(2.0, 1.0, 0.0F))
         nearbyPresenter.updateMapAndList(LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED)
         updateMapSignificantly()
     }
@@ -156,7 +157,7 @@ class NearbyParentFragmentPresenterTest {
     @Test
     fun testPlacesPopulatedForLatestLocationWhenLocationMapUpdated() {
         expectMapAndListUpdate()
-        whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(LatLng(2.0, 1.0, 0.0F))
         nearbyPresenter.updateMapAndList(LocationChangeType.MAP_UPDATED)
         updateMapSignificantly()
     }
@@ -164,7 +165,7 @@ class NearbyParentFragmentPresenterTest {
     fun updateMapSignificantly() {
         verify(nearbyParentFragmentView).disableFABRecenter()
         verify(nearbyParentFragmentView).setProgressBarVisibility(true)
-        verify(nearbyParentFragmentView).populatePlaces(any<LatLng>())
+        verify(nearbyParentFragmentView).populatePlaces(anyOrNull<LatLng>())
     }
 
     /**
@@ -174,13 +175,13 @@ class NearbyParentFragmentPresenterTest {
     @Test
     fun testPlacesPopulatedForCameraTargetLocationWhenSearchCustomArea() {
         expectMapAndListUpdate()
-        whenever(nearbyParentFragmentView.getCameraTarget()).thenReturn(LatLng(2.0, 1.0, 0.0F))
-        whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))
-        whenever(nearbyParentFragmentView.mapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.cameraTarget).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapFocus()).thenReturn(LatLng(2.0, 1.0, 0.0F))
         nearbyPresenter.updateMapAndList(LocationChangeType.SEARCH_CUSTOM_AREA)
         verify(nearbyParentFragmentView).disableFABRecenter()
         verify(nearbyParentFragmentView).setProgressBarVisibility(true)
-        verify(nearbyParentFragmentView).populatePlaces(nearbyParentFragmentView.mapFocus)
+        verify(nearbyParentFragmentView).populatePlaces(nearbyParentFragmentView.getMapFocus())
     }
 
     /**
@@ -190,11 +191,11 @@ class NearbyParentFragmentPresenterTest {
     @Test
     fun testUserTrackedWhenCurrentLocationMarkerVisible() {
         expectMapAndListUpdate()
-        whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))
-        whenever(nearbyParentFragmentView.mapCenter).thenReturn(null)
+        whenever(nearbyParentFragmentView.getLastMapFocus()).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(null)
         nearbyPresenter.updateMapAndList(LocationChangeType.LOCATION_SLIGHTLY_CHANGED)
         verify(nearbyParentFragmentView).getLastMapFocus()
-        verify(nearbyParentFragmentView).recenterMap(nearbyParentFragmentView.lastMapFocus)
+        verify(nearbyParentFragmentView).recenterMap(nearbyParentFragmentView.getLastMapFocus())
     }
 
     /**
@@ -205,10 +206,10 @@ class NearbyParentFragmentPresenterTest {
     fun testUserNotTrackedWhenCurrentLocationMarkerInvisible() {
         expectMapAndListUpdate()
         verify(nearbyParentFragmentView).enableFABRecenter()
-        whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))
-        whenever(nearbyParentFragmentView.mapCenter).thenReturn(null)
+        whenever(nearbyParentFragmentView.getLastMapFocus()).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(null)
         nearbyPresenter.updateMapAndList(LocationChangeType.LOCATION_SLIGHTLY_CHANGED)
-        verify(nearbyParentFragmentView).isNetworkConnectionEstablished()
+        verify(nearbyParentFragmentView).isNetworkConnectionEstablished
         verify(nearbyParentFragmentView).getLastMapFocus()
         verify(nearbyParentFragmentView).getMapCenter()
     }
@@ -281,7 +282,7 @@ class NearbyParentFragmentPresenterTest {
      */
     @Test
     fun testSearchViewFocusWhenBottomSheetExpanded() {
-        whenever(nearbyParentFragmentView.isListBottomSheetExpanded()).thenReturn(true)
+        whenever(nearbyParentFragmentView.isListBottomSheetExpanded).thenReturn(true)
         nearbyPresenter.searchViewGainedFocus()
         verify(nearbyParentFragmentView).hideBottomSheet()
     }
@@ -291,8 +292,8 @@ class NearbyParentFragmentPresenterTest {
      */
     @Test
     fun testSearchViewFocusWhenDetailsBottomSheetVisible() {
-        whenever(nearbyParentFragmentView.isListBottomSheetExpanded()).thenReturn(false)
-        whenever(nearbyParentFragmentView.isDetailsBottomSheetVisible()).thenReturn(true)
+        whenever(nearbyParentFragmentView.isListBottomSheetExpanded).thenReturn(false)
+        whenever(nearbyParentFragmentView.isDetailsBottomSheetVisible).thenReturn(true)
         nearbyPresenter.searchViewGainedFocus()
         verify(nearbyParentFragmentView).hideBottomDetailsSheet()
     }
@@ -302,8 +303,8 @@ class NearbyParentFragmentPresenterTest {
      */
     @Test
     fun testSearchCloseToCurrentLocationWhenFar() {
-        whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))
-        whenever(nearbyParentFragmentView.mapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getLastMapFocus()).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapFocus()).thenReturn(LatLng(2.0, 1.0, 0.0F))
         // 111.19 km real distance, return false if 148306.444306 >  currentLocationSearchRadius
         NearbyController.currentLocationSearchRadius = 148306.0
         val isClose = nearbyPresenter.searchCloseToCurrentLocation()
@@ -315,7 +316,10 @@ class NearbyParentFragmentPresenterTest {
      */
     @Test
     fun testSearchCloseToCurrentLocationWhenClose() {
-        whenever(nearbyParentFragmentView.getCameraTarget()).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        val location = LatLng(2.0, 1.0, 0.0F)
+        whenever(nearbyParentFragmentView.getLastMapFocus()).thenReturn(location)
+        whenever(nearbyParentFragmentView.cameraTarget).thenReturn(location)
+        whenever(nearbyParentFragmentView.getMapFocus()).thenReturn(location)
         // 111.19 km real distance, return false if 148253.333 >  currentLocationSearchRadius
         NearbyController.currentLocationSearchRadius = 148307.0
         val isClose = nearbyPresenter.searchCloseToCurrentLocation()
@@ -324,7 +328,7 @@ class NearbyParentFragmentPresenterTest {
 
     fun expectMapAndListUpdate() {
         nearbyPresenter.lockUnlockNearby(false)
-        whenever(nearbyParentFragmentView.isNetworkConnectionEstablished()).thenReturn(true)
+        whenever(nearbyParentFragmentView.isNetworkConnectionEstablished).thenReturn(true)
         whenever(nearbyParentFragmentView.getLastLocation()).thenReturn(latestLocation)
     }
 
@@ -337,23 +341,23 @@ class NearbyParentFragmentPresenterTest {
 
     @Test
     fun testBackButtonClickedWhenBottomSheetExpanded() {
-        whenever(nearbyParentFragmentView.isListBottomSheetExpanded()).thenReturn(true)
+        whenever(nearbyParentFragmentView.isListBottomSheetExpanded).thenReturn(true)
         nearbyPresenter.backButtonClicked()
         verify(nearbyParentFragmentView).listOptionMenuItemClicked()
     }
 
     @Test
     fun testBackButtonClickedWhenDetailsBottomSheetVisible() {
-        whenever(nearbyParentFragmentView.isListBottomSheetExpanded()).thenReturn(false)
-        whenever(nearbyParentFragmentView.isDetailsBottomSheetVisible()).thenReturn(true)
+        whenever(nearbyParentFragmentView.isListBottomSheetExpanded).thenReturn(false)
+        whenever(nearbyParentFragmentView.isDetailsBottomSheetVisible).thenReturn(true)
         nearbyPresenter.backButtonClicked()
         verify(nearbyParentFragmentView).setBottomSheetDetailsSmaller()
     }
 
     @Test
     fun testBackButtonClickedWhenNoSheetVisible() {
-        whenever(nearbyParentFragmentView.isListBottomSheetExpanded()).thenReturn(false)
-        whenever(nearbyParentFragmentView.isDetailsBottomSheetVisible()).thenReturn(false)
+        whenever(nearbyParentFragmentView.isListBottomSheetExpanded).thenReturn(false)
+        whenever(nearbyParentFragmentView.isDetailsBottomSheetVisible).thenReturn(false)
         val hasNearbyHandledBackPress = nearbyPresenter.backButtonClicked()
         assertFalse(hasNearbyHandledBackPress)
     }
@@ -376,7 +380,10 @@ class NearbyParentFragmentPresenterTest {
     fun testOnWikidataEditSuccessful() {
         nearbyPresenter.onWikidataEditSuccessful()
         expectMapAndListUpdate()
-        whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        val location = LatLng(2.0, 1.0, 0.0F)
+        whenever(nearbyParentFragmentView.getLastMapFocus()).thenReturn(location)
+        whenever(nearbyParentFragmentView.getMapFocus()).thenReturn(location)
+        whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(location)
         nearbyPresenter.updateMapAndList(LocationChangeType.MAP_UPDATED)
         updateMapSignificantly()
     }
@@ -384,7 +391,7 @@ class NearbyParentFragmentPresenterTest {
     @Test
     fun testOnLocationChangedSignificantly() {
         expectMapAndListUpdate()
-        whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(LatLng(2.0, 1.0, 0.0F))
         latestLocation = LatLng(2.0, 1.0, 0.0F)
         nearbyPresenter.onLocationChangedSignificantly(latestLocation)
         updateMapSignificantly()
@@ -395,30 +402,30 @@ class NearbyParentFragmentPresenterTest {
         nearbyPresenter.onLocationChangedSlightly(latestLocation)
         expectMapAndListUpdate()
         verify(nearbyParentFragmentView).enableFABRecenter()
-        whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))
-        whenever(nearbyParentFragmentView.mapCenter).thenReturn(null)
+        whenever(nearbyParentFragmentView.getLastMapFocus()).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(null)
         nearbyPresenter.updateMapAndList(LocationChangeType.LOCATION_SLIGHTLY_CHANGED)
         verify(nearbyParentFragmentView).getLastMapFocus()
-        verify(nearbyParentFragmentView).recenterMap(nearbyParentFragmentView.lastMapFocus)
+        verify(nearbyParentFragmentView).recenterMap(nearbyParentFragmentView.getLastMapFocus())
     }
 
     @Test
     fun testOnLocationChangeTypeCustomQuery() {
         nearbyPresenter.setAdvancedQuery("Point(17.865 82.343)\"")
-        whenever(nearbyParentFragmentView.isNetworkConnectionEstablished()).thenReturn(true)
+        whenever(nearbyParentFragmentView.isNetworkConnectionEstablished).thenReturn(true)
         whenever(nearbyParentFragmentView.getLastLocation()).thenReturn(latestLocation)
-        whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))
-        whenever(nearbyParentFragmentView.mapCenter).thenReturn(null)
+        whenever(nearbyParentFragmentView.getLastMapFocus()).thenReturn(LatLng(2.0, 1.0, 0.0F))
+        whenever(nearbyParentFragmentView.getMapCenter()).thenReturn(null)
         nearbyPresenter.updateMapAndList(LocationChangeType.CUSTOM_QUERY)
         verify(nearbyParentFragmentView).getLastMapFocus()
         verify(nearbyParentFragmentView).setProgressBarVisibility(true)
-        verify(nearbyParentFragmentView).populatePlaces(any(), any())
+        verify(nearbyParentFragmentView).populatePlaces(anyOrNull(), anyOrNull())
     }
 
     @Test
     fun testOnLocationChangeTypeCustomQueryInvalidQuery() {
         whenever(nearbyParentFragmentView.isNetworkConnectionEstablished).thenReturn(true)
-        whenever(nearbyParentFragmentView.lastLocation).thenReturn(latestLocation)
+        whenever(nearbyParentFragmentView.getLastLocation()).thenReturn(latestLocation)
         nearbyPresenter.setAdvancedQuery("")
         nearbyPresenter.updateMapAndList(LocationChangeType.CUSTOM_QUERY)
         expectMapAndListUpdate()
@@ -430,19 +437,19 @@ class NearbyParentFragmentPresenterTest {
     @Test
     fun testOnLocationChangeTypeCustomQueryUnParsableQuery() {
         whenever(nearbyParentFragmentView.isNetworkConnectionEstablished).thenReturn(true)
-        whenever(nearbyParentFragmentView.lastLocation).thenReturn(latestLocation)
+        whenever(nearbyParentFragmentView.getLastLocation()).thenReturn(latestLocation)
         nearbyPresenter.setAdvancedQuery("Point()\"")
         nearbyPresenter.updateMapAndList(LocationChangeType.CUSTOM_QUERY)
         expectMapAndListUpdate()
 
         whenever(nearbyParentFragmentView.isNetworkConnectionEstablished).thenReturn(true)
-        whenever(nearbyParentFragmentView.lastLocation).thenReturn(latestLocation)
+        whenever(nearbyParentFragmentView.getLastLocation()).thenReturn(latestLocation)
         nearbyPresenter.setAdvancedQuery("Point(ab)\"")
         nearbyPresenter.updateMapAndList(LocationChangeType.CUSTOM_QUERY)
         expectMapAndListUpdate()
 
         whenever(nearbyParentFragmentView.isNetworkConnectionEstablished).thenReturn(true)
-        whenever(nearbyParentFragmentView.lastLocation).thenReturn(latestLocation)
+        whenever(nearbyParentFragmentView.getLastLocation()).thenReturn(latestLocation)
         nearbyPresenter.setAdvancedQuery("Point(ab ab)\"")
         nearbyPresenter.updateMapAndList(LocationChangeType.CUSTOM_QUERY)
         expectMapAndListUpdate()
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/PageEditHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/PageEditHelperTest.kt
new file mode 100644
index 0000000000..dc4802727c
--- /dev/null
+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/PageEditHelperTest.kt
@@ -0,0 +1,70 @@
+package fr.free.nrw.commons.nearby
+
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.argumentCaptor
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import fr.free.nrw.commons.actions.PageEditClient
+import fr.free.nrw.commons.notification.NotificationHelper
+import fr.free.nrw.commons.utils.ViewUtilWrapper
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertNotNull
+import org.junit.Test
+import org.mockito.Mockito.mock
+
+class PageEditHelperTest {
+
+    private val notificationHelper: NotificationHelper = mock()
+    private val pageEditClient: PageEditClient = mock()
+    private val viewUtilWrapper: ViewUtilWrapper = mock()
+    val testObject = PageEditHelper(notificationHelper, pageEditClient, viewUtilWrapper)
+    private val titleCaptor = argumentCaptor<String>()
+    private val textCaptor = argumentCaptor<String>()
+    private val summaryCaptor = argumentCaptor<String>()
+
+    @Test
+    fun editPage_noMarkerPresent() {
+        whenever(pageEditClient.postCreate(titleCaptor.capture(), textCaptor.capture(), summaryCaptor.capture())).thenReturn(mock())
+
+        val observable = testObject.editPage("title", "pre-text", "desc", "details", 1.0, 2.0)
+        assertNotNull(observable)
+
+        verify(pageEditClient).postCreate(anyOrNull(), anyOrNull(), anyOrNull())
+
+        assertEquals("title", titleCaptor.firstValue)
+        assertEquals("==Please fix this item==\n" +
+                "Someone using the [[Commons:Mobile_app|Commons Android app]] went to this item's geographical location (1.0,2.0) and noted the following problem(s):\n" +
+                "* <i><nowiki>desc</nowiki></i>\n" +
+                "\n" +
+                "Details: <i><nowiki>details</nowiki></i>\n" +
+                "\n" +
+                "Please anyone fix the item accordingly, then reply to mark this section as fixed. Thanks a lot for your cooperation!\n" +
+                "\n" +
+                "~~~~", textCaptor.firstValue)
+        assertEquals("Please fix this item", summaryCaptor.firstValue)
+    }
+
+    @Test
+    fun editPage_withMarkerPresent() {
+        whenever(pageEditClient.postCreate(titleCaptor.capture(), textCaptor.capture(), summaryCaptor.capture())).thenReturn(mock())
+
+        val preText = "pre-text\n" +
+                "Please anyone fix the item accordingly, then reply to mark this section as fixed. Thanks a lot for your cooperation!"
+        val observable = testObject.editPage("title", preText, "desc", "details", 1.0, 2.0)
+        assertNotNull(observable)
+
+        verify(pageEditClient).postCreate(anyOrNull(), anyOrNull(), anyOrNull())
+
+        assertEquals("title", titleCaptor.firstValue)
+        assertEquals("pre-text\n" +
+                "* <i><nowiki>desc</nowiki></i>\n" +
+                "\n" +
+                "Details: <i><nowiki>details</nowiki></i>\n" +
+                "\n" +
+                "Please anyone fix the item accordingly, then reply to mark this section as fixed. Thanks a lot for your cooperation!\n" +
+                "\n" +
+                "~~~~", textCaptor.firstValue)
+        assertEquals("Please fix this item", summaryCaptor.firstValue)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/ImageProcessingServiceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/ImageProcessingServiceTest.kt
index 9a5e20b255..50e808c0d9 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/ImageProcessingServiceTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/ImageProcessingServiceTest.kt
@@ -61,7 +61,7 @@ class ImageProcessingServiceTest {
         val contentResolver = mock(ContentResolver::class.java)
 
         `when`(mockPlace.wikiDataEntityId).thenReturn("Q1")
-        `when`(mockPlace.getLocation()).thenReturn(mock(LatLng::class.java))
+        `when`(mockPlace.location).thenReturn(mock(LatLng::class.java))
         `when`(mediaUri.path).thenReturn("filePath")
         /*`when`(mockTitle.isEmpty).thenReturn(false)
         `when`(mockTitle.isSet).thenReturn(true)*/
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt
index da14438342..94bad45e1e 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt
@@ -239,13 +239,13 @@ class UploadMediaPresenterTest {
     @Test
     fun setCorrectCountryCodeForReceivedImage() {
         val germanyAsPlace =
-            Place(null, null, null, null, LatLng(50.1, 10.2, 1.0f), null, null, null, true, null)
+            Place(null, null, null, null, LatLng(50.1, 10.2, 1.0f), null, null, null, true, "dummy")
         germanyAsPlace.isMonument = true
 
         whenever(
             Coordinates2Country.country(
-                ArgumentMatchers.eq(germanyAsPlace.getLocation().latitude),
-                ArgumentMatchers.eq(germanyAsPlace.getLocation().longitude),
+                ArgumentMatchers.eq(germanyAsPlace.location!!.latitude),
+                ArgumentMatchers.eq(germanyAsPlace.location!!.longitude),
             ),
         ).thenReturn("Germany")