Merge remote-tracking branch 'origin/master' into new-labelling

Conflicts:
	src/mbgl/map/source.cpp
	src/mbgl/map/source.hpp
	src/mbgl/map/tile_data.cpp
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/vector_tile_data.cpp
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/text/glyph.hpp
	src/mbgl/text/glyph_store.cpp
	src/mbgl/text/placement.cpp
	test/suite

src/mbgl/map/tile_data.cpp

@@ -1,12 +1,14 @@
 #include <mbgl/map/tile_data.hpp>
+
 #include <mbgl/map/environment.hpp>
 #include <mbgl/map/source.hpp>
 #include <mbgl/map/transform_state.hpp>
-
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/util/worker.hpp>
-#include <mbgl/util/work_request.hpp>
 #include <mbgl/platform/log.hpp>
+#include <mbgl/storage/file_source.hpp>
+#include <mbgl/util/work_request.hpp>
+#include <mbgl/util/worker.hpp>
+
+#include <sstream>
 
 using namespace mbgl;
 
@@ -35,7 +37,9 @@ void TileData::setState(const State& state_) {
     state = state_;
 }
 
-void TileData::request(Worker& worker, float pixelRatio, std::function<void()> callback) {
+void TileData::request(Worker& worker,
+                       float pixelRatio,
+                       const std::function<void()>& callback) {
     std::string url = source.tileURL(id, pixelRatio);
     state = State::loading;
 
@@ -43,7 +47,10 @@ void TileData::request(Worker& worker, float pixelRatio, std::function<void()> c
         req = nullptr;
 
         if (res.status != Response::Successful) {
-            Log::Error(Event::HttpRequest, "[%s] tile loading failed: %s", url.c_str(), res.message.c_str());
+            std::stringstream message;
+            message <<  "Failed to load [" << url << "]: " << res.message;
+            setError(message.str());
+            callback();
             return;
         }
 
@@ -82,3 +89,8 @@ bool TileData::reparse(Worker& worker, std::function<void()> callback) {
     workRequest = worker.send([this] { parse(); endParsing(); }, callback);
     return true;
 }
+
+void TileData::setError(const std::string& message) {
+    error = message;
+    setState(State::obsolete);
+}