From 2569837a9e13cfec4d5aaaae0aa53e2aefd5204b Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 28 May 2020 12:51:16 -0700 Subject: [PATCH 1/3] use default marker icon --- .../examples/styles/BasicSymbolLayerActivity.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java index ffdeb5af0..6df1201c5 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java @@ -23,7 +23,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; /** * Display {@link SymbolLayer} icons on the map. @@ -67,7 +66,7 @@ public void onMapReady(@NonNull final MapboxMap mapboxMap) { // Add the SymbolLayer icon image to the map style .withImage(ICON_ID, BitmapFactory.decodeResource( - BasicSymbolLayerActivity.this.getResources(), R.drawable.red_marker)) + BasicSymbolLayerActivity.this.getResources(), R.drawable.mapbox_marker_icon_default)) // Adding a GeoJson source for the SymbolLayer icons. .withSource(new GeoJsonSource(SOURCE_ID, @@ -82,7 +81,6 @@ public void onMapReady(@NonNull final MapboxMap mapboxMap) { iconImage(ICON_ID), iconAllowOverlap(true), iconIgnorePlacement(true), - iconOffset(new Float[] {0f, -9f})) ), new Style.OnStyleLoaded() { @Override public void onStyleLoaded(@NonNull Style style) { From f8bbd9a8aa55bd591c0b8d5102b4ce40133f6403 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 28 May 2020 12:58:31 -0700 Subject: [PATCH 2/3] clean up --- .../examples/styles/BasicSymbolLayerActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java index 6df1201c5..f27e0af5f 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java @@ -80,7 +80,7 @@ public void onMapReady(@NonNull final MapboxMap mapboxMap) { .withProperties( iconImage(ICON_ID), iconAllowOverlap(true), - iconIgnorePlacement(true), + iconIgnorePlacement(true) ), new Style.OnStyleLoaded() { @Override public void onStyleLoaded(@NonNull Style style) { From 46cb662d008340f82b1463cc79b6f30040f122dd Mon Sep 17 00:00:00 2001 From: colleenmcginnis Date: Thu, 28 May 2020 14:23:12 -0700 Subject: [PATCH 3/3] add missing ) --- .../examples/styles/BasicSymbolLayerActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java index f27e0af5f..dd21bbac1 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java @@ -81,6 +81,7 @@ public void onMapReady(@NonNull final MapboxMap mapboxMap) { iconImage(ICON_ID), iconAllowOverlap(true), iconIgnorePlacement(true) + ) ), new Style.OnStyleLoaded() { @Override public void onStyleLoaded(@NonNull Style style) {