tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[node] Revert semantics of Map#render

Browse Source
This commit is contained in:
John Firebaugh
2016-11-16 11:10:16 -08:00
parent 5f010b0979
commit f1e10e31a5
2 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
platform/node/src/node_map.cpp
View File

@@ -21,15 +21,15 @@
namespace node_mbgl {
struct NodeMap::RenderOptions {
mbgl::optional<double> zoom;
mbgl::optional<double> bearing;
mbgl::optional<double> pitch;
mbgl::optional<double> latitude;
mbgl::optional<double> longitude;
double zoom = 0;
double bearing = 0;
double pitch = 0;
double latitude = 0;
double longitude = 0;
unsigned int width = 512;
unsigned int height = 512;
mbgl::optional<std::vector<std::string>> classes;
mbgl::optional<mbgl::MapDebugOptions> debugOptions;
std::vector<std::string> classes;
mbgl::MapDebugOptions debugOptions = mbgl::MapDebugOptions::NoDebug;
};
Nan::Persistent<v8::Function> NodeMap::constructor;
@@ -266,40 +266,37 @@ NodeMap::RenderOptions NodeMap::ParseOptions(v8::Local<v8::Object> obj) {
if (Nan::Has(obj, Nan::New("classes").ToLocalChecked()).FromJust()) {
auto classes = Nan::To<v8::Object>(Nan::Get(obj, Nan::New("classes").ToLocalChecked()).ToLocalChecked()).ToLocalChecked().As<v8::Array>();
const int length = classes->Length();
std::vector<std::string> vector;
vector.reserve(length);
options.classes.reserve(length);
for (int i = 0; i < length; i++) {
vector.push_back(std::string { *Nan::Utf8String(Nan::To<v8::String>(Nan::Get(classes, i).ToLocalChecked()).ToLocalChecked()) });
options.classes.push_back(std::string { *Nan::Utf8String(Nan::To<v8::String>(Nan::Get(classes, i).ToLocalChecked()).ToLocalChecked()) });
}
options.classes = std::move(vector);
}
if (Nan::Has(obj, Nan::New("debug").ToLocalChecked()).FromJust()) {
auto debug = Nan::To<v8::Object>(Nan::Get(obj, Nan::New("debug").ToLocalChecked()).ToLocalChecked()).ToLocalChecked();
options.debugOptions = mbgl::MapDebugOptions::NoDebug;
if (Nan::Has(debug, Nan::New("tileBorders").ToLocalChecked()).FromJust()) {
if (Nan::Get(debug, Nan::New("tileBorders").ToLocalChecked()).ToLocalChecked()->BooleanValue()) {
*options.debugOptions = *options.debugOptions | mbgl::MapDebugOptions::TileBorders;
options.debugOptions = options.debugOptions | mbgl::MapDebugOptions::TileBorders;
}
}
if (Nan::Has(debug, Nan::New("parseStatus").ToLocalChecked()).FromJust()) {
if (Nan::Get(debug, Nan::New("parseStatus").ToLocalChecked()).ToLocalChecked()->BooleanValue()) {
*options.debugOptions = *options.debugOptions | mbgl::MapDebugOptions::ParseStatus;
options.debugOptions = options.debugOptions | mbgl::MapDebugOptions::ParseStatus;
}
}
if (Nan::Has(debug, Nan::New("timestamps").ToLocalChecked()).FromJust()) {
if (Nan::Get(debug, Nan::New("timestamps").ToLocalChecked()).ToLocalChecked()->BooleanValue()) {
*options.debugOptions = *options.debugOptions | mbgl::MapDebugOptions::Timestamps;
options.debugOptions = options.debugOptions | mbgl::MapDebugOptions::Timestamps;
}
}
if (Nan::Has(debug, Nan::New("collision").ToLocalChecked()).FromJust()) {
if (Nan::Get(debug, Nan::New("collision").ToLocalChecked()).ToLocalChecked()->BooleanValue()) {
*options.debugOptions = *options.debugOptions | mbgl::MapDebugOptions::Collision;
options.debugOptions = options.debugOptions | mbgl::MapDebugOptions::Collision;
}
}
if (Nan::Has(debug, Nan::New("overdraw").ToLocalChecked()).FromJust()) {
if (Nan::Get(debug, Nan::New("overdraw").ToLocalChecked()).ToLocalChecked()->BooleanValue()) {
*options.debugOptions = mbgl::MapDebugOptions::Overdraw;
options.debugOptions = mbgl::MapDebugOptions::Overdraw;
}
}
}
@@ -368,28 +365,29 @@ void NodeMap::startRender(NodeMap::RenderOptions options) {
view = std::make_unique<mbgl::OffscreenView>(backend.getContext(), fbSize);
}
if (options.classes) {
map->setClasses(*options.classes);
if (map->getClasses() != options.classes) {
map->setClasses(options.classes);
}
if (options.latitude && options.longitude) {
map->setLatLng(mbgl::LatLng(*options.latitude, *options.longitude));
mbgl::LatLng latLng(options.latitude, options.longitude);
if (map->getLatLng() != latLng) {
map->setLatLng(latLng);
}
if (options.zoom) {
map->setZoom(*options.zoom);
if (map->getZoom() != options.zoom) {
map->setZoom(options.zoom);
}
if (options.bearing) {
map->setBearing(*options.bearing);
if (map->getBearing() != options.bearing) {
map->setBearing(options.bearing);
}
if (options.pitch) {
map->setPitch(*options.pitch);
if (map->getPitch() != options.pitch) {
map->setPitch(options.pitch);
}
if (options.debugOptions) {
map->setDebug(*options.debugOptions);
if (map->getDebug() != options.debugOptions) {
map->setDebug(options.debugOptions);
}
map->renderStill(*view, [this](const std::exception_ptr eptr) {