tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mbgl/map/map_context.cpp
View File

@@ -21,6 +21,7 @@
#include <mbgl/util/texture_pool.hpp>
#include <mbgl/util/exception.hpp>
#include <mbgl/util/string.hpp>
#include <mbgl/util/mapbox.hpp>
#include <algorithm>
@@ -114,7 +115,8 @@ void MapContext::setStyleURL(const std::string& url) {
styleRequest = nullptr;
if (res.error) {
if (res.error->reason == Response::Error::Reason::NotFound && styleURL.find("mapbox://") == 0) {
if (res.error->reason == Response::Error::Reason::NotFound &&
util::mapbox::isMapboxURL(styleURL)) {
Log::Error(Event::Setup, "style %s could not be found or is an incompatible legacy map or style", styleURL.c_str());
} else {
Log::Error(Event::Setup, "loading style failed: %s", res.error->message.c_str());