Merge branch 'release-ios-3.2.0-android-4.0.0'

2016-03-30 17:01:54 -07:00
parent b6a181097c 7b5a1ca167
commit 5eda74a514
101 changed files with 2268 additions and 1077 deletions
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -76,7 +76,7 @@ NativeMapView::NativeMapView(JNIEnv *env, jobject obj_, float pixelRatio_, int a
    }

    fileSource = std::make_unique<mbgl::DefaultFileSource>(
-        mbgl::android::cachePath + "/mbgl-cache.db",
+        mbgl::android::cachePath + "/mbgl-offline.db",
        mbgl::android::apkPath);

    map = std::make_unique<mbgl::Map>(*this, *fileSource, MapMode::Continuous);