[core] Use geometry.hpp feature type
This commit is contained in:
172
platform/node/src/node_feature.cpp
Normal file
172
platform/node/src/node_feature.cpp
Normal file
@@ -0,0 +1,172 @@
|
||||
#include "node_feature.hpp"
|
||||
|
||||
namespace node_mbgl {
|
||||
|
||||
using namespace mapbox::geometry;
|
||||
|
||||
using Value = mbgl::Value;
|
||||
using Feature = mbgl::Feature;
|
||||
using Geometry = mbgl::Feature::geometry_type;
|
||||
using Properties = mbgl::Feature::property_map;
|
||||
|
||||
template <class T>
|
||||
struct ToType {
|
||||
public:
|
||||
v8::Local<v8::String> operator()(const point<T>&) {
|
||||
return type("Point");
|
||||
}
|
||||
|
||||
v8::Local<v8::String> operator()(const line_string<T>&) {
|
||||
return type("LineString");
|
||||
}
|
||||
|
||||
v8::Local<v8::String> operator()(const polygon<T>&) {
|
||||
return type("Polygon");
|
||||
}
|
||||
|
||||
v8::Local<v8::String> operator()(const multi_point<T>&) {
|
||||
return type("MultiPoint");
|
||||
}
|
||||
|
||||
v8::Local<v8::String> operator()(const multi_line_string<T>&) {
|
||||
return type("MultiLineString");
|
||||
}
|
||||
|
||||
v8::Local<v8::String> operator()(const multi_polygon<T>&) {
|
||||
return type("MultiPolygon");
|
||||
}
|
||||
|
||||
v8::Local<v8::String> operator()(const geometry_collection<T>&) {
|
||||
return type("GeometryCollection");
|
||||
}
|
||||
|
||||
private:
|
||||
v8::Local<v8::String> type(const char* type) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
return scope.Escape(Nan::New(type).ToLocalChecked());
|
||||
}
|
||||
};
|
||||
|
||||
template <class T>
|
||||
struct ToCoordinates {
|
||||
public:
|
||||
// Handles line_string, multi_point, multi_line_string, and multi_polygon.
|
||||
template <class E>
|
||||
v8::Local<v8::Object> operator()(const std::vector<E>& vector) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
v8::Local<v8::Array> result = Nan::New<v8::Array>(vector.size());
|
||||
for (std::size_t i = 0; i < vector.size(); ++i) {
|
||||
Nan::Set(result, i, operator()(vector[i]));
|
||||
}
|
||||
return scope.Escape(result);
|
||||
}
|
||||
|
||||
v8::Local<v8::Object> operator()(const point<T>& point) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
v8::Local<v8::Array> result = Nan::New<v8::Array>(2);
|
||||
Nan::Set(result, 0, Nan::New(point.x));
|
||||
Nan::Set(result, 1, Nan::New(point.y));
|
||||
return scope.Escape(result);
|
||||
}
|
||||
|
||||
v8::Local<v8::Object> operator()(const polygon<T>& polygon) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
v8::Local<v8::Array> result = Nan::New<v8::Array>(1 + polygon.interior_rings.size());
|
||||
Nan::Set(result, 0, operator()(polygon.exterior_ring));
|
||||
for (std::size_t i = 0; i < polygon.interior_rings.size(); ++i) {
|
||||
Nan::Set(result, i + 1, operator()(polygon.interior_rings[i]));
|
||||
}
|
||||
return scope.Escape(result);
|
||||
}
|
||||
|
||||
v8::Local<v8::Object> operator()(const geometry_collection<T>& collection) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
v8::Local<v8::Array> result = Nan::New<v8::Array>(collection.size());
|
||||
for (std::size_t i = 0; i < collection.size(); ++i) {
|
||||
Nan::Set(result, i, toJS(collection[i]));
|
||||
}
|
||||
return scope.Escape(result);
|
||||
}
|
||||
};
|
||||
|
||||
struct ToValue {
|
||||
v8::Local<v8::Value> operator()(bool t) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
return scope.Escape(Nan::New(t));
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> operator()(int64_t t) {
|
||||
return operator()(double(t));
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> operator()(uint64_t t) {
|
||||
return operator()(double(t));
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> operator()(double t) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
return scope.Escape(Nan::New(t));
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> operator()(const std::string& t) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
return scope.Escape(Nan::New(t).ToLocalChecked());
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> operator()(const std::vector<mbgl::Value>& array) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
v8::Local<v8::Array> result = Nan::New<v8::Array>();
|
||||
for (unsigned int i = 0; i < array.size(); i++) {
|
||||
result->Set(i, toJS(array[i]));
|
||||
}
|
||||
return scope.Escape(result);
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> operator()(const std::unordered_map<std::string, mbgl::Value>& map) {
|
||||
return toJS(map);
|
||||
}
|
||||
};
|
||||
|
||||
v8::Local<v8::Object> toJS(const Geometry& geometry) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
|
||||
v8::Local<v8::Object> result = Nan::New<v8::Object>();
|
||||
|
||||
Nan::Set(result, Nan::New("type").ToLocalChecked(), Geometry::visit(geometry, ToType<double>()));
|
||||
Nan::Set(result, Nan::New("coordinates").ToLocalChecked(), Geometry::visit(geometry, ToCoordinates<double>()));
|
||||
|
||||
return scope.Escape(result);
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> toJS(const Value& value) {
|
||||
return Value::visit(value, ToValue());
|
||||
}
|
||||
|
||||
v8::Local<v8::Object> toJS(const Properties& properties) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
|
||||
v8::Local<v8::Object> result = Nan::New<v8::Object>();
|
||||
for (const auto& property : properties) {
|
||||
Nan::Set(result, Nan::New(property.first).ToLocalChecked(), toJS(property.second));
|
||||
}
|
||||
|
||||
return scope.Escape(result);
|
||||
}
|
||||
|
||||
v8::Local<v8::Object> toJS(const Feature& feature) {
|
||||
Nan::EscapableHandleScope scope;
|
||||
|
||||
v8::Local<v8::Object> result = Nan::New<v8::Object>();
|
||||
|
||||
Nan::Set(result, Nan::New("type").ToLocalChecked(), Nan::New("Feature").ToLocalChecked());
|
||||
Nan::Set(result, Nan::New("geometry").ToLocalChecked(), toJS(feature.geometry));
|
||||
Nan::Set(result, Nan::New("properties").ToLocalChecked(), toJS(feature.properties));
|
||||
|
||||
if (feature.id) {
|
||||
Nan::Set(result, Nan::New("id").ToLocalChecked(), toJS(*feature.id));
|
||||
}
|
||||
|
||||
return scope.Escape(result);
|
||||
}
|
||||
|
||||
}
|
||||
18
platform/node/src/node_feature.hpp
Normal file
18
platform/node/src/node_feature.hpp
Normal file
@@ -0,0 +1,18 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/util/feature.hpp>
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
#pragma GCC diagnostic ignored "-Wshadow"
|
||||
#include <nan.h>
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
namespace node_mbgl {
|
||||
|
||||
v8::Local<v8::Value> toJS(const mbgl::Value&);
|
||||
v8::Local<v8::Object> toJS(const mbgl::Feature&);
|
||||
v8::Local<v8::Object> toJS(const mbgl::Feature::geometry_type&);
|
||||
v8::Local<v8::Object> toJS(const mbgl::Feature::property_map&);
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "node_map.hpp"
|
||||
#include "node_request.hpp"
|
||||
#include "node_feature.hpp"
|
||||
|
||||
#include <mbgl/platform/default/headless_display.hpp>
|
||||
#include <mbgl/util/exception.hpp>
|
||||
@@ -465,7 +466,7 @@ NAN_METHOD(NodeMap::QueryRenderedFeatures) {
|
||||
}
|
||||
|
||||
try {
|
||||
std::vector<std::string> result;
|
||||
std::vector<mbgl::Feature> result;
|
||||
|
||||
if (Nan::Get(posOrBox, 0).ToLocalChecked()->IsArray()) {
|
||||
|
||||
@@ -490,7 +491,7 @@ NAN_METHOD(NodeMap::QueryRenderedFeatures) {
|
||||
|
||||
auto array = Nan::New<v8::Array>();
|
||||
for (unsigned int i = 0; i < result.size(); i++) {
|
||||
array->Set(i, Nan::New<v8::String>(result[i]).ToLocalChecked());
|
||||
array->Set(i, toJS(result[i]));
|
||||
}
|
||||
info.GetReturnValue().Set(array);
|
||||
} catch (const std::exception &ex) {
|
||||
|
||||
Reference in New Issue
Block a user