From b89ca7628ec102357521b2b603c62f3b21ba2c5d Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Mon, 22 Aug 2016 18:58:02 +1200
Subject: [PATCH] Remove 'city' from place

---
 .../main/java/fr/free/nrw/commons/nearby/NearbyActivity.java | 2 ++
 .../main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java   | 3 +--
 app/src/main/java/fr/free/nrw/commons/nearby/Place.java      | 5 +----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index 3200a5ed6..a35972490 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -41,6 +41,8 @@ public class NearbyActivity extends AppCompatActivity {
         registerLocationManager();
         //TODO: Check if we need String or double coords, and in what format
         //gpsCoords = String.valueOf(currentLatitude) + "|" + String.valueOf(currentLongitude);
+
+        //TODO: Use fragment for list like in AttractionListFragment?
     }
 
 
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
index 299aad4f5..679d63436 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
@@ -27,8 +27,7 @@ public class NearbyPlaces {
 
                 URL file = new URL("https://tools.wmflabs.org/wiki-needs-pictures/data/data.csv");
 
-                BufferedReader in = new BufferedReader(
-                        new InputStreamReader(file.openStream()));
+                BufferedReader in = new BufferedReader(new InputStreamReader(file.openStream()));
 
                 boolean firstLine = true;
                 String line;
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java
index 0db2a3cd7..389dd52ce 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java
@@ -14,7 +14,6 @@ public class Place {
         public Uri imageUrl;
         public Uri secondaryImageUrl;
         public LatLng location;
-        public String city;
 
         public Bitmap image;
         public Bitmap secondaryImage;
@@ -23,14 +22,12 @@ public class Place {
         public Place() {}
 
         public Place(String name, String description, String longDescription, Uri imageUrl,
-                          Uri secondaryImageUrl, LatLng location, String city) {
+                          Uri secondaryImageUrl, LatLng location) {
             this.name = name;
             this.description = description;
             this.longDescription = longDescription;
             this.imageUrl = imageUrl;
             this.secondaryImageUrl = secondaryImageUrl;
             this.location = location;
-            this.city = city;
         }
-
 }