summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorartemp <artem@mapnik.org>2014-10-29 14:35:58 -0400
committerartemp <artem@mapnik.org>2014-10-29 14:37:13 -0400
commit6622a07ad88c7ca2eb34db66cc46f416f7b5286f (patch)
treeeb42b5f18872a1c3a8c6179e1e029c05cb85630f /include
parent2607a755afd347eba0c1422b77603b8ddcb097c6 (diff)
downloadqtlocation-mapboxgl-6622a07ad88c7ca2eb34db66cc46f416f7b5286f.tar.gz
simplify - remove before/afterParse and create Parser on stack in worker thread
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/map/tile_data.hpp2
-rw-r--r--include/mbgl/map/vector_tile_data.hpp6
2 files changed, 0 insertions, 8 deletions
diff --git a/include/mbgl/map/tile_data.hpp b/include/mbgl/map/tile_data.hpp
index b83f0316e0..70297c7f34 100644
--- a/include/mbgl/map/tile_data.hpp
+++ b/include/mbgl/map/tile_data.hpp
@@ -53,9 +53,7 @@ public:
}
// Override this in the child class.
- virtual void beforeParse();
virtual void parse() = 0;
- virtual void afterParse();
virtual void render(Painter &painter, util::ptr<StyleLayer> layer_desc, const mat4 &matrix) = 0;
virtual bool hasData(StyleLayer const& layer_desc) const = 0;
diff --git a/include/mbgl/map/vector_tile_data.hpp b/include/mbgl/map/vector_tile_data.hpp
index 1fbacab3da..9f611fd69c 100644
--- a/include/mbgl/map/vector_tile_data.hpp
+++ b/include/mbgl/map/vector_tile_data.hpp
@@ -28,10 +28,7 @@ class VectorTileData : public TileData {
public:
VectorTileData(Tile::ID id, Map &map, const util::ptr<SourceInfo> &source);
~VectorTileData();
-
- virtual void beforeParse();
virtual void parse();
- virtual void afterParse();
virtual void render(Painter &painter, util::ptr<StyleLayer> layer_desc, const mat4 &matrix);
virtual bool hasData(StyleLayer const& layer_desc) const;
@@ -49,9 +46,6 @@ protected:
// Holds the buckets of this tile.
// They contain the location offsets in the buffers stored above
std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
-
- std::unique_ptr<TileParser> parser;
-
public:
const float depth;
};