mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make nearby query faster (#2419)

Browse source 
* Make nearby query faster

* Fix query
This commit is contained in:
Vivek Maskara 2019-02-10 20:53:02 +05:30 • committed by Ashish Kumar
parent a9629c6f99
commit 5a6402cd07
5 changed files with 5 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java
View file

@ -151,13 +151,10 @@ public class BookmarkLocationsDao {
builder.setWikidataLink(cursor.getString(cursor.getColumnIndex(Table.COLUMN_WIKIDATA_LINK)));
builder.setCommonsLink(cursor.getString(cursor.getColumnIndex(Table.COLUMN_COMMONS_LINK)));
Uri uri = Uri.parse(cursor.getString(cursor.getColumnIndex(Table.COLUMN_IMAGE_URL)));
return new Place(
cursor.getString(cursor.getColumnIndex(Table.COLUMN_NAME)),
Label.fromText((cursor.getString(cursor.getColumnIndex(Table.COLUMN_LABEL_TEXT)))),
cursor.getString(cursor.getColumnIndex(Table.COLUMN_DESCRIPTION)),
uri,
location,
cursor.getString(cursor.getColumnIndex(Table.COLUMN_CATEGORY)),
builder.build()
@ -171,7 +168,6 @@ public class BookmarkLocationsDao {
cv.put(BookmarkLocationsDao.Table.COLUMN_CATEGORY, bookmarkLocation.getCategory());
cv.put(BookmarkLocationsDao.Table.COLUMN_LABEL_TEXT, bookmarkLocation.getLabel().getText());
cv.put(BookmarkLocationsDao.Table.COLUMN_LABEL_ICON, bookmarkLocation.getLabel().getIcon());
cv.put(BookmarkLocationsDao.Table.COLUMN_IMAGE_URL, bookmarkLocation.getSecondaryImageUrl().toString());
cv.put(BookmarkLocationsDao.Table.COLUMN_WIKIPEDIA_LINK, bookmarkLocation.siteLinks.getWikipediaLink().toString());
cv.put(BookmarkLocationsDao.Table.COLUMN_WIKIDATA_LINK, bookmarkLocation.siteLinks.getWikidataLink().toString());
cv.put(BookmarkLocationsDao.Table.COLUMN_COMMONS_LINK, bookmarkLocation.siteLinks.getCommonsLink().toString());

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

@ -1,6 +1,5 @@
package fr.free.nrw.commons.nearby;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
@ -20,22 +19,17 @@ public class Place implements Parcelable {
public final String name;
private final Label label;
private final String longDescription;
private final Uri secondaryImageUrl;
public final LatLng location;
private final String category;
public Bitmap image;
private Bitmap secondaryImage;
public String distance;
public final Sitelinks siteLinks;
public Place(String name, Label label, String longDescription,
Uri secondaryImageUrl, LatLng location, String category, Sitelinks siteLinks) {
public Place(String name, Label label, String longDescription, LatLng location, String category, Sitelinks siteLinks) {
this.name = name;
this.label = label;
this.longDescription = longDescription;
this.secondaryImageUrl = secondaryImageUrl;
this.location = location;
this.category = category;
this.siteLinks = siteLinks;
@ -45,7 +39,6 @@ public class Place implements Parcelable {
this.name = in.readString();
this.label = (Label) in.readSerializable();
this.longDescription = in.readString();
this.secondaryImageUrl = in.readParcelable(Uri.class.getClassLoader());
this.location = in.readParcelable(LatLng.class.getClassLoader());
this.category = in.readString();
this.siteLinks = in.readParcelable(Sitelinks.class.getClassLoader());
@ -61,7 +54,6 @@ public class Place implements Parcelable {
item.getLabel().getValue(),
Label.fromText(classEntityId), // list
item.getClassLabel().getValue(), // details
Uri.parse(item.getIcon().getValue()),
PlaceUtils.latLngFromPointString(item.getLocation().getValue()),
item.getCommonsCategory().getValue(),
new Sitelinks.Builder()
@ -109,12 +101,6 @@ public class Place implements Parcelable {
this.distance = distance;
}
/**
* Gets the secondary image url for bookmarks
* @return secondary image url
*/
public Uri getSecondaryImageUrl() { return this.secondaryImageUrl; }
/**
* Extracts the entity id from the wikidata link
* @return returns the entity id if wikidata link exists
@ -181,11 +167,8 @@ public class Place implements Parcelable {
"name='" + name + '\'' +
", label='" + label + '\'' +
", longDescription='" + longDescription + '\'' +
", secondaryImageUrl='" + secondaryImageUrl + '\'' +
", location='" + location + '\'' +
", category='" + category + '\'' +
", image='" + image + '\'' +
", secondaryImage=" + secondaryImage +
", distance='" + distance + '\'' +
", siteLinks='" + siteLinks.toString() + '\'' +
'}';
@ -201,7 +184,6 @@ public class Place implements Parcelable {
dest.writeString(name);
dest.writeSerializable(label);
dest.writeString(longDescription);
dest.writeParcelable(secondaryImageUrl, 0);
dest.writeParcelable(location, 0);
dest.writeString(category);
dest.writeParcelable(siteLinks, 0);

2
app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
View file

@ -218,7 +218,7 @@ public class PlaceRenderer extends Renderer<Place> {
distance.setText(place.distance);
icon.setImageURI(place.getSecondaryImageUrl());
icon.setImageResource(place.getLabel().getIcon());
directionsButton.setOnClickListener(view -> {
//Open map app at given position

8
app/src/main/resources/queries/nearby_query.rq
View file

@ -5,7 +5,6 @@ SELECT
(SAMPLE(?classId) as ?class)
(SAMPLE(COALESCE(?class_label_preferred_language, ?class_label_any_language, "?")) as ?class_label)
(SAMPLE(COALESCE(?icon0, ?icon1)) as ?icon)
(SAMPLE(COALESCE(?emoji0, ?emoji1)) as ?emoji)
?wikipediaArticle
?commonsArticle
(SAMPLE(?Commons_category) as ?Commons_category)
@ -33,13 +32,6 @@ SELECT
OPTIONAL {?classId rdfs:label ?class_label_preferred_language. FILTER (lang(?class_label_preferred_language) = "${LANG}")}
OPTIONAL {?classId rdfs:label ?class_label_any_language}
# Get icon
OPTIONAL { ?classId wdt:P2910 ?icon0. }
OPTIONAL { ?classId wdt:P279*/wdt:P2910 ?icon1. }
# Get emoji
OPTIONAL { ?classId wdt:P487 ?emoji0. }
OPTIONAL { ?classId wdt:P279*/wdt:P487 ?emoji1. }
OPTIONAL {
?wikipediaArticle schema:about ?item ;
schema:isPartOf <https://${LANG}.wikipedia.org/> .

7
app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt
View file

@ -60,8 +60,8 @@ class BookMarkLocationDaoTest {
builder.setCommonsLink("commonsLink")
examplePlaceBookmark = Place("placeName", exampleLabel, "placeDescription",
exampleUri, exampleLocation, "placeCategory", builder.build())
examplePlaceBookmark = Place("placeName", exampleLabel, "placeDescription"
, exampleLocation, "placeCategory", builder.build())
testObject = BookmarkLocationsDao { client }
}
@ -88,7 +88,6 @@ class BookMarkLocationDaoTest {
assertEquals("placeName", it.name)
assertEquals(Label.FOREST, it.label)
assertEquals("placeDescription", it.longDescription)
assertEquals(exampleUri, it.secondaryImageUrl)
assertEquals(40.0, it.location.latitude)
assertEquals(51.4, it.location.longitude)
assertEquals("placeCategory", it.category)
@ -147,7 +146,7 @@ class BookMarkLocationDaoTest {
assertTrue(testObject.updateBookmarkLocation(examplePlaceBookmark))
verify(client).insert(eq(BASE_URI), captor.capture())
captor.firstValue.let { cv ->
assertEquals(11, cv.size())
assertEquals(10, cv.size())
assertEquals(examplePlaceBookmark.name, cv.getAsString(COLUMN_NAME))
assertEquals(examplePlaceBookmark.longDescription, cv.getAsString(COLUMN_DESCRIPTION))
assertEquals(examplePlaceBookmark.label.text, cv.getAsString(COLUMN_LABEL_TEXT))