Skip to content

Commit 4e7e611

Browse files
committed
N-API mapnik.Map + tests (WIP) [skip ci]
1 parent 6e04ffc commit 4e7e611

File tree

4 files changed

+401
-391
lines changed

4 files changed

+401
-391
lines changed

src/mapnik_datasource.cpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,12 @@ Datasource::Datasource(Napi::CallbackInfo const& info)
5757
if (info[0].IsExternal())
5858
{
5959
auto ext = info[0].As<Napi::External<datasource_ptr>>();
60-
if (ext) datasource_ = *ext.Data();
61-
//if (datasource_->type() == mapnik::datasource::Raster) info.This().Set("type","raster");
62-
//else info.This().Set("type","vector");
60+
if (ext)
61+
{
62+
datasource_ = *ext.Data();
63+
if (datasource_->type() == mapnik::datasource::Raster) info.This().As<Napi::Object>().Set("type","raster");
64+
else info.This().As<Napi::Object>().Set("type","vector");
65+
}
6366
return;
6467
}
6568

@@ -92,8 +95,8 @@ Datasource::Datasource(Napi::CallbackInfo const& info)
9295
return;
9396
}
9497

95-
//if (datasource_->type() == mapnik::datasource::Raster) info.This().Set("type","raster");
96-
//else info.This().Set("type","vector");
98+
if (datasource_->type() == mapnik::datasource::Raster) info.This().As<Napi::Object>().Set("type","raster");
99+
else info.This().As<Napi::Object>().Set("type","vector");
97100
}
98101

99102
Napi::Value Datasource::parameters(Napi::CallbackInfo const& info)

src/mapnik_map.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ void Map::parameters(Napi::CallbackInfo const& info, Napi::Value const& value)
439439
mapnik::parameters params;
440440

441441
Napi::Object obj = value.As<Napi::Object>();
442-
Napi::Array names = obj.As<Napi::Array>();
442+
Napi::Array names = obj.GetPropertyNames();
443443
std::size_t length = names.Length();
444444
for(std::size_t index = 0; index < length; ++index)
445445
{

src/mapnik_map.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class Map : public Napi::ObjectWrap<Map>
3434
Napi::Value fromStringSync(Napi::CallbackInfo const& info);
3535
Napi::Value fromString(Napi::CallbackInfo const& info);
3636
Napi::Value clone(Napi::CallbackInfo const& info);
37-
3837
// async rendering
3938
Napi::Value render(Napi::CallbackInfo const& info);
4039
Napi::Value renderFile(Napi::CallbackInfo const& info);

0 commit comments

Comments
 (0)