From c2e018ae9e322e332278e98386e49be7b1040409 Mon Sep 17 00:00:00 2001 From: Neslihan Date: Fri, 12 May 2017 17:13:06 +0300 Subject: [PATCH 1/7] Nearby places displayed on the map --- .../nrw/commons/nearby/NearbyController.java | 80 +++++++++++++++++++ .../commons/nearby/NearbyListFragment.java | 56 +------------ .../nrw/commons/nearby/NearbyMapFragment.java | 63 +++++++++++++-- .../main/res/layout/fragment_nearby_map.xml | 7 ++ 4 files changed, 146 insertions(+), 60 deletions(-) create mode 100644 app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java new file mode 100644 index 000000000..ebf370ce4 --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java @@ -0,0 +1,80 @@ +package fr.free.nrw.commons.nearby; + +import android.content.Context; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; + +import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions; +import com.mapbox.mapboxsdk.annotations.MarkerOptions; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import fr.free.nrw.commons.location.LatLng; +import timber.log.Timber; + +import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween; +import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween; + + +public class NearbyController { + private static final int MAX_RESULTS = 1000; + private static List loadAttractionsFromLocation(LatLng curLatLng, Context context) { + Timber.d("Loading attractions near %s", curLatLng); + if (curLatLng == null) { + return Collections.emptyList(); + } + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + List places = prefs.getBoolean("useWikidata", true) + ? NearbyPlaces.getInstance().getFromWikidataQuery( + curLatLng, Locale.getDefault().getLanguage()) + : NearbyPlaces.getInstance().getFromWikiNeedsPictures(); + if (curLatLng != null) { + Timber.d("Sorting places by distance..."); + final Map distances = new HashMap<>(); + for (Place place: places) { + distances.put(place, computeDistanceBetween(place.location, curLatLng)); + } + Collections.sort(places, + new Comparator() { + @Override + public int compare(Place lhs, Place rhs) { + double lhsDistance = distances.get(lhs); + double rhsDistance = distances.get(rhs); + return (int) (lhsDistance - rhsDistance); + } + } + ); + } + return places; + } + public static List loadAttractionsFromLocationToPlaces(LatLng curLatLng, Context context){ + + List places = loadAttractionsFromLocation(curLatLng,context); + places = places.subList(0, Math.min(places.size(), MAX_RESULTS)); + for (Place place: places) { + String distance = formatDistanceBetween(curLatLng, place.location); + place.setDistance(distance); + } + return places; + } + public static List loadAttractionsFromLocationToBaseMarkerOptions(LatLng curLatLng, Context context){ + List baseMarkerOptionses = new ArrayList<>(); + List places = loadAttractionsFromLocation(curLatLng,context); + places = places.subList(0, Math.min(places.size(), MAX_RESULTS)); + for (Place place: places) { + String distance = formatDistanceBetween(curLatLng, place.location); + place.setDistance(distance); + baseMarkerOptionses.add(new MarkerOptions() + .position(new com.mapbox.mapboxsdk.geometry.LatLng(place.location.latitude,place.location.longitude)) + .title(place.name) + .snippet(place.description)); + } + return baseMarkerOptionses; + } +} diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java index 6dae3bc90..a686d66c5 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java @@ -1,14 +1,9 @@ package fr.free.nrw.commons.nearby; -import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween; -import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween; - import android.content.Intent; -import android.content.SharedPreferences; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.preference.PreferenceManager; import android.support.v4.app.ListFragment; import android.view.LayoutInflater; import android.view.View; @@ -16,24 +11,17 @@ import android.view.ViewGroup; import android.widget.ListView; import android.widget.ProgressBar; +import java.util.List; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnItemClick; import fr.free.nrw.commons.R; import fr.free.nrw.commons.location.LatLng; - -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - import timber.log.Timber; public class NearbyListFragment extends ListFragment { - private static final int MAX_RESULTS = 1000; private NearbyAsyncTask nearbyAsyncTask; @BindView(R.id.listView) ListView listview; @@ -124,8 +112,8 @@ public class NearbyListFragment extends ListFragment { @Override protected List doInBackground(Void... params) { - return loadAttractionsFromLocation( - ((NearbyActivity)getActivity()).getLocationManager().getLatestLocation() + return NearbyController.loadAttractionsFromLocationToPlaces( + ((NearbyActivity)getActivity()).getLocationManager().getLatestLocation(), getActivity() ); } @@ -164,40 +152,4 @@ public class NearbyListFragment extends ListFragment { startActivity(mapIntent); } } - - private List loadAttractionsFromLocation(LatLng curLatLng) { - Timber.d("Loading attractions near %s", curLatLng); - if (curLatLng == null) { - return Collections.emptyList(); - } - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); - List places = prefs.getBoolean("useWikidata", true) - ? NearbyPlaces.getInstance().getFromWikidataQuery( - curLatLng, Locale.getDefault().getLanguage()) - : NearbyPlaces.getInstance().getFromWikiNeedsPictures(); - if (curLatLng != null) { - Timber.d("Sorting places by distance..."); - final Map distances = new HashMap<>(); - for (Place place: places) { - distances.put(place, computeDistanceBetween(place.location, curLatLng)); - } - Collections.sort(places, - new Comparator() { - @Override - public int compare(Place lhs, Place rhs) { - double lhsDistance = distances.get(lhs); - double rhsDistance = distances.get(rhs); - return (int) (lhsDistance - rhsDistance); - } - } - ); - } - - places = places.subList(0, Math.min(places.size(), MAX_RESULTS)); - for (Place place: places) { - String distance = formatDistanceBetween(curLatLng, place.location); - place.setDistance(distance); - } - return places; - } } 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 367ecc039..7ed2ab03d 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 @@ -1,23 +1,34 @@ package fr.free.nrw.commons.nearby; +import android.os.AsyncTask; import android.os.Bundle; +import android.support.annotation.Nullable; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ProgressBar; import butterknife.BindView; import butterknife.ButterKnife; import com.mapbox.mapboxsdk.Mapbox; +import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.services.android.telemetry.MapboxTelemetry; +import java.util.List; + import fr.free.nrw.commons.R; public class NearbyMapFragment extends android.support.v4.app.Fragment { + private NearbyAsyncTask nearbyAsyncTask; + @BindView(R.id.mapview) MapView mapView; + @BindView(R.id.progressBar) + ProgressBar progressBar; public NearbyMapFragment() { @@ -41,17 +52,16 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { mapView.onCreate(savedInstanceState); setHasOptionsMenu(false); - - mapView.getMapAsync(new OnMapReadyCallback() { - @Override - public void onMapReady(MapboxMap mapboxMap) { - - } - }); - return view; } + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + nearbyAsyncTask = new NearbyAsyncTask(); + nearbyAsyncTask.execute(); + } + @Override public void onStart() { mapView.onStart(); @@ -81,4 +91,41 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { mapView.onDestroy(); super.onDestroyView(); } + + private class NearbyAsyncTask extends AsyncTask> { + + @Override + protected void onPreExecute() { + super.onPreExecute(); + progressBar.setVisibility(View.VISIBLE); + } + + @Override + protected void onProgressUpdate(Integer... values) { + super.onProgressUpdate(values); + progressBar.setProgress(values[0]); + } + + @Override + protected List doInBackground(Void... params) { + return NearbyController.loadAttractionsFromLocationToBaseMarkerOptions( + ((NearbyActivity)getActivity()).getLocationManager().getLatestLocation(), getActivity() + ); + } + + @Override + protected void onPostExecute(final List baseMarkerOptionses) { + super.onPostExecute(baseMarkerOptionses); + + if (isCancelled()) { + return; + } + mapView.getMapAsync(new OnMapReadyCallback() { + @Override + public void onMapReady(MapboxMap mapboxMap) { + mapboxMap.addMarkers(baseMarkerOptionses); + } + }); + } + } } diff --git a/app/src/main/res/layout/fragment_nearby_map.xml b/app/src/main/res/layout/fragment_nearby_map.xml index ff4ba4d54..715e0d532 100644 --- a/app/src/main/res/layout/fragment_nearby_map.xml +++ b/app/src/main/res/layout/fragment_nearby_map.xml @@ -13,4 +13,11 @@ mapbox:mapbox_cameraTargetLat="50.0755" mapbox:mapbox_cameraTargetLng="14.4378" mapbox:mapbox_styleUrl="@string/style_mapbox_streets" /> + + \ No newline at end of file From f6ac8fd1a543f01b59690ebfde873767c287e0da Mon Sep 17 00:00:00 2001 From: Neslihan Date: Fri, 12 May 2017 17:55:21 +0300 Subject: [PATCH 2/7] Display nearby places on the map --- .../nrw/commons/nearby/NearbyMapFragment.java | 27 ++++++++++++------- .../main/res/layout/fragment_nearby_map.xml | 15 ----------- 2 files changed, 17 insertions(+), 25 deletions(-) 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 7ed2ab03d..664b48aa2 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 @@ -14,8 +14,12 @@ import butterknife.ButterKnife; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions; +import com.mapbox.mapboxsdk.camera.CameraPosition; +import com.mapbox.mapboxsdk.constants.Style; +import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.maps.MapboxMapOptions; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.services.android.telemetry.MapboxTelemetry; @@ -25,10 +29,8 @@ import fr.free.nrw.commons.R; public class NearbyMapFragment extends android.support.v4.app.Fragment { private NearbyAsyncTask nearbyAsyncTask; - - @BindView(R.id.mapview) MapView mapView; - @BindView(R.id.progressBar) - ProgressBar progressBar; + private fr.free.nrw.commons.location.LatLng currentLocation; + private MapView mapView; public NearbyMapFragment() { @@ -37,7 +39,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + currentLocation = ((NearbyActivity)getActivity()).getLocationManager().getLatestLocation(); Mapbox.getInstance(getActivity(), getString(R.string.mapbox_commons_app_token)); MapboxTelemetry.getInstance().setTelemetryEnabled(false); @@ -48,9 +50,17 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_nearby_map, container, false); ButterKnife.bind(this, view); + MapboxMapOptions options = new MapboxMapOptions() + .styleUrl(Style.OUTDOORS) + .camera(new CameraPosition.Builder() + .target(new LatLng(currentLocation.latitude, currentLocation.longitude)) + .zoom(11) + .build()); + // create map + mapView = new MapView(getActivity(), options); mapView.onCreate(savedInstanceState); - + getActivity().setContentView(mapView); setHasOptionsMenu(false); return view; } @@ -97,19 +107,16 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { @Override protected void onPreExecute() { super.onPreExecute(); - progressBar.setVisibility(View.VISIBLE); } @Override protected void onProgressUpdate(Integer... values) { super.onProgressUpdate(values); - progressBar.setProgress(values[0]); } @Override protected List doInBackground(Void... params) { - return NearbyController.loadAttractionsFromLocationToBaseMarkerOptions( - ((NearbyActivity)getActivity()).getLocationManager().getLatestLocation(), getActivity() + return NearbyController.loadAttractionsFromLocationToBaseMarkerOptions(currentLocation, getActivity() ); } diff --git a/app/src/main/res/layout/fragment_nearby_map.xml b/app/src/main/res/layout/fragment_nearby_map.xml index 715e0d532..33be54cdf 100644 --- a/app/src/main/res/layout/fragment_nearby_map.xml +++ b/app/src/main/res/layout/fragment_nearby_map.xml @@ -5,19 +5,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - \ No newline at end of file From 470ad29380c469a0171e52dfdafb2b865f056e66 Mon Sep 17 00:00:00 2001 From: Neslihan Date: Fri, 12 May 2017 18:41:25 +0300 Subject: [PATCH 3/7] Fix double click to map icon and refresh icon click --- .../java/fr/free/nrw/commons/nearby/NearbyActivity.java | 9 ++++++--- .../fr/free/nrw/commons/nearby/NearbyMapFragment.java | 5 +---- app/src/main/res/layout/fragment_nearby_map.xml | 8 -------- 3 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 app/src/main/res/layout/fragment_nearby_map.xml 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 ec410ca69..9e0ce1c13 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 @@ -55,9 +55,12 @@ public class NearbyActivity extends BaseActivity { } private void showMapView() { - isMapViewActive = true; - getSupportFragmentManager().beginTransaction() - .replace(R.id.container, new NearbyMapFragment()).commit(); + if(!isMapViewActive){ + getSupportFragmentManager().beginTransaction() + .replace(R.id.container, new NearbyMapFragment()).commit(); + isMapViewActive = true; + } + } @Override 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 664b48aa2..d590ed3a2 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 @@ -48,8 +48,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_nearby_map, container, false); - ButterKnife.bind(this, view); MapboxMapOptions options = new MapboxMapOptions() .styleUrl(Style.OUTDOORS) .camera(new CameraPosition.Builder() @@ -60,9 +58,8 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { // create map mapView = new MapView(getActivity(), options); mapView.onCreate(savedInstanceState); - getActivity().setContentView(mapView); setHasOptionsMenu(false); - return view; + return mapView; } @Override diff --git a/app/src/main/res/layout/fragment_nearby_map.xml b/app/src/main/res/layout/fragment_nearby_map.xml deleted file mode 100644 index 33be54cdf..000000000 --- a/app/src/main/res/layout/fragment_nearby_map.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file From 08501b9348ecb9e069c73c51931c0455d1d3cab7 Mon Sep 17 00:00:00 2001 From: Neslihan Date: Fri, 12 May 2017 18:45:33 +0300 Subject: [PATCH 4/7] Organize imports --- .../main/java/fr/free/nrw/commons/nearby/NearbyAdapter.java | 1 - .../java/fr/free/nrw/commons/nearby/NearbyMapFragment.java | 5 ----- .../main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java | 5 ++--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapter.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapter.java index 96a42e008..d2ad0b978 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapter.java @@ -7,7 +7,6 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import fr.free.nrw.commons.R; - import timber.log.Timber; public class NearbyAdapter extends ArrayAdapter { 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 d590ed3a2..bf463e87e 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 @@ -3,14 +3,9 @@ package fr.free.nrw.commons.nearby; import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.Nullable; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ProgressBar; - -import butterknife.BindView; -import butterknife.ButterKnife; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions; 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 44d415505..6fe319c85 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 @@ -3,9 +3,6 @@ package fr.free.nrw.commons.nearby; import android.net.Uri; import android.os.StrictMode; -import fr.free.nrw.commons.Utils; -import fr.free.nrw.commons.location.LatLng; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -19,6 +16,8 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; +import fr.free.nrw.commons.Utils; +import fr.free.nrw.commons.location.LatLng; import timber.log.Timber; public class NearbyPlaces { From f9fd354d0066ca4ad8b559bc5cf5c8d6cf684e09 Mon Sep 17 00:00:00 2001 From: Neslihan Date: Fri, 12 May 2017 18:55:29 +0300 Subject: [PATCH 5/7] Fix Codacy issues --- .../nrw/commons/nearby/NearbyController.java | 25 ++++++++++++++++--- .../commons/nearby/NearbyListFragment.java | 4 ++- .../nrw/commons/nearby/NearbyMapFragment.java | 3 ++- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java index ebf370ce4..fab043d14 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java @@ -24,6 +24,7 @@ import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween; public class NearbyController { private static final int MAX_RESULTS = 1000; + private static List loadAttractionsFromLocation(LatLng curLatLng, Context context) { Timber.d("Loading attractions near %s", curLatLng); if (curLatLng == null) { @@ -53,7 +54,15 @@ public class NearbyController { } return places; } - public static List loadAttractionsFromLocationToPlaces(LatLng curLatLng, Context context){ + + /** + * Loads attractions from location for list view, we need to return Place data type + * @param curLatLng + * @param context + * @return + */ + + public static List loadAttractionsFromLocationToPlaces(LatLng curLatLng, Context context) { List places = loadAttractionsFromLocation(curLatLng,context); places = places.subList(0, Math.min(places.size(), MAX_RESULTS)); @@ -63,7 +72,16 @@ public class NearbyController { } return places; } - public static List loadAttractionsFromLocationToBaseMarkerOptions(LatLng curLatLng, Context context){ + + /** + *Loads attractions from location for map view, we need to return BaseMarkerOption data type + * @param curLatLng + * @param context + * @return + */ + public static List loadAttractionsFromLocationToBaseMarkerOptions( + LatLng curLatLng, + Context context) { List baseMarkerOptionses = new ArrayList<>(); List places = loadAttractionsFromLocation(curLatLng,context); places = places.subList(0, Math.min(places.size(), MAX_RESULTS)); @@ -71,7 +89,8 @@ public class NearbyController { String distance = formatDistanceBetween(curLatLng, place.location); place.setDistance(distance); baseMarkerOptionses.add(new MarkerOptions() - .position(new com.mapbox.mapboxsdk.geometry.LatLng(place.location.latitude,place.location.longitude)) + .position(new com.mapbox.mapboxsdk.geometry + .LatLng(place.location.latitude,place.location.longitude)) .title(place.name) .snippet(place.description)); } diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java index a686d66c5..5921c0e30 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java @@ -113,7 +113,9 @@ public class NearbyListFragment extends ListFragment { @Override protected List doInBackground(Void... params) { return NearbyController.loadAttractionsFromLocationToPlaces( - ((NearbyActivity)getActivity()).getLocationManager().getLatestLocation(), getActivity() + ((NearbyActivity)getActivity()) + .getLocationManager() + .getLatestLocation(), getActivity() ); } 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 bf463e87e..7b627ecdf 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 @@ -108,7 +108,8 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { @Override protected List doInBackground(Void... params) { - return NearbyController.loadAttractionsFromLocationToBaseMarkerOptions(currentLocation, getActivity() + return NearbyController + .loadAttractionsFromLocationToBaseMarkerOptions(currentLocation, getActivity() ); } From ed32ebbb62a289ad48894bd27226ce9fcc974349 Mon Sep 17 00:00:00 2001 From: Neslihan Date: Fri, 12 May 2017 19:05:20 +0300 Subject: [PATCH 6/7] Fix Codacy issues --- .../nrw/commons/nearby/NearbyActivity.java | 3 +-- .../nrw/commons/nearby/NearbyController.java | 24 ++++++++++--------- .../free/nrw/commons/nearby/NearbyPlaces.java | 5 ++-- 3 files changed, 17 insertions(+), 15 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 9e0ce1c13..53e01af86 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 @@ -55,12 +55,11 @@ public class NearbyActivity extends BaseActivity { } private void showMapView() { - if(!isMapViewActive){ + if (!isMapViewActive) { getSupportFragmentManager().beginTransaction() .replace(R.id.container, new NearbyMapFragment()).commit(); isMapViewActive = true; } - } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java index fab043d14..c2834dba8 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java @@ -7,6 +7,8 @@ import android.preference.PreferenceManager; import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions; import com.mapbox.mapboxsdk.annotations.MarkerOptions; +import fr.free.nrw.commons.location.LatLng; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -15,7 +17,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import fr.free.nrw.commons.location.LatLng; import timber.log.Timber; import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween; @@ -56,13 +57,14 @@ public class NearbyController { } /** - * Loads attractions from location for list view, we need to return Place data type - * @param curLatLng - * @param context + * Loads attractions from location for list view, we need to return Place data type. + * @param curLatLng users current location + * @param context current activity * @return */ - public static List loadAttractionsFromLocationToPlaces(LatLng curLatLng, Context context) { + public static List loadAttractionsFromLocationToPlaces(LatLng curLatLng, + Context context) { List places = loadAttractionsFromLocation(curLatLng,context); places = places.subList(0, Math.min(places.size(), MAX_RESULTS)); @@ -74,9 +76,9 @@ public class NearbyController { } /** - *Loads attractions from location for map view, we need to return BaseMarkerOption data type - * @param curLatLng - * @param context + *Loads attractions from location for map view, we need to return BaseMarkerOption data type. + * @param curLatLng users current location + * @param context the activity * @return */ public static List loadAttractionsFromLocationToBaseMarkerOptions( @@ -89,10 +91,10 @@ public class NearbyController { String distance = formatDistanceBetween(curLatLng, place.location); place.setDistance(distance); baseMarkerOptionses.add(new MarkerOptions() - .position(new com.mapbox.mapboxsdk.geometry + .position(new com.mapbox.mapboxsdk.geometry .LatLng(place.location.latitude,place.location.longitude)) - .title(place.name) - .snippet(place.description)); + .title(place.name) + .snippet(place.description)); } return baseMarkerOptionses; } 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 6fe319c85..44d415505 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 @@ -3,6 +3,9 @@ package fr.free.nrw.commons.nearby; import android.net.Uri; import android.os.StrictMode; +import fr.free.nrw.commons.Utils; +import fr.free.nrw.commons.location.LatLng; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -16,8 +19,6 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import fr.free.nrw.commons.Utils; -import fr.free.nrw.commons.location.LatLng; import timber.log.Timber; public class NearbyPlaces { From c906d6d3d490004e4168875bd9a68991c6b30dcd Mon Sep 17 00:00:00 2001 From: Neslihan Date: Fri, 12 May 2017 19:12:39 +0300 Subject: [PATCH 7/7] Fix Codacy issues --- .../fr/free/nrw/commons/nearby/NearbyController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java index c2834dba8..0d0712e1b 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java @@ -1,5 +1,8 @@ package fr.free.nrw.commons.nearby; +import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween; +import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween; + import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; @@ -19,9 +22,6 @@ import java.util.Map; import timber.log.Timber; -import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween; -import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween; - public class NearbyController { private static final int MAX_RESULTS = 1000; @@ -60,7 +60,7 @@ public class NearbyController { * Loads attractions from location for list view, we need to return Place data type. * @param curLatLng users current location * @param context current activity - * @return + * @return Place list that holds nearby places */ public static List loadAttractionsFromLocationToPlaces(LatLng curLatLng, @@ -79,7 +79,7 @@ public class NearbyController { *Loads attractions from location for map view, we need to return BaseMarkerOption data type. * @param curLatLng users current location * @param context the activity - * @return + * @return BaseMarkerOprions list that holds nearby places */ public static List loadAttractionsFromLocationToBaseMarkerOptions( LatLng curLatLng,