Skip to content

Fix accuracy circle color not being set correctly #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cammace merged 2 commits into from
May 22, 2018
Merged

Fix accuracy circle color not being set correctly #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad263e0
Add test to reproduce issue
May 21, 2018
f813dcd
Store as string rather than an int
May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions ...androidTest/java/com/mapbox/mapboxsdk/plugins/locationlayer/IsolatedActivityPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.plugins.locationlayer
import android.Manifest
import android.R
import android.content.Context
import android.graphics.Color
import android.location.Location
import android.support.test.espresso.Espresso
import android.support.test.espresso.IdlingRegistry
Expand Down Expand Up @@ -160,6 +161,34 @@ class IsolatedActivityPluginTest {
executePluginTest(pluginAction)
}

@Test
fun locationLayerOptions_accuracyRingShownUsingTheSetColor() {
val pluginAction = object : GenericPluginAction.OnPerformGenericPluginAction<LocationLayerPlugin> {
override fun onGenericPluginAction(plugin: LocationLayerPlugin?, mapboxMap: MapboxMap?,
uiController: UiController, context: Context) {
mapView = fragment?.view as MapView?
LocationLayerPlugin(mapView!!, mapboxMap!!, null).apply {
renderMode = RenderMode.NORMAL
}

uiController.loopMainThreadForAtLeast(500)

val color = Color.parseColor("#4A90E2")

// Check that the source property changes correctly
val source: GeoJsonSource? = mapboxMap.getSourceAs(LOCATION_SOURCE)
source?.querySourceFeatures(null)?.forEach {
assertThat(it.getNumberProperty(PROPERTY_ACCURACY_COLOR).toInt(), `is`(equalTo(color)))
}

// Check that the layer shows the correct color
val layer: CircleLayer? = mapboxMap.getLayerAs(ACCURACY_LAYER)
assertThat(layer?.circleColor?.colorInt, `is`(equalTo(color)))
}
}
executePluginTest(pluginAction)
}

@After
fun afterTest() {
Timber.e("@After: unregister idle resource")
Expand Down
3 changes: 2 additions & 1 deletion ...locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circlePitchAlignment;
import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleRadius;
import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleStrokeColor;
import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.colorToRgbaString;
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;
Expand Down Expand Up @@ -357,7 +358,7 @@ private void styleBearing(LocationLayerOptions options) {

private void styleAccuracy(float accuracyAlpha, @ColorInt int accuracyColor) {
locationFeature.addNumberProperty(PROPERTY_ACCURACY_ALPHA, accuracyAlpha);
locationFeature.addNumberProperty(PROPERTY_ACCURACY_COLOR, accuracyColor);
locationFeature.addStringProperty(PROPERTY_ACCURACY_COLOR, colorToRgbaString(accuracyColor));
refreshSource();
}

Expand Down