diff options
author | Chris Loer <chris.loer@gmail.com> | 2018-12-18 17:26:31 -0800 |
---|---|---|
committer | Chris Loer <chris.loer@mapbox.com> | 2018-12-21 15:13:48 -0800 |
commit | a889ff6523bc017e3989ea57c7054fc38de4ebaa (patch) | |
tree | d1a24f7573c49755456d22c4c9964662355b61bb /platform/android/src/offline/offline_region_definition.cpp | |
parent | 387fa1800f24a40f5cae2bd9457a5628fe55ba49 (diff) | |
download | qtlocation-mapboxgl-a889ff6523bc017e3989ea57c7054fc38de4ebaa.tar.gz |
[android] Add "localIdeographs" option to OfflineRegionDefinition.
Diffstat (limited to 'platform/android/src/offline/offline_region_definition.cpp')
-rw-r--r-- | platform/android/src/offline/offline_region_definition.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/platform/android/src/offline/offline_region_definition.cpp b/platform/android/src/offline/offline_region_definition.cpp index 23e5b7466b..bb9dfc8dd0 100644 --- a/platform/android/src/offline/offline_region_definition.cpp +++ b/platform/android/src/offline/offline_region_definition.cpp @@ -29,14 +29,15 @@ mbgl::OfflineRegionDefinition OfflineRegionDefinition::getDefinition(JNIEnv& env jni::Local<jni::Object<OfflineRegionDefinition>> OfflineTilePyramidRegionDefinition::New(jni::JNIEnv& env, const mbgl::OfflineTilePyramidRegionDefinition& definition) { static auto& javaClass = jni::Class<OfflineTilePyramidRegionDefinition>::Singleton(env); - static auto constructor = javaClass.GetConstructor<jni::String, jni::Object<LatLngBounds>, jni::jdouble, jni::jdouble, jni::jfloat>(env); + static auto constructor = javaClass.GetConstructor<jni::String, jni::Object<LatLngBounds>, jni::jdouble, jni::jdouble, jni::jfloat, jni::jboolean>(env); return javaClass.New(env, constructor, jni::Make<jni::String>(env, definition.styleURL), LatLngBounds::New(env, definition.bounds), definition.minZoom, definition.maxZoom, - definition.pixelRatio); + definition.pixelRatio, + jni::jboolean(definition.includeIdeographs)); } mbgl::OfflineTilePyramidRegionDefinition OfflineTilePyramidRegionDefinition::getDefinition(jni::JNIEnv& env, const jni::Object<OfflineTilePyramidRegionDefinition>& jDefinition) { @@ -47,13 +48,15 @@ mbgl::OfflineTilePyramidRegionDefinition OfflineTilePyramidRegionDefinition::get static auto minZoomF = javaClass.GetField<jni::jdouble>(env, "minZoom"); static auto maxZoomF = javaClass.GetField<jni::jdouble>(env, "maxZoom"); static auto pixelRatioF = javaClass.GetField<jni::jfloat>(env, "pixelRatio"); + static auto includeIdeographsF = javaClass.GetField<jni::jboolean >(env, "includeIdeographs"); return mbgl::OfflineTilePyramidRegionDefinition( jni::Make<std::string>(env, jDefinition.Get(env, styleURLF)), LatLngBounds::getLatLngBounds(env, jDefinition.Get(env, boundsF)), jDefinition.Get(env, minZoomF), jDefinition.Get(env, maxZoomF), - jDefinition.Get(env, pixelRatioF) + jDefinition.Get(env, pixelRatioF), + jDefinition.Get(env, includeIdeographsF) ); } @@ -65,14 +68,15 @@ void OfflineTilePyramidRegionDefinition::registerNative(jni::JNIEnv& env) { jni::Local<jni::Object<OfflineRegionDefinition>> OfflineGeometryRegionDefinition::New(jni::JNIEnv& env, const mbgl::OfflineGeometryRegionDefinition& definition) { static auto& javaClass = jni::Class<OfflineGeometryRegionDefinition>::Singleton(env); - static auto constructor = javaClass.GetConstructor<jni::String, jni::Object<geojson::Geometry>, jni::jdouble, jni::jdouble, jni::jfloat>(env); + static auto constructor = javaClass.GetConstructor<jni::String, jni::Object<geojson::Geometry>, jni::jdouble, jni::jdouble, jni::jfloat, jni::jboolean>(env); return javaClass.New(env, constructor, jni::Make<jni::String>(env, definition.styleURL), geojson::Geometry::New(env, definition.geometry), definition.minZoom, definition.maxZoom, - definition.pixelRatio); + definition.pixelRatio, + jni::jboolean(definition.includeIdeographs)); } mbgl::OfflineGeometryRegionDefinition OfflineGeometryRegionDefinition::getDefinition(jni::JNIEnv& env, const jni::Object<OfflineGeometryRegionDefinition>& jDefinition) { @@ -83,13 +87,15 @@ mbgl::OfflineGeometryRegionDefinition OfflineGeometryRegionDefinition::getDefini static auto minZoomF = javaClass.GetField<jni::jdouble>(env, "minZoom"); static auto maxZoomF = javaClass.GetField<jni::jdouble>(env, "maxZoom"); static auto pixelRatioF = javaClass.GetField<jni::jfloat>(env, "pixelRatio"); + static auto includeIdeographsF = javaClass.GetField<jni::jboolean>(env, "includeIdeographs"); return mbgl::OfflineGeometryRegionDefinition( jni::Make<std::string>(env, jDefinition.Get(env, styleURLF)), geojson::Geometry::convert(env, jDefinition.Get(env, geometryF)), jDefinition.Get(env, minZoomF), jDefinition.Get(env, maxZoomF), - jDefinition.Get(env, pixelRatioF) + jDefinition.Get(env, pixelRatioF), + jDefinition.Get(env, includeIdeographsF) ); } |