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

Fix being Hansel and Gretel problem

Browse source
This commit is contained in:
neslihanturan 2018-02-23 20:00:52 +03:00
parent 4ee2e1fa37
commit 2a30ecb2aa
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.MapboxMapOptions; import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
import com.mapbox.services.android.telemetry.MapboxTelemetry; import com.mapbox.services.android.telemetry.MapboxTelemetry;
import java.lang.reflect.Type; import java.lang.reflect.Type;
@ -53,8 +54,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
private List<NearbyBaseMarker> baseMarkerOptions; private List<NearbyBaseMarker> baseMarkerOptions;
private fr.free.nrw.commons.location.LatLng curLatLng; private fr.free.nrw.commons.location.LatLng curLatLng;
public fr.free.nrw.commons.location.LatLng[] boundaryCoordinates; public fr.free.nrw.commons.location.LatLng[] boundaryCoordinates;
// 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;
@ -201,14 +200,14 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
boundaryCoordinates = gson.fromJson(gsonBoundaryCoordinates, gsonBoundaryCoordinatesType); boundaryCoordinates = gson.fromJson(gsonBoundaryCoordinates, gsonBoundaryCoordinatesType);
} }
updateMapToTrackPosition(); updateMapToTrackPosition();
addNearbyMarkerstoMapBoxMap(); //addNearbyMarkerstoMapBoxMap();
} }
// Only update current position marker and camera view // Only update current position marker and camera view
private void updateMapToTrackPosition() { private void updateMapToTrackPosition() {
// Change // Change
Log.d("deneme","updateMapToTrackPosition"); Log.d("deneme","updateMapToTrackPosition");
if (currentLocationMarker != null) { if (currentLocationMarker != null && mapboxMap != null) {
LatLng curMapBoxLatLng = new LatLng(curLatLng.getLatitude(),curLatLng.getLongitude()); LatLng curMapBoxLatLng = new LatLng(curLatLng.getLatitude(),curLatLng.getLongitude());
ValueAnimator markerAnimator = ObjectAnimator.ofObject(currentLocationMarker, "position", ValueAnimator markerAnimator = ObjectAnimator.ofObject(currentLocationMarker, "position",
new LatLngEvaluator(), currentLocationMarker.getPosition(), new LatLngEvaluator(), currentLocationMarker.getPosition(),
@ -370,6 +369,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
} }
});*/ });*/
addNearbyMarkerstoMapBoxMap(); addNearbyMarkerstoMapBoxMap();
//addCurrentLocationMarker(mapboxMap);
} }
/** /**
@ -383,10 +383,14 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
* move. * move.
*/ */
private void addCurrentLocationMarker(MapboxMap mapboxMap) { private void addCurrentLocationMarker(MapboxMap mapboxMap) {
if (currentLocationMarker != null) {
currentLocationMarker.remove(); // Remove previous marker, we are not Hansel and Gretel
}
MarkerOptions currentLocationMarkerOptions = new MarkerOptions() MarkerOptions currentLocationMarkerOptions = new MarkerOptions()
.position(new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude())); .position(new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude()));
currentLocationMarker = mapboxMap.addMarker(currentLocationMarkerOptions); currentLocationMarker = mapboxMap.addMarker(currentLocationMarkerOptions);
List<LatLng> circle = createCircleArray(curLatLng.getLatitude(), curLatLng.getLongitude(), List<LatLng> circle = createCircleArray(curLatLng.getLatitude(), curLatLng.getLongitude(),
curLatLng.getAccuracy() * 2, 100); curLatLng.getAccuracy() * 2, 100);
@ -395,10 +399,16 @@ 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 //latestSignificantUpdate = curLatLng; // To remember the last point we update nearby markers
} }
private void addNearbyMarkerstoMapBoxMap() { private void addNearbyMarkerstoMapBoxMap() {
mapView.getMapAsync(new OnMapReadyCallback() {
@Override
public void onMapReady(MapboxMap mapboxMap) {
}
});
mapView.getMapAsync(mapboxMap -> { mapView.getMapAsync(mapboxMap -> {
mapboxMap.addMarkers(baseMarkerOptions); mapboxMap.addMarkers(baseMarkerOptions);