address gdal/ogr related atexit crashes - ref mapnik#251

rockybars · Jun 12, 2014 · 6eb487f · 6eb487f
1 parent 82893a0
commit 6eb487f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/node_mapnik.cpp b/src/node_mapnik.cpp
@@ -27,6 +27,9 @@
 #include <libxml/parser.h>
 #include <libxml/xmlversion.h>
 
+#include <gdal_priv.h>
+#include <ogr_api.h>
+
 // mapnik
 #include <mapnik/config.hpp> // for MAPNIK_DECL
 #include <mapnik/version.hpp>
@@ -98,6 +101,8 @@ static NAN_METHOD(shutdown)
     google::protobuf::ShutdownProtobufLibrary();
     // http://lists.fedoraproject.org/pipermail/devel/2010-January/129117.html
     xmlCleanupParser();
+    GDALDestroyDriverManager();
+    OGRCleanupAll();
     NanReturnUndefined();
 }
 

diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js
@@ -76,7 +76,7 @@ describe('mapnik.VectorTile ', function() {
             }
           ]
         };
-        vtile.fromGeoJSON(JSON.stringify(geojson),"layer-name")
+        vtile.addGeoJSON(JSON.stringify(geojson),"layer-name")
         var out = vtile.toGeoJSON(0);
         assert.equal(out.type,'FeatureCollection');
         assert.equal(out.features.length,1);
@@ -524,7 +524,7 @@ describe('mapnik.VectorTile ', function() {
             }
           ]
         };
-        vtile.fromGeoJSON(JSON.stringify(geojson),"layer-name");
+        vtile.addGeoJSON(JSON.stringify(geojson),"layer-name");
         // console.log(JSON.stringify(vtile.toGeoJSON(0),null,1));
         // at z0 we need a large tolerance because of loss of precision in point coords
         // because the points have been rounded to -121.9921875,47.98992166741417
@@ -564,7 +564,7 @@ describe('mapnik.VectorTile ', function() {
 
     // currently skipping since this segfaults at exit
     // https://github.com/mapnik/node-mapnik/issues/251
-    it.skip('should be able to resample and encode (render) a geotiff into vector tile', function(done) {
+    it('should be able to resample and encode (render) a geotiff into vector tile', function(done) {
         var vtile = new mapnik.VectorTile(0, 0, 0);
         // first we render a geotiff into an image tile
         var map = new mapnik.Map(256, 256);