Merge branch 'master' into rclee-async-setupupstream/rclee-async-setup

9 files changed, 42 insertions, 41 deletions

diff --git a/platform/android/src/bitmap.cpp b/platform/android/src/bitmap.cpp
index 46e7253050..0d3670b666 100644
--- a/platform/android/src/bitmap.cpp
+++ b/platform/android/src/bitmap.cpp
@@ -1,6 +1,7 @@
 #include "bitmap.hpp"
 
 #include <android/bitmap.h>
+#include <mbgl/util/logging.hpp>
 
 namespace mbgl {
 namespace android {
@@ -17,7 +18,7 @@ public:
     ~PixelGuard() {
         const int result = AndroidBitmap_unlockPixels(&env, jni::Unwrap(*bitmap));
         if (result != ANDROID_BITMAP_RESULT_SUCCESS) {
-            throw std::runtime_error("bitmap decoding: could not unlock pixels");
+            Log::Warning(mbgl::Event::General, "Bitmap decoding: could not unlock pixels");
         }
     }
 
diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp
index d8d715dbd3..58a91f6cf0 100644
--- a/platform/android/src/file_source.cpp
+++ b/platform/android/src/file_source.cpp
@@ -83,6 +83,13 @@ void FileSource::pause(jni::JNIEnv&) {
     }
 }
 
+jni::jboolean FileSource::isResumed(jni::JNIEnv&) {
+    if (activationCounter) {
+       return  (jboolean) (activationCounter > 0);
+    }
+    return (jboolean) false;
+}
+
 jni::Class<FileSource> FileSource::javaClass;
 
 FileSource* FileSource::getNativePeer(jni::JNIEnv& env, jni::Object<FileSource> jFileSource) {
@@ -114,7 +121,8 @@ void FileSource::registerNative(jni::JNIEnv& env) {
         METHOD(&FileSource::setAPIBaseUrl, "setApiBaseUrl"),
         METHOD(&FileSource::setResourceTransform, "setResourceTransform"),
         METHOD(&FileSource::resume, "activate"),
-        METHOD(&FileSource::pause, "deactivate")
+        METHOD(&FileSource::pause, "deactivate"),
+        METHOD(&FileSource::isResumed, "isActivated")
     );
 }
 
diff --git a/platform/android/src/file_source.hpp b/platform/android/src/file_source.hpp
index 194f784622..e4295e1b84 100644
--- a/platform/android/src/file_source.hpp
+++ b/platform/android/src/file_source.hpp
@@ -45,6 +45,8 @@ public:
 
     void pause(jni::JNIEnv&);
 
+    jni::jboolean isResumed(jni::JNIEnv&);
+
     static jni::Class<FileSource> javaClass;
 
     static FileSource* getNativePeer(jni::JNIEnv&, jni::Object<FileSource>);
diff --git a/platform/android/src/geojson/point.cpp b/platform/android/src/geojson/point.cpp
index aa9dc1a7f6..8a9656ea14 100644
--- a/platform/android/src/geojson/point.cpp
+++ b/platform/android/src/geojson/point.cpp
@@ -59,4 +59,4 @@ jni::Class<Point> Point::javaClass;
 
 } // namespace geojson
 } // namespace android
-} // namespace mbgl
\ No newline at end of file
+} // namespace mbgl
diff --git a/platform/android/src/geometry/lat_lng_bounds.cpp b/platform/android/src/geometry/lat_lng_bounds.cpp
index ec1a32fed5..827ee52e95 100644
--- a/platform/android/src/geometry/lat_lng_bounds.cpp
+++ b/platform/android/src/geometry/lat_lng_bounds.cpp
@@ -9,14 +9,17 @@ jni::Object<LatLngBounds> LatLngBounds::New(jni::JNIEnv& env, mbgl::LatLngBounds
 }
 
 mbgl::LatLngBounds LatLngBounds::getLatLngBounds(jni::JNIEnv& env, jni::Object<LatLngBounds> bounds) {
-    static auto swLat = LatLngBounds::javaClass.GetField<jni::jdouble>(env, "latitudeSouth");
-    static auto swLon = LatLngBounds::javaClass.GetField<jni::jdouble>(env, "longitudeWest");
-    static auto neLat = LatLngBounds::javaClass.GetField<jni::jdouble>(env, "latitudeNorth");
-    static auto neLon = LatLngBounds::javaClass.GetField<jni::jdouble>(env, "longitudeEast");
-    return mbgl::LatLngBounds::hull(
-        { bounds.Get(env, swLat), bounds.Get(env, swLon) },
-        { bounds.Get(env, neLat), bounds.Get(env, neLon) }
-    );
+    static auto swLatField = LatLngBounds::javaClass.GetField<jni::jdouble>(env, "latitudeSouth");
+    static auto swLonField = LatLngBounds::javaClass.GetField<jni::jdouble>(env, "longitudeWest");
+    static auto neLatField = LatLngBounds::javaClass.GetField<jni::jdouble>(env, "latitudeNorth");
+    static auto neLonField = LatLngBounds::javaClass.GetField<jni::jdouble>(env, "longitudeEast");
+
+    mbgl::LatLng sw = { bounds.Get(env, swLatField), bounds.Get(env, swLonField) };
+    mbgl::LatLng ne = { bounds.Get(env, neLatField), bounds.Get(env, neLonField) };
+
+    sw.unwrapForShortestPath(ne);
+
+    return mbgl::LatLngBounds::hull(sw, ne);
 }
 
 void LatLngBounds::registerNative(jni::JNIEnv& env) {
diff --git a/platform/android/src/map_renderer.cpp b/platform/android/src/map_renderer.cpp
index f7e16b7091..ba6fdc63b0 100644
--- a/platform/android/src/map_renderer.cpp
+++ b/platform/android/src/map_renderer.cpp
@@ -29,6 +29,7 @@ MapRenderer::MapRenderer(jni::JNIEnv& _env, jni::Object<MapRenderer> obj,
 MapRenderer::~MapRenderer() = default;
 
 void MapRenderer::reset() {
+    destroyed = true;
     // Make sure to destroy the renderer on the GL Thread
     auto self = ActorRef<MapRenderer>(*this, mailbox);
     self.ask(&MapRenderer::resetRenderer).wait();
@@ -88,8 +89,10 @@ void MapRenderer::requestSnapshot(SnapshotCallback callback) {
     self.invoke(
             &MapRenderer::scheduleSnapshot,
             std::make_unique<SnapshotCallback>([&, callback=std::move(callback), runloop=util::RunLoop::Get()](PremultipliedImage image) {
-                runloop->invoke([callback=std::move(callback), image=std::move(image)]() mutable {
-                    callback(std::move(image));
+                runloop->invoke([callback=std::move(callback), image=std::move(image), renderer=std::move(this)]() mutable {
+                    if (renderer && !renderer->destroyed) {
+                        callback(std::move(image));
+                    }
                 });
                 snapshotCallback.reset();
             })
@@ -136,7 +139,7 @@ void MapRenderer::render(JNIEnv&) {
     renderer->render(*params);
 
     // Deliver the snapshot if requested
-    if (snapshotCallback && !paused) {
+    if (snapshotCallback) {
         snapshotCallback->operator()(backend->readFramebuffer());
         snapshotCallback.reset();
     }
@@ -174,14 +177,6 @@ void MapRenderer::onSurfaceChanged(JNIEnv&, jint width, jint height) {
     requestRender();
 }
 
-void MapRenderer::onResume(JNIEnv&) {
-    paused = false;
-}
-
-void MapRenderer::onPause(JNIEnv&) {
-    paused = true;
-}
-
 // Static methods //
 
 jni::Class<MapRenderer> MapRenderer::javaClass;
@@ -200,11 +195,7 @@ void MapRenderer::registerNative(jni::JNIEnv& env) {
                                          METHOD(&MapRenderer::onSurfaceCreated,
                                                 "nativeOnSurfaceCreated"),
                                          METHOD(&MapRenderer::onSurfaceChanged,
-                                                "nativeOnSurfaceChanged"),
-                                         METHOD(&MapRenderer::onResume,
-                                                "nativeOnResume"),
-                                         METHOD(&MapRenderer::onPause,
-                                                "nativeOnPause"));
+                                                "nativeOnSurfaceChanged"));
 }
 
 MapRenderer& MapRenderer::getNativePeer(JNIEnv& env, jni::Object<MapRenderer> jObject) {
diff --git a/platform/android/src/map_renderer.hpp b/platform/android/src/map_renderer.hpp
index 5fb5ef1a61..97d2db4a91 100644
--- a/platform/android/src/map_renderer.hpp
+++ b/platform/android/src/map_renderer.hpp
@@ -98,10 +98,6 @@ private:
 
     void onSurfaceChanged(JNIEnv&, jint width, jint height);
 
-    void onResume(JNIEnv&);
-
-    void onPause(JNIEnv&);
-
 private:
     GenericUniqueWeakObject<MapRenderer> javaPeer;
 
@@ -124,7 +120,7 @@ private:
     std::mutex updateMutex;
 
     bool framebufferSizeChanged = false;
-    std::atomic<bool> paused {false};
+    std::atomic<bool> destroyed {false};
 
     std::unique_ptr<SnapshotCallback> snapshotCallback;
 };
diff --git a/platform/android/src/run_loop.cpp b/platform/android/src/run_loop.cpp
index 34366d836a..f655f13ea8 100644
--- a/platform/android/src/run_loop.cpp
+++ b/platform/android/src/run_loop.cpp
@@ -5,6 +5,7 @@
 #include <mbgl/util/thread.hpp>
 #include <mbgl/util/timer.hpp>
 #include <mbgl/actor/scheduler.hpp>
+#include <mbgl/util/event.hpp>
 
 #include <android/looper.h>
 
@@ -17,6 +18,7 @@
 
 #include <fcntl.h>
 #include <unistd.h>
+#include <mbgl/util/logging.hpp>
 
 #define PIPE_OUT 0
 #define PIPE_IN  1
@@ -119,11 +121,11 @@ RunLoop::Impl::~Impl() {
     alarm.reset();
 
     if (ALooper_removeFd(loop, fds[PIPE_OUT]) != 1) {
-        throw std::runtime_error("Failed to remove file descriptor from Looper.");
+        Log::Error(mbgl::Event::General, "Failed to remove file descriptor from Looper");
     }
 
     if (close(fds[PIPE_IN]) || close(fds[PIPE_OUT])) {
-        throw std::runtime_error("Failed to close file descriptor.");
+        Log::Error(mbgl::Event::General, "Failed to close file descriptor.");
     }
 
     ALooper_release(loop);
diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp
index 6fe6e3cb29..c7a6bcd3a3 100644
--- a/platform/android/src/style/layers/layer.cpp
+++ b/platform/android/src/style/layers/layer.cpp
@@ -157,14 +157,12 @@ namespace android {
         using namespace mbgl::style::conversion;
 
         Filter filter = layer.accept(GetFilterEvaluator());
-
-        jni::Object<gson::JsonElement> converted;
-        if (filter.is<ExpressionFilter>()) {
-            ExpressionFilter filterExpression = filter.get<ExpressionFilter>();
-            mbgl::Value expressionValue = filterExpression.expression.get()->serialize();
-            converted = gson::JsonElement::New(env, expressionValue);
+        if (filter.expression) {
+            mbgl::Value expressionValue = (*filter.expression)->serialize();
+            return gson::JsonElement::New(env, expressionValue);
+        } else {
+            return jni::Object<gson::JsonElement>();
         }
-        return converted;
     }
 
     struct SetSourceLayerEvaluator {