diff options
author | Osana Babayan <32496536+osana@users.noreply.github.com> | 2018-02-08 10:33:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-08 10:33:12 -0500 |
commit | 7a0a4c44f469e180606afa250a47414441e8e675 (patch) | |
tree | 97f69e610913a055dfc9bc712555a4687d328b54 /platform/android/src/geojson/polygon.cpp | |
parent | 62ae0738e8a3d1b3e4b661fa7e8d8bb1d6339c51 (diff) | |
download | qtlocation-mapboxgl-7a0a4c44f469e180606afa250a47414441e8e675.tar.gz |
migrated to use mapbox-java3.0
migrated to use mapbox-java3.0
old 2.2.9 telementry is still used though
Diffstat (limited to 'platform/android/src/geojson/polygon.cpp')
-rw-r--r-- | platform/android/src/geojson/polygon.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/android/src/geojson/polygon.cpp b/platform/android/src/geojson/polygon.cpp index ef00f9df3f..30ba996640 100644 --- a/platform/android/src/geojson/polygon.cpp +++ b/platform/android/src/geojson/polygon.cpp @@ -12,7 +12,7 @@ mapbox::geojson::polygon Polygon::convert(jni::JNIEnv &env, jni::Object<Polygon> mapbox::geojson::polygon polygon; if (jPolygon) { - auto jPositionListsList = Polygon::getCoordinates(env, jPolygon); + auto jPositionListsList = Polygon::coordinates(env, jPolygon); polygon = Polygon::convert(env, jPositionListsList); jni::DeleteLocalRef(env, jPositionListsList); } @@ -20,11 +20,11 @@ mapbox::geojson::polygon Polygon::convert(jni::JNIEnv &env, jni::Object<Polygon> return polygon; } -mapbox::geojson::polygon Polygon::convert(jni::JNIEnv &env, jni::Object<java::util::List/*<java::util::List<Position>>*/> jPositionListsList) { +mapbox::geojson::polygon Polygon::convert(jni::JNIEnv &env, jni::Object<java::util::List/*<java::util::List<Point>>*/> jPointListsList) { mapbox::geojson::polygon polygon; - if (jPositionListsList) { - auto multiLine = MultiLineString::convert(env, jPositionListsList); + if (jPointListsList) { + auto multiLine = MultiLineString::convert(env, jPointListsList); polygon.reserve(multiLine.size()); for (auto&& line : multiLine) { polygon.emplace_back(convertExplicit<mapbox::geojson::linear_ring>(std::move(line))); @@ -35,8 +35,8 @@ mapbox::geojson::polygon Polygon::convert(jni::JNIEnv &env, jni::Object<java::ut } -jni::Object<java::util::List> Polygon::getCoordinates(jni::JNIEnv &env, jni::Object<Polygon> jPolygon) { - static auto method = Polygon::javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "getCoordinates"); +jni::Object<java::util::List> Polygon::coordinates(jni::JNIEnv &env, jni::Object<Polygon> jPolygon) { + static auto method = Polygon::javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates"); return jPolygon.Call(env, method); } |