From 2b06d905f60b3a5e774fd519f458a384a3135343 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Thu, 4 Dec 2014 08:11:09 +1100 Subject: [PATCH] Fix Map with CachingHTTPFileSource --- android/cpp/native_map_view.cpp | 2 +- include/mbgl/android/native_map_view.hpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp index 1e387e0fa..43bc95598 100644 --- a/android/cpp/native_map_view.cpp +++ b/android/cpp/native_map_view.cpp @@ -88,7 +88,7 @@ void MBGLView::notify_map_change(mbgl::MapChange /* change */, mbgl::timestamp / nativeView.notifyMapChange(); } -NativeMapView::NativeMapView(JNIEnv* env, jobject obj_) : view(*this), map(view) { +NativeMapView::NativeMapView(JNIEnv* env, jobject obj_) : view(*this), fileSource(mbgl::platform::defaultCacheDatabase()), map(view, fileSource) { mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::NativeMapView"); assert(env != nullptr); diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp index bfcd87675..2ca948496 100644 --- a/include/mbgl/android/native_map_view.hpp +++ b/include/mbgl/android/native_map_view.hpp @@ -4,6 +4,8 @@ #include #include #include +#include + #include #include #include @@ -74,6 +76,7 @@ private: ANativeWindow* window = nullptr; MBGLView view; // Must be before map + mbgl::CachingHTTPFileSource fileSource; mbgl::Map map; EGLDisplay display = EGL_NO_DISPLAY;