diff --git a/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java b/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java index b554972d8..9c96881e1 100644 --- a/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java +++ b/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java @@ -82,12 +82,14 @@ import com.mapbox.mapboxandroiddemo.examples.labs.AnimatedMarkerActivity; import com.mapbox.mapboxandroiddemo.examples.labs.CalendarIntegrationActivity; import com.mapbox.mapboxandroiddemo.examples.labs.DashedLineDirectionsPickerActivity; +import com.mapbox.mapboxandroiddemo.examples.labs.HomeScreenWidgetActivity; import com.mapbox.mapboxandroiddemo.examples.labs.IndoorMapActivity; import com.mapbox.mapboxandroiddemo.examples.labs.InsetMapActivity; import com.mapbox.mapboxandroiddemo.examples.labs.LocationPickerActivity; import com.mapbox.mapboxandroiddemo.examples.labs.MagicWindowKotlinActivity; import com.mapbox.mapboxandroiddemo.examples.labs.MapFogBackgroundActivity; import com.mapbox.mapboxandroiddemo.examples.labs.MarkerFollowingRouteActivity; +import com.mapbox.mapboxandroiddemo.examples.labs.MovingIconWithTrailingLineActivity; import com.mapbox.mapboxandroiddemo.examples.labs.PictureInPictureActivity; import com.mapbox.mapboxandroiddemo.examples.labs.PulsingLayerOpacityColorActivity; import com.mapbox.mapboxandroiddemo.examples.labs.RecyclerViewOnMapActivity; @@ -137,15 +139,14 @@ import com.mapbox.mapboxandroiddemo.examples.styles.MapboxStudioStyleActivity; import com.mapbox.mapboxandroiddemo.examples.styles.MissingIconActivity; import com.mapbox.mapboxandroiddemo.examples.styles.RotatingTextAnchorPositionActivity; -import com.mapbox.mapboxandroiddemo.examples.styles.ShowHideLayersActivity; import com.mapbox.mapboxandroiddemo.examples.styles.SatelliteOpacityOnZoomActivity; +import com.mapbox.mapboxandroiddemo.examples.styles.ShowHideLayersActivity; import com.mapbox.mapboxandroiddemo.examples.styles.TextFieldFormattingActivity; import com.mapbox.mapboxandroiddemo.examples.styles.TextFieldMultipleFormatsActivity; import com.mapbox.mapboxandroiddemo.examples.styles.TransparentBackgroundActivity; import com.mapbox.mapboxandroiddemo.examples.styles.VariableLabelPlacementActivity; import com.mapbox.mapboxandroiddemo.examples.styles.VectorSourceActivity; import com.mapbox.mapboxandroiddemo.examples.styles.ZoomDependentFillColorActivity; -import com.mapbox.mapboxandroiddemo.examples.labs.HomeScreenWidgetActivity; import com.mapbox.mapboxandroiddemo.model.ExampleItemModel; import com.mapbox.mapboxandroiddemo.utils.ItemClickSupport; import com.mapbox.mapboxandroiddemo.utils.SettingsDialogView; @@ -1176,6 +1177,14 @@ private void initializeModels() { R.string.activity_lab_animated_interpolator_icon_drop_url, false, BuildConfig.MIN_SDK_VERSION )); + exampleItemModels.add(new ExampleItemModel( + R.id.nav_lab, + R.string.activity_lab_moving_icon_with_trailing_line_title, + R.string.activity_lab_moving_icon_with_trailing_line_description, + new Intent(MainActivity.this, MovingIconWithTrailingLineActivity.class), + null, + R.string.activity_lab_moving_icon_with_trailing_line_url, true, BuildConfig.MIN_SDK_VERSION)); + exampleItemModels.add(new ExampleItemModel( R.id.nav_dds, R.string.activity_dds_geojson_line_title, @@ -1332,12 +1341,12 @@ private void initializeModels() { R.string.activity_dds_satellite_land_select_url, true, BuildConfig.MIN_SDK_VERSION)); exampleItemModels.add(new ExampleItemModel( - R.id.nav_dds, - R.string.activity_dds_symbol_zoom_switch_title, - R.string.activity_dds_symbol_zoom_switch_description, - new Intent(MainActivity.this, SymbolSwitchOnZoomActivity.class), - null, - R.string.activity_dds_symbol_zoom_switch_url, true, BuildConfig.MIN_SDK_VERSION)); + R.id.nav_dds, + R.string.activity_dds_symbol_zoom_switch_title, + R.string.activity_dds_symbol_zoom_switch_description, + new Intent(MainActivity.this, SymbolSwitchOnZoomActivity.class), + null, + R.string.activity_dds_symbol_zoom_switch_url, true, BuildConfig.MIN_SDK_VERSION)); exampleItemModels.add(new ExampleItemModel( R.id.nav_dds, diff --git a/MapboxAndroidDemo/src/main/AndroidManifest.xml b/MapboxAndroidDemo/src/main/AndroidManifest.xml index b326e0a5c..2109f0d79 100644 --- a/MapboxAndroidDemo/src/main/AndroidManifest.xml +++ b/MapboxAndroidDemo/src/main/AndroidManifest.xml @@ -446,6 +446,13 @@ android:name="android.support.PARENT_ACTIVITY" android:value="com.mapbox.mapboxandroiddemo.MainActivity" /> + + + diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MovingIconWithTrailingLineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MovingIconWithTrailingLineActivity.java new file mode 100644 index 000000000..94675ce5f --- /dev/null +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MovingIconWithTrailingLineActivity.java @@ -0,0 +1,304 @@ +package com.mapbox.mapboxandroiddemo.examples.labs; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.TypeEvaluator; +import android.animation.ValueAnimator; +import android.graphics.BitmapFactory; +import android.graphics.Color; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v7.app.AppCompatActivity; +import android.view.animation.LinearInterpolator; +import android.widget.Toast; +import com.mapbox.api.directions.v5.DirectionsCriteria; +import com.mapbox.api.directions.v5.MapboxDirections; +import com.mapbox.api.directions.v5.models.DirectionsResponse; +import com.mapbox.api.directions.v5.models.DirectionsRoute; +import com.mapbox.geojson.Feature; +import com.mapbox.geojson.FeatureCollection; +import com.mapbox.geojson.LineString; +import com.mapbox.geojson.Point; +import com.mapbox.mapboxandroiddemo.R; +import com.mapbox.mapboxsdk.Mapbox; +import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; +import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLngBounds; +import com.mapbox.mapboxsdk.maps.MapView; +import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; +import com.mapbox.mapboxsdk.maps.Style; +import com.mapbox.mapboxsdk.style.layers.LineLayer; +import com.mapbox.mapboxsdk.style.layers.Property; +import com.mapbox.mapboxsdk.style.layers.SymbolLayer; +import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; +import com.mapbox.turf.TurfMeasurement; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import timber.log.Timber; + +import java.util.ArrayList; +import java.util.List; + +import static com.mapbox.core.constants.Constants.PRECISION_6; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconAllowOverlap; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconIgnorePlacement; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconImage; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconOffset; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconSize; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineCap; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineColor; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineJoin; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineWidth; + +/** + * Make a directions request with the Mapbox Directions API and then draw a line behind a moving + * SymbolLayer icon which moves along the Directions response route. + */ +public class MovingIconWithTrailingLineActivity extends AppCompatActivity { + + private static final String DOT_SOURCE_ID = "dot-source-id"; + private static final String LINE_SOURCE_ID = "line-source-id"; + + private MapView mapView; + private MapboxMap mapboxMap; + + private GeoJsonSource pointSource; + private GeoJsonSource lineSource; + private List routeCoordinateList; + private List markerLinePointList = new ArrayList<>(); + private int routeIndex; + + private Animator currentAnimator; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Mapbox access token is configured here. This needs to be called either in your application + // object or in the same activity which contains the mapview. + Mapbox.getInstance(this, getString(R.string.access_token)); + + // This contains the MapView in XML and needs to be called after the access token is configured. + setContentView(R.layout.activity_dds_moving_icon_with_trailing_line); + + // Initialize the mapboxMap view + mapView = findViewById(R.id.mapView); + mapView.onCreate(savedInstanceState); + mapView.getMapAsync(new OnMapReadyCallback() { + @Override + public void onMapReady(MapboxMap mapboxMap) { + MovingIconWithTrailingLineActivity.this.mapboxMap = mapboxMap; + mapboxMap.setStyle(Style.LIGHT, new Style.OnStyleLoaded() { + @Override + public void onStyleLoaded(@NonNull Style style) { + // Use the Mapbox Directions API to get a directions route + getRoute(style, + Point.fromLngLat(38.7508, 9.0309), // coffee shop + Point.fromLngLat(38.795902, 8.984467) // airport + ); + } + }); + } + }); + } + + /** + * Add data to the map once the GeoJSON has been loaded + * + * @param featureCollection returned GeoJSON FeatureCollection from the Directions API route request + */ + private void initData(Style fullyLoadedStyle, @NonNull FeatureCollection featureCollection) { + routeCoordinateList = ((LineString) featureCollection.features().get(0).geometry()).coordinates(); + initSources(fullyLoadedStyle, featureCollection); + initSymbolLayer(fullyLoadedStyle); + initDotLinePath(fullyLoadedStyle); + animate(); + } + + /** + * Set up the repeat logic for moving the icon along the route. + */ + private void animate() { + // Check if we are at the end of the points list + if ((routeCoordinateList.size() - 1 > routeIndex)) { + Point indexPoint = routeCoordinateList.get(routeIndex); + Point newPoint = Point.fromLngLat(indexPoint.longitude(), indexPoint.latitude()); + currentAnimator = createLatLngAnimator(indexPoint, newPoint); + currentAnimator.start(); + routeIndex++; + } + } + + private static class PointEvaluator implements TypeEvaluator { + + @Override + public Point evaluate(float fraction, Point startValue, Point endValue) { + return Point.fromLngLat( + startValue.longitude() + ((endValue.longitude() - startValue.longitude()) * fraction), + startValue.latitude() + ((endValue.latitude() - startValue.latitude()) * fraction) + ); + } + } + + private Animator createLatLngAnimator(Point currentPosition, Point targetPosition) { + ValueAnimator latLngAnimator = ValueAnimator.ofObject(new PointEvaluator(), currentPosition, targetPosition); + latLngAnimator.setDuration((long) TurfMeasurement.distance(currentPosition, targetPosition, "meters")); + latLngAnimator.setInterpolator(new LinearInterpolator()); + latLngAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + animate(); + } + }); + latLngAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + Point point = (Point) animation.getAnimatedValue(); + pointSource.setGeoJson(point); + markerLinePointList.add(point); + lineSource.setGeoJson(Feature.fromGeometry(LineString.fromLngLats(markerLinePointList))); + } + }); + + return latLngAnimator; + } + + /** + * Make a request to the Mapbox Directions API. Once successful, pass the route to the + * route layer. + * + * @param origin the starting point of the route + * @param destination the desired finish point of the route + */ + private void getRoute(@NonNull final Style style, final Point origin, final Point destination) { + MapboxDirections client = MapboxDirections.builder() + .origin(origin) + .destination(destination) + .overview(DirectionsCriteria.OVERVIEW_FULL) + .profile(DirectionsCriteria.PROFILE_WALKING) + .accessToken(getString(R.string.access_token)) + .build(); + + client.enqueueCall(new Callback() { + @Override + public void onResponse(Call call, Response response) { + System.out.println(call.request().url().toString()); + + // You can get the generic HTTP info about the response + Timber.d("Response code: %s", response.code()); + if (response.body() == null) { + Timber.e("No routes found, make sure you set the right user and access token."); + return; + } else if (response.body().routes().size() < 1) { + Timber.e("No routes found"); + return; + } + + // Get the directions route + DirectionsRoute currentRoute = response.body().routes().get(0); + + if (style.isFullyLoaded()) { + mapboxMap.easeCamera(CameraUpdateFactory.newLatLngBounds( + new LatLngBounds.Builder() + .include(new LatLng(origin.latitude(), origin.longitude())) + .include(new LatLng(destination.latitude(), destination.longitude())) + .build(), 50), 5000); + + initData(style,FeatureCollection.fromFeature( + Feature.fromGeometry(LineString.fromPolyline(currentRoute.geometry(), PRECISION_6)))); + } + } + + @Override + public void onFailure(Call call, Throwable throwable) { + Timber.e("Error: %s", throwable.getMessage()); + Toast.makeText(MovingIconWithTrailingLineActivity.this, "Error: " + throwable.getMessage(), + Toast.LENGTH_SHORT).show(); + } + }); + } + + /** + * Add various sources to the map. + */ + private void initSources(@NonNull Style loadedMapStyle, @NonNull FeatureCollection featureCollection) { + loadedMapStyle.addSource(pointSource = new GeoJsonSource(DOT_SOURCE_ID, featureCollection)); + loadedMapStyle.addSource(lineSource = new GeoJsonSource(LINE_SOURCE_ID)); + } + + /** + * Add the marker icon SymbolLayer. + */ + private void initSymbolLayer(@NonNull Style loadedMapStyle) { + loadedMapStyle.addImage("moving-red-marker", BitmapFactory.decodeResource( + getResources(), R.drawable.pink_dot)); + loadedMapStyle.addLayer(new SymbolLayer("symbol-layer-id", DOT_SOURCE_ID).withProperties( + iconImage("moving-red-marker"), + iconSize(1f), + iconOffset(new Float[] {5f, 0f}), + iconIgnorePlacement(true), + iconAllowOverlap(true) + )); + } + + /** + * Add the LineLayer for the marker icon's travel route. Adding it under the "road-label" layer, so that the + * this LineLayer doesn't block the street name. + */ + private void initDotLinePath(@NonNull Style loadedMapStyle) { + loadedMapStyle.addLayerBelow(new LineLayer("line-layer-id", LINE_SOURCE_ID).withProperties( + lineColor(Color.parseColor("#F13C6E")), + lineCap(Property.LINE_CAP_ROUND), + lineJoin(Property.LINE_JOIN_ROUND), + lineWidth(4f)), "road-label"); + } + + @Override + public void onResume() { + super.onResume(); + mapView.onResume(); + } + + @Override + protected void onStart() { + super.onStart(); + mapView.onStart(); + } + + @Override + protected void onStop() { + super.onStop(); + mapView.onStop(); + } + + @Override + public void onPause() { + super.onPause(); + mapView.onPause(); + } + + @Override + public void onLowMemory() { + super.onLowMemory(); + mapView.onLowMemory(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (currentAnimator != null) { + currentAnimator.cancel(); + } + mapView.onDestroy(); + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + mapView.onSaveInstanceState(outState); + } +} + diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_moving_icon_with_trailing_line.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_moving_icon_with_trailing_line.xml new file mode 100644 index 000000000..434561717 --- /dev/null +++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_moving_icon_with_trailing_line.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/values/descriptions_strings.xml b/MapboxAndroidDemo/src/main/res/values/descriptions_strings.xml index 11b291d9c..639ba2e92 100644 --- a/MapboxAndroidDemo/src/main/res/values/descriptions_strings.xml +++ b/MapboxAndroidDemo/src/main/res/values/descriptions_strings.xml @@ -117,7 +117,8 @@ Show a smaller inset map fragment and link it to a larger map for two map interaction. Great for gaming! Show an animated image (GIF) anywhere on the map Rather than showing the directions route all at once, have it "snake" from the origin to destination. - Show a dotted directions route to a location that\'s based on map movement. + Draw a vector polygon with holes on a map using the Mapbox Maps SDK. + Draw a line behind a moving SymbolLayer icon which moves along a Mapbox Directions API route. Show calendar event locations on the map. Combine two maps for a magic window effect Add a gradient on top of a MapView to show a background fog effect. diff --git a/MapboxAndroidDemo/src/main/res/values/titles_strings.xml b/MapboxAndroidDemo/src/main/res/values/titles_strings.xml index 1c0a94271..17b4a7676 100644 --- a/MapboxAndroidDemo/src/main/res/values/titles_strings.xml +++ b/MapboxAndroidDemo/src/main/res/values/titles_strings.xml @@ -114,6 +114,7 @@ Inset map Animated image source (GIF) Snaking directions + Line behind moving icon Directions to selected location Calendar integration Magic Window diff --git a/MapboxAndroidDemo/src/main/res/values/urls_strings.xml b/MapboxAndroidDemo/src/main/res/values/urls_strings.xml index c978165fc..38e0e8798 100644 --- a/MapboxAndroidDemo/src/main/res/values/urls_strings.xml +++ b/MapboxAndroidDemo/src/main/res/values/urls_strings.xml @@ -117,6 +117,7 @@ https://i.imgur.com/jp4wc24.png https://i.imgur.com/3d810QI.png https://i.imgur.com/6jWEFJi.png + https://i.imgur.com/jyrQn10.png https://i.imgur.com/0dpCI14.png https://i.imgur.com/M8TU7nH.png https://i.imgur.com/Nw78ZrV.png