diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-08-07 10:11:13 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2017-08-10 13:27:17 +0200 |
commit | 1300e89c0b431951f27dc14fcdf3c57ea15735bb (patch) | |
tree | cfa329f4f21c92a15ada7e56a136bc425be8753d /platform/android/MapboxGLAndroidSDK/src/main | |
parent | 688431c663161b992bbf2af24477dfdfc4b9bb64 (diff) | |
download | qtlocation-mapboxgl-1300e89c0b431951f27dc14fcdf3c57ea15735bb.tar.gz |
[android] - expose setStyleJson and getStyleJson
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main')
2 files changed, 23 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 5745717324..cfe042d1f9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -581,7 +581,7 @@ public class MapView extends FrameLayout { try { onMapChangedListener.onMapChanged(rawChange); } catch (RuntimeException err) { - Timber.e("Exception (%s) in MapView.OnMapChangedListener: %s", err.getClass(), err.getMessage()); + Timber.e(err, "Exception in MapView.OnMapChangedListener"); } } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index d99b5646dd..cbb1d47b14 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -1088,7 +1088,7 @@ public final class MapboxMap { } /** - * Returns the map style currently displayed in the map view. + * Returns the map style url currently displayed in the map view. * * @return The URL of the map style */ @@ -1097,6 +1097,27 @@ public final class MapboxMap { return nativeMapView.getStyleUrl(); } + /** + * Loads a new map style from a json string. + * <p> + * If the style fails to load or an invalid style URL is set, the map view will become blank. + * An error message will be logged in the Android logcat and {@link MapView#DID_FAIL_LOADING_MAP} event will be + * sent. + * </p> + */ + public void setStyleJson(@NonNull String styleJson) { + nativeMapView.setStyleJson(styleJson); + } + + /** + * Returns the map style json currently displayed in the map view. + * + * @return The json of the map style + */ + public String getStyleJson() { + return nativeMapView.getStyleJson(); + } + // // Annotations // |