diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java index df16db068..66ae0a010 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java @@ -377,9 +377,9 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { commonsButton.setOnClickListener(view -> openWebView(place.siteLinks.getCommonsLink())); icon.setImageResource(place.getLabel().getIcon()); - description.setText(place.getLabel().getText()); title.setText(place.name); distance.setText(place.distance); + description.setText(place.getLongDescription()); title.setText(place.name.toString()); distance.setText(place.distance.toString()); diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java index e62263b9e..a13e340b4 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java @@ -13,7 +13,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.mapbox.mapboxsdk.geometry.LatLng; import com.pedrogomez.renderers.Renderer; import java.util.ArrayList; diff --git a/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java b/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java index e0c8de403..451ff8331 100644 --- a/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java +++ b/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java @@ -33,8 +33,12 @@ public class NearbyAdapterFactoryTest { private static final Place PLACE = new Place("name", Place.Label.AIRPORT, "desc", null, new LatLng(38.6270, -90.1994, 0), null); private static final Place UNKNOWN_PLACE = new Place("name", Place.Label.UNKNOWN, +<<<<<<< 27ac8ae0d72011bc651affecf7b1da2100ec927e "?", null, new LatLng(39.7392, -104.9903, 0), null); // ^ "?" is a special value for unknown class names from Wikidata query results +======= + "desc", null, new LatLng(39.7392, -104.9903, 0), null); +>>>>>>> Rename Description to Label to prevent misunderstandings private Place clickedPlace; @Test