From ebbe90983f1360126254b8d055beae14f59a35ea Mon Sep 17 00:00:00 2001 From: Tobrun Date: Fri, 17 Jun 2016 17:00:57 +0200 Subject: [PATCH] [android] #5299 - add rotation to cars, add cars images --- .../annotation/AnimatedMarkerActivity.java | 48 ++++++++++++------ .../main/res/drawable-xxxhdpi/ic_car_top.png | Bin 0 -> 19879 bytes .../main/res/drawable-xxxhdpi/ic_taxi_top.png | Bin 0 -> 11275 bytes .../drawable/ic_directions_run_black_24dp.xml | 4 +- 4 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png create mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java index 118f4d16612..ea3a4cc42c1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java @@ -6,6 +6,7 @@ import android.animation.TypeEvaluator; import android.animation.ValueAnimator; import android.os.Bundle; +import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; @@ -17,6 +18,7 @@ import com.mapbox.mapboxsdk.annotations.Icon; import com.mapbox.mapboxsdk.annotations.IconFactory; import com.mapbox.mapboxsdk.annotations.Marker; +import com.mapbox.mapboxsdk.annotations.MarkerView; import com.mapbox.mapboxsdk.annotations.MarkerViewOptions; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -32,11 +34,12 @@ public class AnimatedMarkerActivity extends AppCompatActivity { private MapView mMapView; private MapboxMap mMapboxMap; + private Random random = new Random(); private LatLng dupontCircle = new LatLng(38.90962, -77.04341); private Marker passengerMarker = null; - private Marker carMarker = null; + private MarkerView carMarker = null; @Override protected void onCreate(Bundle savedInstanceState) { @@ -60,15 +63,14 @@ protected void onCreate(Bundle savedInstanceState) { public void onMapReady(@NonNull final MapboxMap mapboxMap) { mMapboxMap = mapboxMap; setupMap(); - - addPassenger(); - addMainCar(); - animateMoveToPassenger(carMarker); - + for (int i = 0; i < 10; i++) { addRandomCar(); } + addPassenger(); + addMainCar(); + animateMoveToPassenger(carMarker); } }); } @@ -99,7 +101,7 @@ private void addMainCar() { LatLng randomLatLng = getLatLngInBounds(); if (carMarker == null) { - carMarker = createCarMarker(randomLatLng); + carMarker = createCarMarker(randomLatLng, R.drawable.ic_taxi_top); } else { carMarker.setPosition(randomLatLng); } @@ -108,8 +110,7 @@ private void addMainCar() { mMapboxMap.selectMarker(carMarker); } - private void animateMoveToPassenger(final Marker car) { - + private void animateMoveToPassenger(final MarkerView car) { ValueAnimator animator = animateMoveMarker(car, passengerMarker.getPosition()); animator.addListener(new AnimatorListenerAdapter() { @Override @@ -121,25 +122,25 @@ public void onAnimationEnd(Animator animation) { } protected void addRandomCar() { - Marker car = createCarMarker(getLatLngInBounds()); + MarkerView car = createCarMarker(getLatLngInBounds(), R.drawable.ic_car_top); randomlyMoveMarker(car); } - private void randomlyMoveMarker(final Marker marker) { + private void randomlyMoveMarker(final MarkerView marker) { ValueAnimator animator = animateMoveMarker(marker, getLatLngInBounds()); //Add listener to restart animation on end animator.addListener(new AnimatorListenerAdapter() { - @Override public void onAnimationEnd(Animator animation) { randomlyMoveMarker(marker); } - }); } - private ValueAnimator animateMoveMarker(final Marker marker, LatLng to) { + private ValueAnimator animateMoveMarker(final MarkerView marker, LatLng to) { + marker.setRotation((float) getBearing(marker.getPosition(), to)); + final ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position", new LatLngEvaluator(), marker.getPosition(), to); markerAnimator.setDuration((long) (10 * marker.getPosition().distanceTo(to))); markerAnimator.setInterpolator(new AccelerateDecelerateInterpolator()); @@ -150,9 +151,9 @@ private ValueAnimator animateMoveMarker(final Marker marker, LatLng to) { return markerAnimator; } - private Marker createCarMarker(LatLng start) { + private MarkerView createCarMarker(LatLng start, @DrawableRes int carResource) { Icon icon = IconFactory.getInstance(AnimatedMarkerActivity.this) - .fromResource(R.drawable.ic_directions_car_black_24dp); + .fromResource(carResource); //View Markers return mMapboxMap.addMarker(new MarkerViewOptions() @@ -235,4 +236,19 @@ public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) { return mLatLng; } } + + private double getBearing(LatLng from, LatLng to) { + double degrees2radians = Math.PI / 180; + double radians2degrees = 180 / Math.PI; + + double lon1 = degrees2radians * from.getLongitude(); + double lon2 = degrees2radians * to.getLongitude(); + double lat1 = degrees2radians * from.getLatitude(); + double lat2 = degrees2radians * to.getLatitude(); + double a = Math.sin(lon2 - lon1) * Math.cos(lat2); + double b = Math.cos(lat1) * Math.sin(lat2) - + Math.sin(lat1) * Math.cos(lat2) * Math.cos(lon2 - lon1); + + return radians2degrees * Math.atan2(a, b); + } } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png new file mode 100644 index 0000000000000000000000000000000000000000..ca7590137ba968dc0903ce4c75beb93b56d10787 GIT binary patch literal 19879 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 literal 0 HcmV?d00001 diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black_24dp.xml index d18f6a17ceb..dfa43f020e5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black_24dp.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black_24dp.xml @@ -1,6 +1,6 @@