summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package.json3
-rw-r--r--src/node_map.cpp4
m---------vendor/mbgl12
3 files changed, 3 insertions, 16 deletions
diff --git a/package.json b/package.json
index 38f1f85b2c..7ff254dce9 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
}
],
"dependencies": {
- "mapbox-gl-test-suite": "git://github.com/mapbox/mapbox-gl-test-suite#7251829de9d2804fe02cd8f7acc0e30ea278429d",
"nan": "^1.9.0",
"node-pre-gyp": "^0.6.7"
},
@@ -28,7 +27,7 @@
"devDependencies": {
"aws-sdk": "^2.1.27",
"faucet": "0.0.1",
- "mapbox-gl-test-suite": "git://github.com/mapbox/mapbox-gl-test-suite#master",
+ "mapbox-gl-test-suite": "git://github.com/mapbox/mapbox-gl-test-suite#7251829de9d2804fe02cd8f7acc0e30ea278429d",
"mkdirp": "^0.5.1",
"pngjs": "^0.4.0",
"request": "^2.55.0",
diff --git a/src/node_map.cpp b/src/node_map.cpp
index bca557f810..d348d0febd 100644
--- a/src/node_map.cpp
+++ b/src/node_map.cpp
@@ -192,7 +192,7 @@ NAN_METHOD(NodeMap::Render) {
}
void NodeMap::startRender(std::unique_ptr<NodeMap::RenderOptions> options) {
- map->resize(options->width, options->height, options->ratio);
+ view.resize(options->width, options->height);
map->setClasses(options->classes);
map->setLatLngZoom(mbgl::LatLng(options->latitude, options->longitude), options->zoom);
map->setBearing(options->bearing);
@@ -319,7 +319,7 @@ void NodeMap::release() {
// Instance
NodeMap::NodeMap(v8::Handle<v8::Object> options) :
- view(sharedDisplay()),
+ view(sharedDisplay(), 1.0),
fs(options),
map(std::make_unique<mbgl::Map>(view, fs, mbgl::MapMode::Still)),
async(new uv_async_t) {
diff --git a/vendor/mbgl b/vendor/mbgl
-Subproject 7a30a0d316501d8dd606ece0ab220e7ec2e6408
+Subproject b5f918af7cf69b2897b8c92d244722c5c58fce5