* Refactoring online file source so that tile server configuration is not hardcoded - part 1 * Added default templates * Update from master * Renaming MGLAccountManager to MGLSettings. Passing ResourceOptions and TileServerOptions to relevant classes and method in order to remove mapbox hardocded configuration * Fixing build * Addedm missing theme * Unit tests fixes * Fixing unit tests, adding factory methods for creating predefined configuration. * Fixing mapbox unit tests * Additional unit test fixes * Making MapboxConfiguration default * Making get/set resource options available in all classes that inherits from FileSource * Making get/set resource options available in all classes that inherits from FileSource - part 2 * Fixes for Android * Disable test coverage reports * Disable test coverage reports * Disable test coverage reports * Disable test coverage reports * Removing hardcoded configuration in iOS project - part 1 * Fixing wrong file extension, making use of tile server options. * Use apiKey and MGL_API_KEY everywhere * Just a rename * Re-enabling tests and improving MGLSettings init * Removing mapbox hardcoded configuration, using api key everywhere, implementing JNI conversion for TileServerOptions * Lint issues. * Integrating configurable tile server properties into Android SDK - part 2 * Removing mabox accounts * Exposing multiple configurations to Android SDK - bug fixes * Removing TileServerOptions from public interface - native methods dont work before mapbox-gl library is loaded * Adding support for configurable predefined styles * Migrating predefined styles in test app + cleanup * Parameter fix * Bug fixes * Fixing render test build * Fixing offline tester * Fixing benchmark tool * Fix: typo in method name * Adding code for public access to TileServerOptions * Bug fixes and debug code removal * Fixes for macOS, adding unit tests from MapLibre, removing redundant members from OnlineFileSource * Unit test fixes * MacOS test app - migrating to configurable tile server options, part 1 * Fixing offline maps * Migrating macOS test app to MapTiler * Minor improvements * Putting back apiKey test * Added unit tests for MapTiler configuration * Migrating test resources to MapTiler * minor fix * A few fixes * Fixing macOS tests, removing feedback functionality * Migrating ios test app to MapTiler * Migrating ui tests * UI tests fix * Benchmarking app fix * Cleanup and strings updates * Migrating benchmark app to maptiler * API key injection in benchmark app * Putting back release configuration * Additional tests and fixing issues identified by thread sanitizer. * Removing test filters * Fixes and addressing lint issues * More Maptiler tests + minro fix * Android instrumentation test migration to MapTiler. Exposing missing TileServerOptions in Android SDK. Minor fixes. * No requirements on API key format. * Fixing offline cache test tool * Adding configurable domain name for sources, adding source domain int MapTiler configuration, cleanup * Migrating tests to MapTiler, adding code for canonicalizing URLs, removing mapbox stuff from comments, cleanup * More tests * Updated database size * Lint issues * Fixed test * Updating developer config API key * Fixes for Android, propagaing updated tileServerOptions to native file sources, more tests * Just a few more fixes * Propagating updated settings to file sources + additional unit test * Lint issues * Removing test filter and fixing incorrect uri * Release preparation * macos release notes
115 lines
3.5 KiB
C++
115 lines
3.5 KiB
C++
#include <mbgl/storage/file_source_manager.hpp>
|
|
#include <mbgl/storage/resource.hpp>
|
|
#include <mbgl/storage/resource_options.hpp>
|
|
#include <mbgl/util/async_request.hpp>
|
|
#include <mbgl/util/logging.hpp>
|
|
|
|
#include <atomic>
|
|
|
|
#include "file_source.hpp"
|
|
|
|
namespace mbgl {
|
|
|
|
std::atomic_size_t requestCount{0};
|
|
std::atomic_size_t transferredSize{0};
|
|
std::atomic_bool active{false};
|
|
std::atomic_bool offline{true};
|
|
|
|
ProxyFileSource::ProxyFileSource(std::shared_ptr<FileSource> defaultResourceLoader_, const ResourceOptions& options)
|
|
: defaultResourceLoader(std::move(defaultResourceLoader_)) {
|
|
assert(defaultResourceLoader);
|
|
if (offline) {
|
|
std::shared_ptr<FileSource> dbfs = FileSourceManager::get()->getFileSource(FileSourceType::Database, options);
|
|
dbfs->setProperty(READ_ONLY_MODE_KEY, true);
|
|
}
|
|
}
|
|
|
|
ProxyFileSource::~ProxyFileSource() = default;
|
|
|
|
std::unique_ptr<AsyncRequest> ProxyFileSource::request(const Resource& resource, Callback callback) {
|
|
auto transformed = resource;
|
|
|
|
// If offline, force always loading the resource from the cache
|
|
// so we don't make any network request.
|
|
if (offline) {
|
|
transformed.loadingMethod = Resource::LoadingMethod::CacheOnly;
|
|
}
|
|
|
|
// This is needed for compatibility with the style tests that
|
|
// are using local:// instead of http:// which is the schema
|
|
// we support for cached files.
|
|
if (transformed.url.compare(0, 8, "local://") == 0) {
|
|
transformed.url.replace(0, 8, "http://");
|
|
|
|
if (transformed.kind == Resource::Kind::Tile && transformed.tileData) {
|
|
transformed.tileData->urlTemplate.replace(0, 8, "http://");
|
|
}
|
|
}
|
|
|
|
if (transformed.url.compare(0, 22, "http://localhost:2900/") == 0) {
|
|
transformed.url.replace(0, 22, "http://");
|
|
|
|
if (transformed.kind == Resource::Kind::Tile && transformed.tileData) {
|
|
transformed.tileData->urlTemplate.replace(0, 22, "http://");
|
|
}
|
|
}
|
|
|
|
return defaultResourceLoader->request(transformed, [=](Response response) {
|
|
if (transformed.loadingMethod == Resource::LoadingMethod::CacheOnly && response.noContent) {
|
|
if (transformed.kind == Resource::Kind::Tile && transformed.tileData) {
|
|
mbgl::Log::Info(mbgl::Event::Database,
|
|
"Resource not found in cache: %s (%s)",
|
|
transformed.url.c_str(),
|
|
transformed.tileData->urlTemplate.c_str());
|
|
} else {
|
|
mbgl::Log::Info(mbgl::Event::Database, "Resource not found in cache: %s", transformed.url.c_str());
|
|
}
|
|
}
|
|
|
|
std::size_t size = response.data != nullptr ? response.data->size() : 0;
|
|
if (active) {
|
|
requestCount++;
|
|
transferredSize += size;
|
|
}
|
|
callback(response);
|
|
});
|
|
}
|
|
|
|
void ProxyFileSource::setResourceOptions(ResourceOptions options) {
|
|
resourceOptions = options;
|
|
}
|
|
|
|
ResourceOptions& ProxyFileSource::getResourceOptions() {
|
|
return resourceOptions;
|
|
}
|
|
|
|
|
|
// static
|
|
void ProxyFileSource::setOffline(bool status) {
|
|
offline = status;
|
|
}
|
|
|
|
// static
|
|
void ProxyFileSource::setTrackingActive(bool active_) {
|
|
active = active_;
|
|
requestCount = 0;
|
|
transferredSize = 0;
|
|
}
|
|
|
|
// static
|
|
bool ProxyFileSource::isTrackingActive() {
|
|
return active;
|
|
}
|
|
|
|
// static
|
|
size_t ProxyFileSource::getRequestCount() {
|
|
return requestCount;
|
|
}
|
|
|
|
// static
|
|
size_t ProxyFileSource::getTransferredSize() {
|
|
return transferredSize;
|
|
}
|
|
|
|
} // namespace mbgl
|