[WIP]Fixes commons-app#545

- Add query for monuments
- Make API call to fetch monuments
- Attach the list of monuments with nearby places response and render the monumens on the Map along with other nearby items

Author: ashishkumar468

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

@@ -298,6 +298,59 @@ public Observable<List<Place>> getNearbyPlaces(LatLng cur, String language, doub
     });
   }
 
+  /**
+   * Wikidata query to fetch monuments
+   *
+   * @param cur      :  The current location coordinates
+   * @param language : The language
+   * @param radius   : The radius around the current location within which we expect the results
+   * @return
+   * @throws IOException
+   */
+  public Observable<List<Place>> getNearbyMonuments(LatLng cur, String language, double radius)
+      throws IOException {
+    String wikidataQuery = FileUtils.readFromResource("/queries/monuments_query.rq");
+    if (radius < 10) {
+      radius = 10d;//This is temporary, I will figure something out
+    }
+    String query = wikidataQuery
+        .replace("${RAD}", String.format(Locale.ROOT, "%.2f", radius))
+        .replace("${LAT}", String.format(Locale.ROOT, "%.4f", cur.getLatitude()))
+        .replace("${LONG}", String.format(Locale.ROOT, "%.4f", cur.getLongitude()))
+        .replace("${LANG}", language);
+
+    HttpUrl.Builder urlBuilder = HttpUrl
+        .parse(sparqlQueryUrl)
+        .newBuilder()
+        .addQueryParameter("query", query)
+        .addQueryParameter("format", "json");
+
+    Request request = new Request.Builder()
+        .url(urlBuilder.build())
+        .build();
+
+    return Observable.fromCallable(() -> {
+      Response response = okHttpClient.newCall(request).execute();
+      if (response != null && response.body() != null && response.isSuccessful()) {
+        String json = response.body().string();
+        if (json == null) {
+          return new ArrayList<>();
+        }
+
+        NearbyResponse nearbyResponse = gson.fromJson(json, NearbyResponse.class);
+        List<NearbyResultItem> bindings = nearbyResponse.getResults().getBindings();
+        List<Place> places = new ArrayList<>();
+        for (NearbyResultItem item : bindings) {
+          Place place = Place.from(item);
+          place.setMonument(true);
+          places.add(place);
+        }
+        return places;
+      }
+      return new ArrayList<>();
+    });
+  }
+
   /**
    * Get the QIDs of all Wikidata items that are subclasses of the given Wikidata item. Example:
    * bridge -> suspended bridge, aqueduct, etc

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

@@ -10,6 +10,7 @@
 import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
 
+import io.reactivex.Observable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -127,6 +128,12 @@ public NearbyPlacesInfo loadAttractionsFromLocation(LatLng curLatLng, LatLng sea
         }
     }
 
+    public Observable<List<Place>> queryWikiDataForMonuments(
+        LatLng latLng, String language)
+        throws IOException {
+        return nearbyPlaces.queryWikiDataForMonuments(latLng, language);
+    }
+
     /**
      * Loads attractions from location for list view, we need to return Place data type.
      *
@@ -168,6 +175,7 @@ public static List<NearbyBaseMarker> loadAttractionsFromLocationToBaseMarkerOpti
         VectorDrawableCompat vectorDrawable = null;
         VectorDrawableCompat vectorDrawableGreen = null;
         VectorDrawableCompat vectorDrawableGrey = null;
+        VectorDrawableCompat vectorDrawableMonuments = null;
         vectorDrawable = null;
         try {
             vectorDrawable = VectorDrawableCompat.create(
@@ -176,41 +184,49 @@ public static List<NearbyBaseMarker> loadAttractionsFromLocationToBaseMarkerOpti
                     context.getResources(), R.drawable.ic_custom_map_marker_green, context.getTheme());
             vectorDrawableGrey = VectorDrawableCompat.create(
                     context.getResources(), R.drawable.ic_custom_map_marker_grey, context.getTheme());
+            vectorDrawableMonuments = VectorDrawableCompat
+                .create(context.getResources(), R.drawable.ic_custom_map_marker_monuments,
+                    context.getTheme());
         } catch (Resources.NotFoundException e) {
             // ignore when running tests.
         }
         if (vectorDrawable != null) {
             Bitmap icon = UiUtils.getBitmap(vectorDrawable);
             Bitmap iconGreen = UiUtils.getBitmap(vectorDrawableGreen);
             Bitmap iconGrey = UiUtils.getBitmap(vectorDrawableGrey);
+            Bitmap iconMonuments = UiUtils.getBitmap(vectorDrawableMonuments);
 
             for (Place place : placeList) {
+                NearbyBaseMarker nearbyBaseMarker = new NearbyBaseMarker();
                 String distance = formatDistanceBetween(curLatLng, place.location);
                 place.setDistance(distance);
 
-                NearbyBaseMarker nearbyBaseMarker = new NearbyBaseMarker();
                 nearbyBaseMarker.title(place.name);
                 nearbyBaseMarker.position(
-                        new com.mapbox.mapboxsdk.geometry.LatLng(
-                                place.location.getLatitude(),
-                                place.location.getLongitude()));
+                    new com.mapbox.mapboxsdk.geometry.LatLng(
+                        place.location.getLatitude(),
+                        place.location.getLongitude()));
                 nearbyBaseMarker.place(place);
                 // Check if string is only spaces or empty, if so place doesn't have any picture
-                if (!place.pic.trim().isEmpty()) {
+
+                if (place.isMonument()) {
+                    nearbyBaseMarker.icon(IconFactory.getInstance(context)
+                        .fromBitmap(iconMonuments));
+                }
+                else if (!place.pic.trim().isEmpty()) {
                     if (iconGreen != null) {
                         nearbyBaseMarker.icon(IconFactory.getInstance(context)
-                                .fromBitmap(iconGreen));
+                            .fromBitmap(iconGreen));
                     }
                 } else 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
                     if (iconGrey != null) {
                         nearbyBaseMarker.icon(IconFactory.getInstance(context)
-                                .fromBitmap(iconGrey));
+                            .fromBitmap(iconGrey));
                     }
                 } else {
                     nearbyBaseMarker.icon(IconFactory.getInstance(context)
-                            .fromBitmap(icon));
+                        .fromBitmap(icon));
                 }
-
                 baseMarkerOptions.add(nearbyBaseMarker);
             }
         }

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

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.nearby;
 
+import io.reactivex.Observable;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.Collections;
@@ -94,4 +95,10 @@ List<Place> radiusExpander(LatLng curLatLng, String lang, boolean returnClosestR
     public List<Place> getFromWikidataQuery(LatLng cur, String lang, double radius) throws IOException {
         return okHttpJsonApiClient.getNearbyPlaces(cur, lang, radius).blockingSingle();
     }
+
+    public Observable<List<Place>> queryWikiDataForMonuments(
+        LatLng latLng, String language)
+        throws IOException {
+        return okHttpJsonApiClient.getNearbyMonuments(latLng, language, radius);
+    }
 }

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

@@ -6,6 +6,7 @@
 
 import androidx.annotation.Nullable;
 
+import fr.free.nrw.commons.nearby.NearbyController.NearbyPlacesInfo;
 import org.apache.commons.lang3.StringUtils;
 
 import fr.free.nrw.commons.location.LatLng;
@@ -31,6 +32,7 @@ public class Place implements Parcelable {
 
     public String distance;
     public final Sitelinks siteLinks;
+    private boolean isMonument;
 
 
     public Place(String language,String name, Label label, String longDescription, LatLng location, String category, Sitelinks siteLinks, String pic, Boolean exists) {
@@ -165,6 +167,22 @@ 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

app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java

@@ -3,7 +3,6 @@
 import android.content.Context;
 
 import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
 
 import java.util.List;
 
@@ -13,7 +12,6 @@
 import fr.free.nrw.commons.nearby.Label;
 import fr.free.nrw.commons.nearby.NearbyBaseMarker;
 import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
 
 public interface NearbyParentFragmentContract {