[android][node][qt] Update platform code for style::Layer::setProperty()
This commit is contained in:
@@ -91,18 +91,10 @@ namespace android {
|
||||
return layer;
|
||||
}
|
||||
|
||||
void Layer::setLayoutProperty(jni::JNIEnv& env, const jni::String& jname, const jni::Object<>& jvalue) {
|
||||
void Layer::setProperty(jni::JNIEnv& env, const jni::String& jname, const jni::Object<>& jvalue) {
|
||||
// Convert and set property
|
||||
optional<mbgl::style::conversion::Error> error = layer.setLayoutProperty(jni::Make<std::string>(env, jname), Value(env, jvalue));
|
||||
if (error) {
|
||||
mbgl::Log::Error(mbgl::Event::JNI, "Error setting property: " + jni::Make<std::string>(env, jname) + " " + error->message);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void Layer::setPaintProperty(jni::JNIEnv& env, const jni::String& jname, const jni::Object<>& jvalue) {
|
||||
// Convert and set property
|
||||
optional<mbgl::style::conversion::Error> error = layer.setPaintProperty(jni::Make<std::string>(env, jname), Value(env, jvalue));
|
||||
optional<mbgl::style::conversion::Error> error =
|
||||
layer.setProperty(jni::Make<std::string>(env, jname), Value(env, jvalue));
|
||||
if (error) {
|
||||
mbgl::Log::Error(mbgl::Event::JNI, "Error setting property: " + jni::Make<std::string>(env, jname) + " " + error->message);
|
||||
return;
|
||||
@@ -176,10 +168,14 @@ namespace android {
|
||||
#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
|
||||
|
||||
// Register the peer
|
||||
jni::RegisterNativePeer<Layer>(env, javaClass, "nativePtr",
|
||||
jni::RegisterNativePeer<Layer>(
|
||||
env,
|
||||
javaClass,
|
||||
"nativePtr",
|
||||
METHOD(&Layer::getId, "nativeGetId"),
|
||||
METHOD(&Layer::setLayoutProperty, "nativeSetLayoutProperty"),
|
||||
METHOD(&Layer::setPaintProperty, "nativeSetPaintProperty"),
|
||||
METHOD(&Layer::setProperty,
|
||||
"nativeSetLayoutProperty"), // TODO : Export only nativeSetProperty() when #15970 lands.
|
||||
METHOD(&Layer::setProperty, "nativeSetPaintProperty"),
|
||||
METHOD(&Layer::setFilter, "nativeSetFilter"),
|
||||
METHOD(&Layer::getFilter, "nativeGetFilter"),
|
||||
METHOD(&Layer::setSourceLayer, "nativeSetSourceLayer"),
|
||||
@@ -189,9 +185,7 @@ namespace android {
|
||||
METHOD(&Layer::getMaxZoom, "nativeGetMaxZoom"),
|
||||
METHOD(&Layer::setMinZoom, "nativeSetMinZoom"),
|
||||
METHOD(&Layer::setMaxZoom, "nativeSetMaxZoom"),
|
||||
METHOD(&Layer::getVisibility, "nativeGetVisibility")
|
||||
);
|
||||
|
||||
METHOD(&Layer::getVisibility, "nativeGetVisibility"));
|
||||
}
|
||||
|
||||
} // namespace android
|
||||
|
||||
@@ -35,9 +35,7 @@ public:
|
||||
|
||||
style::Layer& get();
|
||||
|
||||
void setLayoutProperty(jni::JNIEnv&, const jni::String&, const jni::Object<>& value);
|
||||
|
||||
void setPaintProperty(jni::JNIEnv&, const jni::String&, const jni::Object<>& value);
|
||||
void setProperty(jni::JNIEnv&, const jni::String&, const jni::Object<>& value);
|
||||
|
||||
// Zoom
|
||||
|
||||
|
||||
@@ -106,8 +106,8 @@ ParseError)JS").ToLocalChecked()).ToLocalChecked();
|
||||
Nan::SetPrototypeMethod(tpl, "addImage", AddImage);
|
||||
Nan::SetPrototypeMethod(tpl, "removeImage", RemoveImage);
|
||||
Nan::SetPrototypeMethod(tpl, "setLayerZoomRange", SetLayerZoomRange);
|
||||
Nan::SetPrototypeMethod(tpl, "setLayoutProperty", SetLayoutProperty);
|
||||
Nan::SetPrototypeMethod(tpl, "setPaintProperty", SetPaintProperty);
|
||||
Nan::SetPrototypeMethod(tpl, "setLayoutProperty", SetLayerProperty);
|
||||
Nan::SetPrototypeMethod(tpl, "setPaintProperty", SetLayerProperty);
|
||||
Nan::SetPrototypeMethod(tpl, "setFilter", SetFilter);
|
||||
Nan::SetPrototypeMethod(tpl, "setCenter", SetCenter);
|
||||
Nan::SetPrototypeMethod(tpl, "setZoom", SetZoom);
|
||||
@@ -850,7 +850,7 @@ void NodeMap::SetLayerZoomRange(const Nan::FunctionCallbackInfo<v8::Value>& info
|
||||
layer->setMaxZoom(info[2]->NumberValue());
|
||||
}
|
||||
|
||||
void NodeMap::SetLayoutProperty(const Nan::FunctionCallbackInfo<v8::Value>& info) {
|
||||
void NodeMap::SetLayerProperty(const Nan::FunctionCallbackInfo<v8::Value>& info) {
|
||||
using namespace mbgl::style;
|
||||
using namespace mbgl::style::conversion;
|
||||
|
||||
@@ -874,39 +874,7 @@ void NodeMap::SetLayoutProperty(const Nan::FunctionCallbackInfo<v8::Value>& info
|
||||
return Nan::ThrowTypeError("Second argument must be a string");
|
||||
}
|
||||
|
||||
mbgl::optional<Error> error = layer->setLayoutProperty(*Nan::Utf8String(info[1]), Convertible(info[2]));
|
||||
if (error) {
|
||||
return Nan::ThrowTypeError(error->message.c_str());
|
||||
}
|
||||
|
||||
info.GetReturnValue().SetUndefined();
|
||||
}
|
||||
|
||||
void NodeMap::SetPaintProperty(const Nan::FunctionCallbackInfo<v8::Value>& info) {
|
||||
using namespace mbgl::style;
|
||||
using namespace mbgl::style::conversion;
|
||||
|
||||
auto nodeMap = Nan::ObjectWrap::Unwrap<NodeMap>(info.Holder());
|
||||
if (!nodeMap->map) return Nan::ThrowError(releasedMessage());
|
||||
|
||||
if (info.Length() < 3) {
|
||||
return Nan::ThrowTypeError("Three arguments required");
|
||||
}
|
||||
|
||||
if (!info[0]->IsString()) {
|
||||
return Nan::ThrowTypeError("First argument must be a string");
|
||||
}
|
||||
|
||||
mbgl::style::Layer* layer = nodeMap->map->getStyle().getLayer(*Nan::Utf8String(info[0]));
|
||||
if (!layer) {
|
||||
return Nan::ThrowTypeError("layer not found");
|
||||
}
|
||||
|
||||
if (!info[1]->IsString()) {
|
||||
return Nan::ThrowTypeError("Second argument must be a string");
|
||||
}
|
||||
|
||||
mbgl::optional<Error> error = layer->setPaintProperty(*Nan::Utf8String(info[1]), Convertible(info[2]));
|
||||
mbgl::optional<Error> error = layer->setProperty(*Nan::Utf8String(info[1]), Convertible(info[2]));
|
||||
if (error) {
|
||||
return Nan::ThrowTypeError(error->message.c_str());
|
||||
}
|
||||
|
||||
@@ -50,8 +50,7 @@ public:
|
||||
static void AddImage(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
static void RemoveImage(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
static void SetLayerZoomRange(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
static void SetLayoutProperty(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
static void SetPaintProperty(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
static void SetLayerProperty(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
static void SetFilter(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
static void SetCenter(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
static void SetZoom(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
|
||||
@@ -1011,7 +1011,7 @@ void QMapboxGL::removeAnnotation(QMapbox::AnnotationID id)
|
||||
*/
|
||||
bool QMapboxGL::setLayoutProperty(const QString& layer, const QString& propertyName, const QVariant& value)
|
||||
{
|
||||
return d_ptr->setProperty(&mbgl::style::Layer::setLayoutProperty, layer, propertyName, value);
|
||||
return d_ptr->setProperty(&mbgl::style::Layer::setProperty, layer, propertyName, value);
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -1071,7 +1071,7 @@ bool QMapboxGL::setLayoutProperty(const QString& layer, const QString& propertyN
|
||||
|
||||
bool QMapboxGL::setPaintProperty(const QString& layer, const QString& propertyName, const QVariant& value)
|
||||
{
|
||||
return d_ptr->setProperty(&mbgl::style::Layer::setPaintProperty, layer, propertyName, value);
|
||||
return d_ptr->setProperty(&mbgl::style::Layer::setProperty, layer, propertyName, value);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
Reference in New Issue
Block a user