diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation')
5 files changed, 21 insertions, 12 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java index 9c0715888a..7e442aa802 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java @@ -77,6 +77,7 @@ public class AnimatedSymbolLayerActivity extends AppCompatActivity { mapView.getMapAsync(map -> { this.mapboxMap = map; map.setStyle(Style.MAPBOX_STREETS, style -> { + this.style = style; setupCars(); animateRandomRoutes(); animateTaxi(); @@ -184,7 +185,7 @@ public class AnimatedSymbolLayerActivity extends AppCompatActivity { } private void updatePassengerSource() { - GeoJsonSource source = mapboxMap.getStyle().getSourceAs(PASSENGER_SOURCE); + GeoJsonSource source = style.getSourceAs(PASSENGER_SOURCE); FeatureCollection featureCollection = FeatureCollection.fromFeatures(new Feature[] { Feature.fromGeometry( Point.fromLngLat( @@ -261,7 +262,7 @@ public class AnimatedSymbolLayerActivity extends AppCompatActivity { randomCarSource = new GeoJsonSource(RANDOM_CAR_SOURCE, featuresFromRoutes()); style.addSource(randomCarSource); - mapboxMap.getStyle().addImage(RANDOM_CAR_IMAGE_ID, + style.addImage(RANDOM_CAR_IMAGE_ID, ((BitmapDrawable) getResources().getDrawable(R.drawable.ic_car_top)).getBitmap()); SymbolLayer symbolLayer = new SymbolLayer(RANDOM_CAR_LAYER, RANDOM_CAR_SOURCE); @@ -286,7 +287,7 @@ public class AnimatedSymbolLayerActivity extends AppCompatActivity { ) }); - mapboxMap.getStyle().addImage(PASSENGER, + style.addImage(PASSENGER, ((BitmapDrawable) getResources().getDrawable(R.drawable.icon_burned)).getBitmap()); GeoJsonSource geoJsonSource = new GeoJsonSource(PASSENGER_SOURCE, featureCollection); @@ -312,7 +313,7 @@ public class AnimatedSymbolLayerActivity extends AppCompatActivity { FeatureCollection featureCollection = FeatureCollection.fromFeatures(new Feature[] {feature}); taxi = new Car(feature, passenger, getDuration()); - mapboxMap.getStyle().addImage(TAXI, + style.addImage(TAXI, ((BitmapDrawable) getResources().getDrawable(R.drawable.ic_taxi_top)).getBitmap()); taxiSource = new GeoJsonSource(TAXI_SOURCE, featureCollection); style.addSource(taxiSource); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java index 1c798b1d7a..05337081dc 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java @@ -11,13 +11,14 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Spinner; - import com.mapbox.mapboxsdk.annotations.MarkerOptions; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.testapp.R; import com.mapbox.mapboxsdk.testapp.utils.GeoParseUtil; +import timber.log.Timber; import java.io.IOException; import java.lang.ref.WeakReference; @@ -26,8 +27,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import timber.log.Timber; - /** * Test activity showcasing adding a large amount of Markers. */ @@ -43,9 +42,14 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView super.onCreate(savedInstanceState); setContentView(R.layout.activity_marker_bulk); - mapView = (MapView) findViewById(R.id.mapView); + mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); - mapView.getMapAsync(mapboxMap -> BulkMarkerActivity.this.mapboxMap = mapboxMap); + mapView.getMapAsync(this::initMap); + } + + private void initMap(MapboxMap mapboxMap) { + this.mapboxMap = mapboxMap; + mapboxMap.setStyle(Style.MAPBOX_STREETS); } @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java index 0ca56da4f4..fe71020eb2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java @@ -58,7 +58,6 @@ public class PolygonActivity extends AppCompatActivity implements OnMapReadyCall MapboxMapOptions options = new MapboxMapOptions() .attributionTintColor(RED_COLOR) .compassFadesWhenFacingNorth(false) - .styleUrl(Style.MAPBOX_STREETS) .camera(new CameraPosition.Builder() .target(new LatLng(45.520486, -122.673541)) .zoom(12) @@ -77,6 +76,7 @@ public class PolygonActivity extends AppCompatActivity implements OnMapReadyCall @Override public void onMapReady(@NonNull MapboxMap map) { mapboxMap = map; + map.setStyle(Style.MAPBOX_STREETS); map.setOnPolygonClickListener(polygon -> Toast.makeText( PolygonActivity.this, diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java index 28a89f4b42..855b686691 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java @@ -13,6 +13,7 @@ import com.mapbox.mapboxsdk.annotations.PolylineOptions; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.testapp.R; import java.util.ArrayList; @@ -61,11 +62,11 @@ public class PolylineActivity extends AppCompatActivity { polylineOptions.addAll(getAllPolylines()); } - mapView = (MapView) findViewById(R.id.mapView); + mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); mapView.getMapAsync(mapboxMap -> { PolylineActivity.this.mapboxMap = mapboxMap; - + mapboxMap.setStyle(Style.SATELLITE_STREETS); mapboxMap.setOnPolylineClickListener(polyline -> Toast.makeText( PolylineActivity.this, "You clicked on polyline with id = " + polyline.getId(), diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java index 62179f151c..5bd59507a9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java @@ -11,6 +11,7 @@ import com.mapbox.mapboxsdk.annotations.MarkerOptions; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.testapp.R; import java.text.DecimalFormat; @@ -53,6 +54,8 @@ public class PressForMarkerActivity extends AppCompatActivity { return false; }); + mapboxMap.setStyle(Style.MAPBOX_STREETS); + if (savedInstanceState != null) { markerList = savedInstanceState.getParcelableArrayList(STATE_MARKER_LIST); if (markerList != null) { |