mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-11-02 07:43:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved batches

Browse source
This commit is contained in:
Kanahia 2024-05-18 11:03:05 +05:30
parent 4da6ed922e
commit 296eb5b1be
4 changed files with 49 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,6 @@ import io.reactivex.Observable;
import io.reactivex.Single;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.regex.Matcher;
@ -36,7 +35,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Protocol;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;
@ -438,7 +436,7 @@ public class OkHttpJsonApiClient {
}
@Nullable
public List<Place> getNearbyPlacesFromQID(
public List<Place> getPlaces(
final List<Place> placeList, final String language) throws IOException {
final String wikidataQuery = FileUtils.readFromResource("/queries/query_for_item.rq");
String qids = "";

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

@ -131,11 +131,11 @@ public class NearbyController extends MapController {
);
}
public List<Place> getPlacesFromQID(List<Place> placeList) throws Exception {
return nearbyPlaces.getPlacesFromQID(placeList, Locale.getDefault().getLanguage());
public List<Place> getPlaces(List<Place> placeList) throws Exception {
return nearbyPlaces.getPlaces(placeList, Locale.getDefault().getLanguage());
}
public Place getNearbyPlace(String entity) throws Exception {
public Place getPlace(String entity) throws Exception {
return nearbyPlaces.getPlaceFromWikidataQuery(
entity,
Locale.getDefault().getLanguage()

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

@ -134,10 +134,10 @@ public class NearbyPlaces {
.getNearbyPlace(entityId, lang);
}
public List<Place> getPlacesFromQID(final List<Place> placeList,
public List<Place> getPlaces(final List<Place> placeList,
final String lang) throws Exception {
return okHttpJsonApiClient
.getNearbyPlacesFromQID(placeList, lang);
.getPlaces(placeList, lang);
}
/**

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

@ -45,13 +45,11 @@ import android.view.animation.AnimationUtils;
import android.widget.Toast;
import androidx.activity.result.ActivityResultCallback;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions;
import androidx.activity.result.contract.ActivityResultContracts.RequestPermission;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
@ -110,6 +108,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@ -118,7 +117,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import javax.inject.Named;
@ -131,9 +129,7 @@ import org.osmdroid.events.ScrollEvent;
import org.osmdroid.events.ZoomEvent;
import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
import org.osmdroid.util.GeoPoint;
import org.osmdroid.util.constants.GeoConstants;
import org.osmdroid.util.constants.GeoConstants.UnitOfMeasure;
import org.osmdroid.views.CustomZoomButtonsController;
import org.osmdroid.views.CustomZoomButtonsController.Visibility;
import org.osmdroid.views.overlay.MapEventsOverlay;
import org.osmdroid.views.overlay.Marker;
@ -1296,7 +1292,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
private void getPlaceData(String entity, Place place, Marker marker) {
final Observable<Place> getPlaceObservable = Observable
.fromCallable(() -> nearbyController
.getNearbyPlace(entity));
.getPlace(entity));
compositeDisposable.add(getPlaceObservable
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@ -1399,52 +1395,67 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
}));
}
@SuppressLint("CheckResult")
public void loadPlacesDataAsync(List<Place> placeList, LatLng curLatLng) {
List<Place> places = new ArrayList<>(placeList);
int batchSize = 150;
List<Place> processedPlaces = new ArrayList<>();
for (int i = 0; i < places.size(); i += batchSize) {
int endIndex = Math.min(i + batchSize, places.size());
List<Place> batch = places.subList(i, endIndex);
processBatch(batch)
.subscribe(p -> {
processedPlaces.addAll(p);
if (processedPlaces.size() == places.size()) {
updateMapMarkers(processedPlaces, curLatLng, false);
}
}, throwable -> {
Timber.e(throwable);
showErrorMessage(getString(R.string.error_fetching_nearby_places)
+ throwable.getLocalizedMessage());
setFilterState();
});
int batchSize = 3;
final List<Place> updatedPlaceList = new ArrayList<>(placeList);
if (VERSION.SDK_INT >= VERSION_CODES.N) {
Collections.sort(updatedPlaceList, Comparator.comparingDouble(Place::getDistanceInDouble));
}
processBatchesSequentially(places, batchSize, updatedPlaceList, curLatLng, 0);
}
private Observable<List<Place>> processBatch(List<Place> batch) {
return Observable.fromCallable(() -> nearbyController.getPlacesFromQID(batch))
@SuppressLint("CheckResult")
private void processBatchesSequentially(List<Place> places, int batchSize, List<Place> updatedPlaceList, LatLng curLatLng, int startIndex) {
if (startIndex >= places.size()) {
return;
}
int endIndex = Math.min(startIndex + batchSize, places.size());
List<Place> batch = places.subList(startIndex, endIndex);
processBatch(batch, updatedPlaceList)
.subscribe(p -> {
if (!p.isEmpty()) {
synchronized (updatedPlaceList) {
updatedPlaceList.clear();
updatedPlaceList.addAll((Collection<? extends Place>) p);
}
updateMapMarkers(new ArrayList<>(updatedPlaceList), curLatLng, false);
}
processBatchesSequentially(places, batchSize, updatedPlaceList, curLatLng, endIndex);
}, throwable -> {
Timber.e(throwable);
showErrorMessage(getString(R.string.error_fetching_nearby_places)
+ throwable.getLocalizedMessage());
setFilterState();
});
}
private Observable<List<?>> processBatch(List<Place> batch, List<Place> placeList) {
return Observable.fromCallable(() -> nearbyController.getPlaces(batch))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.map(places -> {
if (places == null || places.isEmpty()) {
showErrorMessage(getString(R.string.no_nearby_places_around));
return Collections.<Place>emptyList();
return Collections.emptyList();
} else {
List<Place> updatedPlaceList = new ArrayList<>(placeList);
for (Place place : places) {
for (Place foundPlace : batch) {
for (Place foundPlace : placeList) {
if (place.siteLinks.getWikidataLink()
.equals(foundPlace.siteLinks.getWikidataLink())) {
place.location = foundPlace.location;
place.distance = foundPlace.distance;
place.setMonument(foundPlace.isMonument());
int index = updatedPlaceList.indexOf(foundPlace);
if (index != -1) {
updatedPlaceList.set(index, place);
}
break;
}
}
}
return places;
return updatedPlaceList;
}
})
.onErrorReturn(throwable -> {
@ -1452,7 +1463,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
showErrorMessage(getString(R.string.error_fetching_nearby_places)
+ " " + throwable.getLocalizedMessage());
setFilterState();
return Collections.<Place>emptyList();
return Collections.emptyList();
});
}