Made Nearby show all pins that could be presented on the screen, rather than a circle (commons-app#5553)

* Changed nearby from circle to rectangle

* Fixed bug

* Removed MAPBOX Token

* Fixed minor issues

* Fixed minor issues

* Changed query files

* Changed monuments query file

* Fixed Unit Tests

* Fixed failing tests

* Fixed errors due to merging

Author: kanahia1

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

@@ -269,27 +269,25 @@ public Single<FeedbackResponse> getAchievements(String userName) {
     /**
      * Make API Call to get Nearby Places
      *
-     * @param cur                     Search lat long
-     * @param language                Language
-     * @param radius                  Search Radius
-     * @param shouldQueryForMonuments : Should we query for monuments
+     * @param cur      Search lat long
+     * @param language Language
+     * @param radius   Search Radius
      * @return
      * @throws Exception
      */
     @Nullable
     public List<Place> getNearbyPlaces(final LatLng cur, final String language, final double radius,
-        final boolean shouldQueryForMonuments, final String customQuery)
+        final String customQuery)
         throws Exception {
 
         Timber.d("Fetching nearby items at radius %s", radius);
         Timber.d("CUSTOM_SPARQL%s", String.valueOf(customQuery != null));
         final String wikidataQuery;
         if (customQuery != null) {
             wikidataQuery = customQuery;
-        } else if (!shouldQueryForMonuments) {
-            wikidataQuery = FileUtils.readFromResource("/queries/nearby_query.rq");
         } else {
-            wikidataQuery = FileUtils.readFromResource("/queries/nearby_query_monuments.rq");
+            wikidataQuery = FileUtils.readFromResource(
+                "/queries/radius_query_for_upload_wizard.rq");
         }
         final String query = wikidataQuery
             .replace("${RAD}", String.format(Locale.ROOT, "%.2f", radius))
@@ -307,6 +305,74 @@ public List<Place> getNearbyPlaces(final LatLng cur, final String language, fina
             .url(urlBuilder.build())
             .build();
 
+        final Response response = okHttpClient.newCall(request).execute();
+        if (response.body() != null && response.isSuccessful()) {
+            final String json = response.body().string();
+            final NearbyResponse nearbyResponse = gson.fromJson(json, NearbyResponse.class);
+            final List<NearbyResultItem> bindings = nearbyResponse.getResults().getBindings();
+            final List<Place> places = new ArrayList<>();
+            for (final NearbyResultItem item : bindings) {
+                final Place placeFromNearbyItem = Place.from(item);
+                placeFromNearbyItem.setMonument(false);
+                places.add(placeFromNearbyItem);
+            }
+            return places;
+        }
+        throw new Exception(response.message());
+    }
+
+    /**
+     * Retrieves nearby places based on screen coordinates and optional query parameters.
+     *
+     * @param screenTopRight          The top right corner of the screen (latitude, longitude).
+     * @param screenBottomLeft        The bottom left corner of the screen (latitude, longitude).
+     * @param language                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 nearby places.
+     * @throws Exception If an error occurs during the retrieval process.
+     */
+    @Nullable
+    public List<Place> getNearbyPlaces(
+        final fr.free.nrw.commons.___location.LatLng screenTopRight,
+        final fr.free.nrw.commons.___location.LatLng screenBottomLeft, final String language,
+        final boolean shouldQueryForMonuments, final String customQuery)
+        throws Exception {
+
+        Timber.d("CUSTOM_SPARQL%s", String.valueOf(customQuery != null));
+
+        final String wikidataQuery;
+        if (customQuery != null) {
+            wikidataQuery = customQuery;
+        } else if (!shouldQueryForMonuments) {
+            wikidataQuery = FileUtils.readFromResource("/queries/rectangle_query_for_nearby.rq");
+        } else {
+            wikidataQuery = FileUtils.readFromResource(
+                "/queries/rectangle_query_for_nearby_monuments.rq");
+        }
+
+        final double westCornerLat = screenTopRight.getLatitude();
+        final double westCornerLong = screenTopRight.getLongitude();
+        final double eastCornerLat = screenBottomLeft.getLatitude();
+        final double eastCornerLong = screenBottomLeft.getLongitude();
+
+        final String query = wikidataQuery
+            .replace("${LAT_WEST}", String.format(Locale.ROOT, "%.4f", westCornerLat))
+            .replace("${LONG_WEST}", String.format(Locale.ROOT, "%.4f", westCornerLong))
+            .replace("${LAT_EAST}", String.format(Locale.ROOT, "%.4f", eastCornerLat))
+            .replace("${LONG_EAST}", String.format(Locale.ROOT, "%.4f", eastCornerLong))
+            .replace("${LANG}", language);
+        final HttpUrl.Builder urlBuilder = HttpUrl
+            .parse(sparqlQueryUrl)
+            .newBuilder()
+            .addQueryParameter("query", query)
+            .addQueryParameter("format", "json");
+
+        final Request request = new Request.Builder()
+            .url(urlBuilder.build())
+            .build();
+
         final Response response = okHttpClient.newCall(request).execute();
         if (response.body() != null && response.isSuccessful()) {
             final String json = response.body().string();
@@ -330,18 +396,16 @@ public List<Place> getNearbyPlaces(final LatLng cur, final String language, fina
     /**
      * Make API Call to get Nearby Places Implementation does not expects a custom query
      *
-     * @param cur                     Search lat long
-     * @param language                Language
-     * @param radius                  Search Radius
-     * @param shouldQueryForMonuments : Should we query for monuments
+     * @param cur      Search lat long
+     * @param language Language
+     * @param radius   Search Radius
      * @return
      * @throws Exception
      */
     @Nullable
-    public List<Place> getNearbyPlaces(final LatLng cur, final String language, final double radius,
-        final boolean shouldQueryForMonuments)
+    public List<Place> getNearbyPlaces(final LatLng cur, final String language, final double radius)
         throws Exception {
-        return getNearbyPlaces(cur, language, radius, shouldQueryForMonuments, null);
+        return getNearbyPlaces(cur, language, radius, null);
     }
 
     /**

app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java

@@ -39,34 +39,34 @@ public NearbyController(NearbyPlaces nearbyPlaces) {
     /**
      * Prepares Place list to make their distance information update later.
      *
-     * @param curLatLng current ___location for user
-     * @param searchLatLng the ___location user wants to search around
+     * @param curLatLng           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
+     * @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 curLatLng, final LatLng searchLatLng,
+    public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng curLatLng,
+        final LatLng searchLatLng,
         final boolean returnClosestResult, final boolean checkingAroundCurrentLocation,
-        final boolean shouldQueryForMonuments, @Nullable final String customQuery) throws Exception {
+        @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 curLatLng is null");
             return null;
         }
         List<Place> places = nearbyPlaces
             .radiusExpander(searchLatLng, Locale.getDefault().getLanguage(), returnClosestResult,
-                shouldQueryForMonuments, customQuery);
+                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
-
+            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 (curLatLng != null) {
                 Timber.d("Sorting places by distance...");
@@ -88,11 +88,11 @@ public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng curLatLng, fina
                     }
                 }
                 Collections.sort(places,
-                        (lhs, rhs) -> {
-                            double lhsDistance = distances.get(lhs);
-                            double rhsDistance = distances.get(rhs);
-                            return (int) (lhsDistance - rhsDistance);
-                        }
+                    (lhs, rhs) -> {
+                        double lhsDistance = distances.get(lhs);
+                        double rhsDistance = distances.get(rhs);
+                        return (int) (lhsDistance - rhsDistance);
+                    }
                 );
             }
             nearbyPlacesInfo.curLatLng = curLatLng;
@@ -104,11 +104,11 @@ public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng curLatLng, fina
             if (!returnClosestResult) {
                 // To remember latest search either around user or any point on map
                 latestSearchLocation = searchLatLng;
-                latestSearchRadius = nearbyPlaces.radius*1000; // to meter
+                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
+                    currentLocationSearchRadius = nearbyPlaces.radius * 1000; // to meter
                     currentLocation = curLatLng;
                 }
             }
@@ -118,6 +118,98 @@ public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng curLatLng, fina
         return nearbyPlacesInfo;
     }
 
+    /**
+     * Prepares Place list to make their distance information update later.
+     *
+     * @param curLatLng                     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 curLatLng,
+        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 curLatLng is null");
+            return null;
+        }
+
+        List<Place> places = nearbyPlaces.getFromWikidataQuery(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 (curLatLng != null) {
+                Timber.d("Sorting places by distance...");
+                final Map<Place, Double> distances = new HashMap<>();
+                for (Place place : places) {
+                    distances.put(place, computeDistanceBetween(place.___location, curLatLng));
+                    // 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.curLatLng = curLatLng;
+            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 = curLatLng;
+                }
+            }
+        }
+        return nearbyPlacesInfo;
+    }
+
     /**
      * Prepares Place list to make their distance information update later.
      *
@@ -129,10 +221,10 @@ public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng curLatLng, fina
      */
     public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng curLatLng,
         final LatLng searchLatLng,
-        final boolean returnClosestResult, final boolean checkingAroundCurrentLocation,
-        final boolean shouldQueryForMonuments) throws Exception {
+        final boolean returnClosestResult, final boolean checkingAroundCurrentLocation)
+        throws Exception {
         return loadAttractionsFromLocation(curLatLng, searchLatLng, returnClosestResult,
-            checkingAroundCurrentLocation, shouldQueryForMonuments, null);
+            checkingAroundCurrentLocation, null);
     }
 
     /**
@@ -171,12 +263,14 @@ public static List<BaseMarker> loadAttractionsFromLocationToBaseMarkerOptions(
 
     /**
      * Updates makerLabelList item isBookmarked value
-     * @param place place which is bookmarked
+     *
+     * @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();) {
+        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));