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

[android] remove source returns reference

Browse Source
This commit is contained in:
Ivo van Dongen
2017-02-24 16:35:27 +02:00
committed by Ivo van Dongen
parent fedb21e35b
commit 3040d40772
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
View File

@@ -350,20 +350,24 @@ public final class MapboxMap {
* Removes the source. Any references to the source become invalid and should not be used anymore
*
* @param sourceId the source to remove
* @return the source handle or null if the source was not present
*/
@UiThread
public void removeSource(@NonNull String sourceId) {
nativeMapView.removeSource(sourceId);
@Nullable
public Source removeSource(@NonNull String sourceId) {
return nativeMapView.removeSource(sourceId);
}
/**
* Removes the source, preserving the reverence for re-use
*
* @param source the source to remove
* @return the source
*/
@UiThread
public void removeSource(@NonNull Source source) {
nativeMapView.removeSource(source);
@Nullable
public Source removeSource(@NonNull Source source) {
return nativeMapView.removeSource(source);
}
/**

14
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
View File

@@ -806,18 +806,20 @@ final class NativeMapView {
nativeAddSource(source.getNativePtr());
}
public void removeSource(@NonNull String sourceId) {
@Nullable
public Source removeSource(@NonNull String sourceId) {
if (isDestroyedOn("removeSource")) {
return;
return null;
}
nativeRemoveSourceById(sourceId);
return nativeRemoveSourceById(sourceId);
}
public void removeSource(@NonNull Source source) {
public Source removeSource(@NonNull Source source) {
if (isDestroyedOn("removeSource")) {
return;
return null;
}
nativeRemoveSource(source.getNativePtr());
return source;
}
public void addImage(@NonNull String name, @NonNull Bitmap image) {
@@ -1087,7 +1089,7 @@ final class NativeMapView {
private native void nativeAddSource(long nativeSourcePtr) throws CannotAddSourceException;
private native void nativeRemoveSourceById(String sourceId);
private native Source nativeRemoveSourceById(String sourceId);
private native void nativeRemoveSource(long sourcePtr);