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

Handle style builder exceptions (#3855)

Browse Source
This commit is contained in:
Adrian Cojocaru
2025-10-03 01:16:10 +03:00
committed by GitHub
parent 02b6988001
commit e64c3280a6
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Style.java
View File

@@ -12,9 +12,12 @@ import androidx.annotation.Nullable;
import org.maplibre.android.MapLibre;
import org.maplibre.android.constants.MapLibreConstants;
import org.maplibre.android.log.Logger;
import org.maplibre.android.style.layers.CannotAddLayerException;
import org.maplibre.android.style.layers.Layer;
import org.maplibre.android.style.layers.TransitionOptions;
import org.maplibre.android.style.light.Light;
import org.maplibre.android.style.sources.CannotAddSourceException;
import org.maplibre.android.style.sources.Source;
import org.maplibre.android.util.DefaultStyle;
import org.maplibre.android.utils.BitmapUtils;
@@ -38,6 +41,7 @@ import java.util.Map;
@SuppressWarnings("unchecked")
public class Style {
protected static final String TAG = "Style";
static final String EMPTY_JSON = "{\"version\": 8,\"sources\": {},\"layers\": []}";
private final NativeMap nativeMap;
@@ -735,20 +739,28 @@ public class Style {
if (!fullyLoaded) {
fullyLoaded = true;
for (Source source : builder.sources) {
addSource(source);
try {
addSource(source);
} catch (CannotAddSourceException exception) {
Logger.e(TAG, "Failed to add source", exception);
}
}
for (Builder.LayerWrapper layerWrapper : builder.layers) {
if (layerWrapper instanceof Builder.LayerAtWrapper) {
addLayerAt(layerWrapper.layer, ((Builder.LayerAtWrapper) layerWrapper).index);
} else if (layerWrapper instanceof Builder.LayerAboveWrapper) {
addLayerAbove(layerWrapper.layer, ((Builder.LayerAboveWrapper) layerWrapper).aboveLayer);
} else if (layerWrapper instanceof Builder.LayerBelowWrapper) {
addLayerBelow(layerWrapper.layer, ((Builder.LayerBelowWrapper) layerWrapper).belowLayer);
} else {
// just add layer to map, but below annotations
addLayerBelow(layerWrapper.layer, MapLibreConstants.LAYER_ID_ANNOTATIONS);
try {
for (Builder.LayerWrapper layerWrapper : builder.layers) {
if (layerWrapper instanceof Builder.LayerAtWrapper) {
addLayerAt(layerWrapper.layer, ((Builder.LayerAtWrapper) layerWrapper).index);
} else if (layerWrapper instanceof Builder.LayerAboveWrapper) {
addLayerAbove(layerWrapper.layer, ((Builder.LayerAboveWrapper) layerWrapper).aboveLayer);
} else if (layerWrapper instanceof Builder.LayerBelowWrapper) {
addLayerBelow(layerWrapper.layer, ((Builder.LayerBelowWrapper) layerWrapper).belowLayer);
} else {
// just add layer to map, but below annotations
addLayerBelow(layerWrapper.layer, MapLibreConstants.LAYER_ID_ANNOTATIONS);
}
}
} catch (CannotAddLayerException exception) {
Logger.e(TAG, "Failed to add layer", exception);
}
for (Builder.ImageWrapper image : builder.images) {