N-API mapnik.supports + cleanups (WIP) [skip ci]

Author: artemp

src/mapnik_map_render.cpp

@@ -428,7 +428,6 @@ Napi::Value Map::render(Napi::CallbackInfo const& info)
         unsigned offset_y = 0;
 
         Napi::Object options = Napi::Object::New(env);
-
         if (info.Length() > 2)
         {
             // options object
@@ -941,7 +940,6 @@ Napi::Value Map::renderSync(Napi::CallbackInfo const& info)
     try
     {
         mapnik::image_rgba8 im(map_->width(), map_->height());
-        //mapnik::Map const& map = *map_;
         mapnik::request m_req(map_->width(),map_->height(),map_->get_current_extent());
         m_req.set_buffer_size(buffer_size);
         mapnik::agg_renderer<mapnik::image_rgba8> ren(*map_,

src/node_mapnik.cpp

@@ -336,6 +336,73 @@ Napi::Object init(Napi::Env env, Napi::Object exports)
     versions.Set("cairo", CAIRO_VERSION_STRING);
 #endif
     exports.Set("versions", versions);
+
+// supports
+    Napi::Object supports = Napi::Object::New(env);
+#ifdef GRID_RENDERER
+    supports.Set("grid", Napi::Boolean::New(env,true));
+#else
+    supports.Set("grid", Napi::Boolean::New(env,false));
+#endif
+
+#ifdef SVG_RENDERER
+    supports.Set("svg", Napi::Boolean::New(env,true));
+#else
+    supports.Set("svg", Napi::Boolean::New(env,false));
+#endif
+
+#if defined(HAVE_CAIRO)
+    supports.Set("cairo", Napi::Boolean::New(env,true));
+#ifdef CAIRO_HAS_PDF_SURFACE
+    supports.Set("cairo_pdf", Napi::Boolean::New(env,true));
+#else
+    supports.Set("cairo_pdf", Napi::Boolean::New(env,false));
+#endif
+#ifdef CAIRO_HAS_SVG_SURFACE
+    supports.Set("cairo_svg", Napi::Boolean::New(env,true));
+#else
+    supports.Set("cairo_svg", Napi::Boolean::New(env,false));
+#endif
+#else
+    supports.Set("cairo", Napi::Boolean::New(env,false));
+#endif
+
+#if defined(HAVE_PNG)
+    supports.Set("png", Napi::Boolean::New(env,true));
+#else
+    supports.Set("png", Napi::Boolean::New(env,false));
+#endif
+
+#if defined(HAVE_JPEG)
+    supports.Set("jpeg", Napi::Boolean::New(env,true));
+#else
+    supports.Set("jpeg", Napi::Boolean::New(env,false));
+#endif
+
+#if defined(HAVE_TIFF)
+    supports.Set("tiff", Napi::Boolean::New(env,true));
+#else
+    supports.Set("tiff", Napi::Boolean::New(env,false));
+#endif
+
+#if defined(HAVE_WEBP)
+    supports.Set("webp", Napi::Boolean::New(env,true));
+#else
+    supports.Set("webp", Napi::Boolean::New(env,false));
+#endif
+
+#if defined(MAPNIK_USE_PROJ4)
+    supports.Set("proj4", Napi::Boolean::New(env,true));
+#else
+    supports.Set("proj4", Napi::Boolean::New(env,false));
+#endif
+
+#if defined(MAPNIK_THREADSAFE)
+    supports.Set("threadsafe", Napi::Boolean::New(env,true));
+#else
+    supports.Set("threadsafe", Napi::Boolean::New(env,false));
+#endif
+    exports.Set("supports", supports);
     return exports;
 }
 

test/render-sync.test.js

@@ -134,7 +134,7 @@ test('should render to a file - tiff', (assert) => {
   assert.end();
 });
 
-/*
+
 if (mapnik.supports.cairo) {
   test('should render to a file - pdf', (assert) => {
     var map = new mapnik.Map(256, 256);
@@ -148,7 +148,7 @@ if (mapnik.supports.cairo) {
 } else {
   test.skip('should render to a file - pdf', function() { });
 }
-*/
+
 test('should render to a file - scale', (assert) => {
   var map = new mapnik.Map(256, 256);
   map.loadSync('./test/stylesheet.xml');