Skip to content

fix source missing when styles reloaded #483

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 3 commits into from
May 9, 2018
Merged

fix source missing when styles reloaded #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88e7751
Initial fix for source not being added
May 4, 2018
3809db8
Fix test to detect issues in future
May 4, 2018
b35e08b
revert #476
May 7, 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
42 changes: 20 additions & 22 deletions app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@ import android.support.test.rule.GrantPermissionRule
import android.support.test.rule.GrantPermissionRule.grant
import android.support.test.runner.AndroidJUnit4
import com.mapbox.mapboxsdk.constants.Style
import com.mapbox.mapboxsdk.maps.MapView
import com.mapbox.mapboxsdk.maps.MapboxMap
import com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.*
import com.mapbox.mapboxsdk.plugins.locationlayer.modes.RenderMode
import com.mapbox.mapboxsdk.plugins.testapp.R
import com.mapbox.mapboxsdk.plugins.testapp.activity.location.LocationLayerModesActivity
import com.mapbox.mapboxsdk.style.layers.CircleLayer
import com.mapbox.mapboxsdk.style.layers.Property
import com.mapbox.mapboxsdk.style.layers.SymbolLayer
import com.mapbox.mapboxsdk.style.sources.GeoJsonSource
import com.mapbox.mapboxsdk.utils.GenericPluginAction
import com.mapbox.mapboxsdk.utils.OnMapReadyIdlingResource
import org.hamcrest.CoreMatchers.`is`
Expand Down Expand Up @@ -169,27 +168,26 @@ class LocationLayerTest {
uiController: UiController, context: Context) {
plugin?.renderMode = RenderMode.NORMAL
assertThat(mapboxMap?.getLayer(FOREGROUND_LAYER), notNullValue())

// Add map change listener
val mapView: MapView? = rule.activity.findViewById(R.id.map_view)
mapView?.addOnMapChangedListener {
if (it == MapView.DID_FINISH_LOADING_STYLE) {
assertThat(plugin?.renderMode, `is`(equalTo(RenderMode.NORMAL)))
// Check that all layers visibilities are set to none
val foregroundLayer: SymbolLayer? = mapboxMap?.getLayerAs(FOREGROUND_LAYER)
val backgroundLayer: SymbolLayer? = mapboxMap?.getLayerAs(BACKGROUND_LAYER)
val shadowLayer: SymbolLayer? = mapboxMap?.getLayerAs(SHADOW_LAYER)
val accuracyLayer: SymbolLayer? = mapboxMap?.getLayerAs(ACCURACY_LAYER)
val bearingLayer: SymbolLayer? = mapboxMap?.getLayerAs(BEARING_LAYER)

assertThat(foregroundLayer?.visibility?.value, `is`(equalTo(Property.VISIBLE)))
assertThat(backgroundLayer?.visibility?.value, `is`(equalTo(Property.VISIBLE)))
assertThat(shadowLayer?.visibility?.value, `is`(equalTo(Property.VISIBLE)))
assertThat(accuracyLayer?.visibility?.value, `is`(equalTo(Property.VISIBLE)))
assertThat(bearingLayer?.visibility?.value, `is`(equalTo(Property.VISIBLE)))
}
}
mapboxMap?.setStyleUrl(Style.SATELLITE)

uiController.loopMainThreadForAtLeast(500)

assertThat(plugin?.renderMode, `is`(equalTo(RenderMode.NORMAL)))

// Check that the Source has been re-added to the new map style
val source: GeoJsonSource? = mapboxMap?.getSourceAs(LOCATION_SOURCE)
assertThat(source, notNullValue())

// Check that all layers visibilities are set to none
val foregroundLayer: SymbolLayer? = mapboxMap?.getLayerAs(FOREGROUND_LAYER)
val backgroundLayer: SymbolLayer? = mapboxMap?.getLayerAs(BACKGROUND_LAYER)
val shadowLayer: SymbolLayer? = mapboxMap?.getLayerAs(SHADOW_LAYER)
val accuracyLayer: CircleLayer? = mapboxMap?.getLayerAs(ACCURACY_LAYER)

assertThat(foregroundLayer?.visibility?.value, `is`(equalTo(Property.VISIBLE)))
assertThat(backgroundLayer?.visibility?.value, `is`(equalTo(Property.VISIBLE)))
assertThat(shadowLayer?.visibility?.value, `is`(equalTo(Property.VISIBLE)))
assertThat(accuracyLayer?.visibility?.value, `is`(equalTo(Property.VISIBLE)))
}
}
executePluginTest(pluginAction)
Expand Down
1 change: 1 addition & 0 deletions ...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 @@ -99,6 +99,7 @@ final class LocationLayer implements LocationLayerAnimator.OnLayerAnimationsValu

void initializeComponents(LocationLayerOptions options) {
prepareLocationSource();
addLocationSource();
addLayers();
applyStyle(options);
}
Expand Down