[node] Change Map/FileSource relationship to composition

This commit is contained in:
Bruno de Oliveira Abinader
2019-03-12 15:22:48 +02:00
parent fb1b601038
commit 096dea16e3
2 changed files with 27 additions and 12 deletions

View File

@@ -25,10 +25,21 @@ class NodeMapObserver : public mbgl::MapObserver {
void onDidFailLoadingMap(std::exception_ptr) override;
};
class NodeMap;
class NodeFileSource : public mbgl::FileSource {
public:
NodeFileSource(NodeMap*);
std::unique_ptr<mbgl::AsyncRequest> request(const mbgl::Resource&, mbgl::FileSource::Callback) final;
private:
NodeMap* nodeMap;
};
class RenderRequest;
class NodeMap : public Nan::ObjectWrap,
public mbgl::FileSource {
class NodeMap : public Nan::ObjectWrap {
public:
struct RenderOptions;
class RenderWorker;
@@ -78,13 +89,12 @@ public:
static RenderOptions ParseOptions(v8::Local<v8::Object>);
std::unique_ptr<mbgl::AsyncRequest> request(const mbgl::Resource&, mbgl::FileSource::Callback);
const float pixelRatio;
mbgl::MapMode mode;
bool crossSourceCollisions;
NodeThreadPool threadpool;
NodeMapObserver mapObserver;
NodeFileSource fileSource;
std::unique_ptr<mbgl::HeadlessFrontend> frontend;
std::unique_ptr<mbgl::Map> map;
@@ -98,4 +108,4 @@ public:
bool loaded = false;
};
}
} // namespace node_mbgl