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

Add boundaries as an attribute to NearbyMapFragment

Browse source
This commit is contained in:
neslihanturan 2018-02-23 14:25:37 +03:00
parent 283bc35a4a
commit 00f142bc5d
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file

@ -47,6 +47,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.location.LocationServiceManager;
import fr.free.nrw.commons.utils.UriDeserializer; import fr.free.nrw.commons.utils.UriDeserializer;
public class NearbyMapFragment extends android.support.v4.app.Fragment { public class NearbyMapFragment extends android.support.v4.app.Fragment {
@ -54,6 +55,10 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
private MapView mapView; private MapView mapView;
private List<NearbyBaseMarker> baseMarkerOptions; private List<NearbyBaseMarker> baseMarkerOptions;
private fr.free.nrw.commons.location.LatLng curLatLng; private fr.free.nrw.commons.location.LatLng curLatLng;
private fr.free.nrw.commons.location.LatLng[] boundaryCoordinations;
// Latest significant update means update of nearby markers
private fr.free.nrw.commons.location.LatLng latestSignificantUpdate;
private View bottomSheetList; private View bottomSheetList;
private View bottomSheetDetails; private View bottomSheetDetails;
@ -88,7 +93,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
private Marker currentLocationMarker; private Marker currentLocationMarker;
private MapboxMap mapboxMap; private MapboxMap mapboxMap;
private PolygonOptions currentLocationPolygonOptions; private PolygonOptions currentLocationPolygonOptions;
//private MarkerOptions currentLocationMarkerOptions;
public NearbyMapFragment() { public NearbyMapFragment() {
} }
@ -105,14 +109,21 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
if (bundle != null) { if (bundle != null) {
String gsonPlaceList = bundle.getString("PlaceList"); String gsonPlaceList = bundle.getString("PlaceList");
String gsonLatLng = bundle.getString("CurLatLng"); String gsonLatLng = bundle.getString("CurLatLng");
String gsonBoundaryCoordinates = bundle.getString("BoundaryCoord");
Type listType = new TypeToken<List<Place>>() {}.getType(); Type listType = new TypeToken<List<Place>>() {}.getType();
List<Place> placeList = gson.fromJson(gsonPlaceList, listType); List<Place> placeList = gson.fromJson(gsonPlaceList, listType);
Type curLatLngType = new TypeToken<fr.free.nrw.commons.location.LatLng>() {}.getType(); Type curLatLngType = new TypeToken<fr.free.nrw.commons.location.LatLng>() {}.getType();
Type gsonBoundaryCoordinatesType = new TypeToken<fr.free.nrw.commons.location.LatLng[]>() {}.getType();
curLatLng = gson.fromJson(gsonLatLng, curLatLngType); curLatLng = gson.fromJson(gsonLatLng, curLatLngType);
baseMarkerOptions = NearbyController baseMarkerOptions = NearbyController
.loadAttractionsFromLocationToBaseMarkerOptions(curLatLng, .loadAttractionsFromLocationToBaseMarkerOptions(curLatLng,
placeList, placeList,
getActivity()); getActivity());
boundaryCoordinations = gson.fromJson(gsonBoundaryCoordinates, gsonBoundaryCoordinatesType);
Log.d("deneme",boundaryCoordinations[0].getLatitude()+","+boundaryCoordinations[0].getLongitude());
Log.d("deneme",boundaryCoordinations[1].getLatitude()+","+boundaryCoordinations[1].getLongitude());
Log.d("deneme",boundaryCoordinations[2].getLatitude()+","+boundaryCoordinations[2].getLongitude());
Log.d("deneme",boundaryCoordinations[3].getLatitude()+","+boundaryCoordinations[3].getLongitude());
} }
Mapbox.getInstance(getActivity(), Mapbox.getInstance(getActivity(),
getString(R.string.mapbox_commons_app_token)); getString(R.string.mapbox_commons_app_token));
@ -172,6 +183,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
updateMapView(); updateMapView();
} }
// Only update current position marker and camera view
private void updateMapView() { private void updateMapView() {
// Change // Change
Log.d("deneme","updateMapView"); Log.d("deneme","updateMapView");
@ -204,7 +216,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
.newCameraPosition(position), 1000); .newCameraPosition(position), 1000);
} }
} }
private void initViews() { private void initViews() {
bottomSheetList = getActivity().findViewById(R.id.bottom_sheet); bottomSheetList = getActivity().findViewById(R.id.bottom_sheet);
bottomSheetListBehavior = BottomSheetBehavior.from(bottomSheetList); bottomSheetListBehavior = BottomSheetBehavior.from(bottomSheetList);
@ -369,6 +381,10 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
* circle which uses the accuracy * 2, to draw a circle * circle which uses the accuracy * 2, to draw a circle
* which represents the user's position with an accuracy * which represents the user's position with an accuracy
* of 95%. * of 95%.
*
* Should be called only on creation of mapboxMap, there
* is other method to update markers location with users
* move.
*/ */
private void addCurrentLocationMarker(MapboxMap mapboxMap) { private void addCurrentLocationMarker(MapboxMap mapboxMap) {
MarkerOptions currentLocationMarkerOptions = new MarkerOptions() MarkerOptions currentLocationMarkerOptions = new MarkerOptions()
@ -383,6 +399,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
.strokeColor(Color.parseColor("#55000000")) .strokeColor(Color.parseColor("#55000000"))
.fillColor(Color.parseColor("#11000000")); .fillColor(Color.parseColor("#11000000"));
mapboxMap.addPolygon(currentLocationPolygonOptions); mapboxMap.addPolygon(currentLocationPolygonOptions);
latestSignificantUpdate = curLatLng; // To remember the last point we update nearby markers
} }