[core] unify URL prefix detection (asset:// and mapbox://)

This commit is contained in:
Konstantin Käfer
2016-01-08 12:14:39 +01:00
parent b6fca67089
commit bc309d84d7
6 changed files with 18 additions and 12 deletions

View File

@@ -14,21 +14,13 @@
#include <mbgl/util/async_task.hpp>
#include <mbgl/util/noncopyable.hpp>
#include <mbgl/util/timer.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
#include <mbgl/util/url.hpp>
#include <algorithm>
#include <cassert>
#include <set>
#include <unordered_map>
namespace algo = boost::algorithm;
namespace mbgl {
class RequestBase;
@@ -299,7 +291,7 @@ void OnlineFileSource::Impl::startRealRequest(OnlineFileRequestImpl& request) {
reschedule(request);
};
if (algo::starts_with(request.resource.url, "asset://")) {
if (util::isAssetURL(request.resource.url)) {
request.realRequest =
assetContext->createRequest(request.resource.url, callback, assetRoot);
} else {