tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - throw exception when another style is loading, correct RuntimeStyleTest when removing layer at, add javadoc to isFullyLoaded

Browse Source
This commit is contained in:
tobrun
2018-12-10 12:02:54 +01:00
committed by Tobrun
parent aa9e6c59bb
commit a018c0f7b5
3 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
View File

@@ -916,7 +916,7 @@ public final class LocationComponent {
}
if (!style.isFullyLoaded()) {
throw new IllegalStateException("Style hasn't fully loaded yet, can't initialize LocationComponent.");
throw new IllegalStateException("Style is invalid, provide the most recently loaded one.");
}
this.style = style;

46
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
View File

@@ -103,8 +103,9 @@ public class Style {
*/
public void addSource(@NonNull Source source) {
if (!fullyLoaded) {
// we are loading a new style
return;
throw new IllegalStateException(
"Calling addSource on old Style instance, use the more recently loaded Style instead."
);
}
sources.put(source.getId(), source);
@@ -195,8 +196,9 @@ public class Style {
*/
public void addLayer(@NonNull Layer layer) {
if (!fullyLoaded) {
// we are loading a new style
return;
throw new IllegalStateException(
"Calling addLayer on old Style instance, use the more recently loaded Style instead."
);
}
layers.put(layer.getId(), layer);
@@ -211,8 +213,9 @@ public class Style {
*/
public void addLayerBelow(@NonNull Layer layer, @NonNull String below) {
if (!fullyLoaded) {
// we are loading a new style
return;
throw new IllegalStateException(
"Calling addLayerBelow on old Style instance, use the more recently loaded Style instead."
);
}
layers.put(layer.getId(), layer);
@@ -227,8 +230,9 @@ public class Style {
*/
public void addLayerAbove(@NonNull Layer layer, @NonNull String above) {
if (!fullyLoaded) {
// we are loading a new style
return;
throw new IllegalStateException(
"Calling addLayerAbove on old Style instance, use the more recently loaded Style instead."
);
}
layers.put(layer.getId(), layer);
@@ -244,8 +248,9 @@ public class Style {
*/
public void addLayerAt(@NonNull Layer layer, @IntRange(from = 0) int index) {
if (!fullyLoaded) {
// we are loading a new style
return;
throw new IllegalStateException(
"Calling addLayerAt on old Style instance, use the more recently loaded Style instead."
);
}
layers.put(layer.getId(), layer);
@@ -368,8 +373,9 @@ public class Style {
*/
public void addImage(@NonNull String name, @NonNull Bitmap image, boolean sdf) {
if (!fullyLoaded) {
// we are loading a new style
return;
throw new IllegalStateException(
"Calling addImage on old Style instance, use the more recently loaded Style instead."
);
}
nativeMapView.addImage(name, image, sdf);
@@ -380,8 +386,9 @@ public class Style {
*/
public void addImages(@NonNull HashMap<String, Bitmap> images) {
if (!fullyLoaded) {
// we are loading a new style
return;
throw new IllegalStateException(
"Calling addImages on old Style instance, use the more recently loaded Style instead."
);
}
nativeMapView.addImages(images);
@@ -431,8 +438,9 @@ public class Style {
*/
public void setTransition(@NonNull TransitionOptions transitionOptions) {
if (!fullyLoaded) {
// we are loading a new style
return;
throw new IllegalStateException(
"Calling setTransition on old Style instance, use the more recently loaded Style instead."
);
}
nativeMapView.setTransitionDuration(transitionOptions.getDuration());
@@ -541,6 +549,12 @@ public class Style {
}
}
/**
* Returns true if the style is fully loaded. Returns false if style hasn't been fully loaded or a new style is
* underway of being loaded.
*
* @return True if fully loaded, false otherwise
*/
public boolean isFullyLoaded() {
return fullyLoaded;
}