diff options
| -rw-r--r-- | android/cpp/jni.cpp | 14 | ||||
| -rw-r--r-- | android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java | 4 | ||||
| -rw-r--r-- | gyp/platform-ios.gypi | 3 | ||||
| -rw-r--r-- | platform/ios/resources/Compass@2x.png | bin | 2376 -> 1300 bytes | |||
| -rw-r--r-- | platform/ios/resources/Compass@3x.png | bin | 2540 -> 2514 bytes | |||
| -rw-r--r-- | platform/ios/resources/README | 5 | ||||
| -rw-r--r-- | platform/ios/resources/mapbox.png | bin | 1958 -> 1085 bytes | |||
| -rw-r--r-- | platform/ios/resources/mapbox@2x.png | bin | 4492 -> 2180 bytes | |||
| -rw-r--r-- | platform/ios/resources/mapbox@3x.png | bin | 7059 -> 3293 bytes | |||
| m--------- | src/mbgl/util/geojsonvt | 0 |
10 files changed, 22 insertions, 4 deletions
diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp index e077e318a4..b3e9edd044 100644 --- a/android/cpp/jni.cpp +++ b/android/cpp/jni.cpp @@ -979,7 +979,7 @@ void JNICALL nativeRemoveAnnotations(JNIEnv *env, jobject obj, jlong nativeMapVi jlongArray JNICALL nativeGetAnnotationsInBounds(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jobject bbox) { mbgl::Log::Debug(mbgl::Event::JNI, "nativeGetAnnotationsInBounds"); - assert(nativeMapViewPtr != 0); + assert(nativeMapViewPtr != 0); NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr); if (env->ExceptionCheck() || (bbox == nullptr)) { @@ -1731,6 +1731,8 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { bboxClass = reinterpret_cast<jclass>(env->NewGlobalRef(bboxClass)); if (bboxClass == nullptr) { env->ExceptionDescribe(); + env->DeleteGlobalRef(latLngClass); + env->DeleteGlobalRef(latLngZoomClass); env->DeleteGlobalRef(bboxClass); return JNI_ERR; } @@ -1740,6 +1742,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); return JNI_ERR; } @@ -1748,6 +1751,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); return JNI_ERR; } @@ -1757,6 +1761,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); return JNI_ERR; @@ -1767,6 +1772,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); @@ -1779,6 +1785,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); @@ -1791,6 +1798,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); @@ -1804,6 +1812,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); @@ -1819,6 +1828,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); env->DeleteGlobalRef(runtimeExceptionClass); @@ -1834,6 +1844,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); env->DeleteGlobalRef(runtimeExceptionClass); @@ -1849,6 +1860,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); env->DeleteGlobalRef(runtimeExceptionClass); diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java index a367195920..301463c9b7 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java @@ -200,15 +200,15 @@ public class MapView extends FrameLayout implements LocationListener { public MapView(Context context, @NonNull String accessToken) { super(context); - setAccessToken(accessToken); initialize(context, null); + setAccessToken(accessToken); } public MapView(Context context, @NonNull String accessToken, String styleUrl) { super(context); + initialize(context, null); setAccessToken(accessToken); setStyleUrl(styleUrl); - initialize(context, null); } // Called when properties are being set from XML diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 0f709d6949..516d5e8322 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -61,6 +61,7 @@ '../platform/ios/NSString+MGLAdditions.m', '../platform/ios/vendor/SMCalloutView/SMCalloutView.h', '../platform/ios/vendor/SMCalloutView/SMCalloutView.m', + '../platform/ios/resources/', ], 'variables': { @@ -105,7 +106,7 @@ '../include', ], 'mac_bundle_resources': [ - '<!@(find ./platform/ios/resources -type f)', + '<!@(find ./platform/ios/resources -type f \! -name "README")', ], }, }, diff --git a/platform/ios/resources/Compass@2x.png b/platform/ios/resources/Compass@2x.png Binary files differindex 58e7e08d24..2bd8a286da 100644 --- a/platform/ios/resources/Compass@2x.png +++ b/platform/ios/resources/Compass@2x.png diff --git a/platform/ios/resources/Compass@3x.png b/platform/ios/resources/Compass@3x.png Binary files differindex 470cd3d087..9308a46a51 100644 --- a/platform/ios/resources/Compass@3x.png +++ b/platform/ios/resources/Compass@3x.png diff --git a/platform/ios/resources/README b/platform/ios/resources/README new file mode 100644 index 0000000000..34dedaeb0c --- /dev/null +++ b/platform/ios/resources/README @@ -0,0 +1,5 @@ +When adding new image resources, make sure that you've reduced the file size as much as possible using a tool such as: + +ImageOptim — https://imageoptim.com + +See also: https://github.com/mapbox/mapbox-gl-native/pull/2227
\ No newline at end of file diff --git a/platform/ios/resources/mapbox.png b/platform/ios/resources/mapbox.png Binary files differindex 5a9da3fe39..533ad9f723 100644 --- a/platform/ios/resources/mapbox.png +++ b/platform/ios/resources/mapbox.png diff --git a/platform/ios/resources/mapbox@2x.png b/platform/ios/resources/mapbox@2x.png Binary files differindex 194aa64da2..51ad74adcb 100644 --- a/platform/ios/resources/mapbox@2x.png +++ b/platform/ios/resources/mapbox@2x.png diff --git a/platform/ios/resources/mapbox@3x.png b/platform/ios/resources/mapbox@3x.png Binary files differindex d1260a16f3..1fb83c149b 100644 --- a/platform/ios/resources/mapbox@3x.png +++ b/platform/ios/resources/mapbox@3x.png diff --git a/src/mbgl/util/geojsonvt b/src/mbgl/util/geojsonvt -Subproject ed99a6290fa42107a982e7f3675aae49d29026b +Subproject 995ffc72c556da4b4880a6036fbcf7159fc5ecc |
