From ca897ce40786601103631b0d50ea0b5cd49afd95 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Wed, 29 Apr 2015 15:26:29 -0400
Subject: [PATCH] bump mbgl

drop mbgl::Environment from NodeFileSource
switch to mbgl::Map::Mode::Still
---
 src/node_file_source.cpp | 23 +++++++++--------------
 src/node_file_source.hpp |  5 ++---
 src/node_map.cpp         |  2 +-
 test/compare.js          |  2 +-
 vendor/mbgl              |  2 +-
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/node_file_source.cpp b/src/node_file_source.cpp
index e50237f48..936dcf716 100644
--- a/src/node_file_source.cpp
+++ b/src/node_file_source.cpp
@@ -63,8 +63,8 @@ NodeFileSource::~NodeFileSource() {
     queue = nullptr;
 }
 
-mbgl::Request *NodeFileSource::request(const mbgl::Resource &resource, uv_loop_t *loop, const mbgl::Environment &env, Callback callback) {
-    auto request = new mbgl::Request(resource, loop, env, std::move(callback));
+mbgl::Request* NodeFileSource::request(const mbgl::Resource& resource, uv_loop_t* loop, Callback callback) {
+    auto request = new mbgl::Request(resource, loop, std::move(callback));
 
     // This function can be called from any thread. Make sure we're executing the actual call in the
     // file source loop by sending it over the queue. It will be processed in processAction().
@@ -72,16 +72,7 @@ mbgl::Request *NodeFileSource::request(const mbgl::Resource &resource, uv_loop_t
     return request;
 }
 
-void NodeFileSource::request(const mbgl::Resource &resource, const mbgl::Environment &env, Callback callback) {
-    auto request = new mbgl::Request(resource, nullptr, env, std::move(callback));
-
-    // This function can be called from any thread. Make sure we're executing the actual call in the
-    // file source loop by sending it over the queue. It will be processed in processAction().
-    queue->send(Action{ Action::Add, request });
-}
-
-
-void NodeFileSource::cancel(mbgl::Request *request) {
+void NodeFileSource::cancel(mbgl::Request* request) {
     request->cancel();
 
     // This function can be called from any thread. Make sure we're executing the actual call in the
@@ -89,8 +80,12 @@ void NodeFileSource::cancel(mbgl::Request *request) {
     queue->send(Action{ Action::Cancel, request });
 }
 
-void NodeFileSource::abort(const mbgl::Environment &env) {
-    // no-op
+void NodeFileSource::request(const mbgl::Resource& resource, Callback callback) {
+    auto request = new mbgl::Request(resource, nullptr, std::move(callback));
+
+    // This function can be called from any thread. Make sure we're executing the actual call in the
+    // file source loop by sending it over the queue. It will be processed in processAction().
+    queue->send(Action{ Action::Add, request });
 }
 
 void NodeFileSource::processAdd(mbgl::Request *request) {
diff --git a/src/node_file_source.hpp b/src/node_file_source.hpp
index 5c030180a..4e2f967d6 100644
--- a/src/node_file_source.hpp
+++ b/src/node_file_source.hpp
@@ -26,11 +26,10 @@ public:
     NodeFileSource();
     ~NodeFileSource();
 
-    mbgl::Request *request(const mbgl::Resource &resource, uv_loop_t *loop, const mbgl::Environment &env, Callback callback);
-    void request(const mbgl::Resource &resource, const mbgl::Environment &env, Callback callback);
+    mbgl::Request* request(const mbgl::Resource&, uv_loop_t*, Callback);
     void cancel(mbgl::Request *request);
-    void abort(const mbgl::Environment &env);
 
+    void request(const mbgl::Resource&, Callback);
 
     // visiblity?
     void notify(mbgl::Request *request, const std::shared_ptr<const mbgl::Response> &response);
diff --git a/src/node_map.cpp b/src/node_map.cpp
index e717be869..9b833fe9d 100644
--- a/src/node_map.cpp
+++ b/src/node_map.cpp
@@ -280,7 +280,7 @@ NodeMap::NodeMap(v8::Handle<v8::Object> source_) :
     map(view, fs),
     async(new uv_async_t) {
 
-    map.start(mbgl::Map::Mode::Static);
+    map.start(mbgl::Map::Mode::Still);
 
     NanAssignPersistent(source, source_);
 
diff --git a/test/compare.js b/test/compare.js
index aaac14f36..3e5221de5 100644
--- a/test/compare.js
+++ b/test/compare.js
@@ -12,7 +12,7 @@ module.exports = function compare(actual, expected, diff, t, callback) {
         t.error(err);
     });
 
-    compare.on('exit', function (code) {
+    compare.on('exit', function(code) {
         // The compare program returns 2 on error otherwise 0 if the images are similar or 1 if they are dissimilar.
         if (code === 2) {
             callback(error.trim(), Infinity);
diff --git a/vendor/mbgl b/vendor/mbgl
index 7827d4954..5edb52568 160000
--- a/vendor/mbgl
+++ b/vendor/mbgl
@@ -1 +1 @@
-Subproject commit 7827d4954cea5b4fcfce3f245aae2e8c66e0ccb2
+Subproject commit 5edb52568b8b7a9042ba09a85796d3f560cd1d30