[android] Polygon holes (#8557)

* add 1 hole support to polygon-related classes

* fix no hole crash and add triangle hole shape example

* add support for multiple holes
This commit is contained in:
Pablo Guardiola
2017-04-11 19:10:46 +02:00
committed by GitHub
parent 1d33bf774f
commit b71d86599d
8 changed files with 208 additions and 5 deletions

View File

@@ -9,13 +9,26 @@ jni::Class<Polygon> Polygon::javaClass;
mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, jni::Object<Polygon> polygon) {
auto points = Polygon::getPoints(env, polygon);
auto holes = Polygon::getHoles(env, polygon);
mbgl::FillAnnotation annotation { mbgl::Polygon<double> { MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, points) } };
mbgl::Polygon<double> geometry { MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, points) };
auto jHoleListsArray = java::util::List::toArray<java::util::List>(env, holes);
std::size_t jHoleListsSize = jHoleListsArray.Length(env);
for (std::size_t i = 0; i < jHoleListsSize; i++) {
auto jHoleList = jHoleListsArray.Get(env, i);
geometry.push_back(MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, jHoleList));
jni::DeleteLocalRef(env, jHoleList);
}
jni::DeleteLocalRef(env, jHoleListsArray);
mbgl::FillAnnotation annotation { geometry };
annotation.opacity = { Polygon::getOpacity(env, polygon) };
annotation.color = { Polygon::getFillColor(env, polygon) };
annotation.outlineColor = { Polygon::getOutlineColor(env, polygon) };
jni::DeleteLocalRef(env, points);
jni::DeleteLocalRef(env, holes);
return annotation;
}
@@ -25,6 +38,11 @@ jni::Object<java::util::List> Polygon::getPoints(jni::JNIEnv& env, jni::Object<P
return polygon.Get(env, field);
}
jni::Object<java::util::List> Polygon::getHoles(jni::JNIEnv& env, jni::Object<Polygon> polygon) {
static auto field = Polygon::javaClass.GetField<jni::Object<java::util::List>>(env, "holes");
return polygon.Get(env, field);
}
float Polygon::getOpacity(jni::JNIEnv& env, jni::Object<Polygon> polygon) {
static auto field = Polygon::javaClass.GetField<float>(env, "alpha");
return polygon.Get(env, field);