* 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
120 lines
4.0 KiB
C++
120 lines
4.0 KiB
C++
#pragma once
|
|
|
|
#include <mbgl/storage/resource_transform.hpp>
|
|
#include <mbgl/storage/response.hpp>
|
|
#include <mbgl/storage/resource_options.hpp>
|
|
|
|
#include <mapbox/compatibility/value.hpp>
|
|
|
|
#include <functional>
|
|
#include <memory>
|
|
|
|
namespace mbgl {
|
|
|
|
class AsyncRequest;
|
|
class Resource;
|
|
|
|
// TODO: Rename to ResourceProviderType
|
|
enum FileSourceType : uint8_t {
|
|
Asset,
|
|
// TODO: split to separate types
|
|
// - Cache for fast KV store (FASTER, LevelDB, RocksDB)
|
|
// - Database for read-only offline use-cases
|
|
Database,
|
|
FileSystem,
|
|
Network,
|
|
Mbtiles,
|
|
// Resource loader acts as a proxy and has logic
|
|
// for request delegation to Asset, Cache, and other
|
|
// file sources.
|
|
ResourceLoader
|
|
};
|
|
|
|
// TODO: Rename to ResourceProvider to avoid confusion with
|
|
// GeoJSONSource, RasterSource, VectorSource, CustomGeometrySource and other *Sources.
|
|
class FileSource {
|
|
public:
|
|
FileSource& operator=(const FileSource&) = delete;
|
|
virtual ~FileSource() = default;
|
|
|
|
using Callback = std::function<void (Response)>;
|
|
|
|
// Request a resource. The callback will be called asynchronously, in the same
|
|
// thread as the request was made. This thread must have an active RunLoop. The
|
|
// request may be cancelled before completion by releasing the returned AsyncRequest.
|
|
// If the request is cancelled before the callback is executed, the callback will
|
|
// not be executed.
|
|
virtual std::unique_ptr<AsyncRequest> request(const Resource&, Callback) = 0;
|
|
|
|
// Allows to forward response from one source to another.
|
|
// Optionally, callback can be provided to receive notification for forward
|
|
// operation.
|
|
//
|
|
// NOLINTNEXTLINE(performance-unnecessary-value-param)
|
|
virtual void forward(const Resource&, const Response&, std::function<void()>) {}
|
|
|
|
// When a file source supports consulting a local cache only, it must return true.
|
|
// Cache-only requests are requests that aren't as urgent, but could be useful, e.g.
|
|
// to cover part of the map while loading. The FileSource should only do cheap actions to
|
|
// retrieve the data, e.g. load it from a cache, but not from the internet.
|
|
virtual bool supportsCacheOnlyRequests() const { return false; }
|
|
|
|
// Checks whether a resource could be requested from this file source.
|
|
virtual bool canRequest(const Resource&) const = 0;
|
|
|
|
/*
|
|
* Pause file request activity.
|
|
*
|
|
* If pause is called then no revalidation or network request activity
|
|
* will occur.
|
|
*/
|
|
virtual void pause() {}
|
|
|
|
/*
|
|
* Resume file request activity.
|
|
*
|
|
* Calling resume will unpause the file source and process any tasks that
|
|
* expired while the file source was paused.
|
|
*/
|
|
virtual void resume() {}
|
|
|
|
/*
|
|
* Generic property setter / getter methods.
|
|
*/
|
|
virtual void setProperty(const std::string&, const mapbox::base::Value&){};
|
|
virtual mapbox::base::Value getProperty(const std::string&) const { return {}; };
|
|
|
|
// When supported, sets the modifier of the requested resources.
|
|
virtual void setResourceTransform(ResourceTransform) {} // NOLINT(performance-unnecessary-value-param)
|
|
|
|
// sets the resource options
|
|
virtual void setResourceOptions(ResourceOptions) = 0;
|
|
// gets the resource options
|
|
virtual ResourceOptions getResourceOptions() = 0;
|
|
|
|
protected:
|
|
FileSource() = default;
|
|
};
|
|
|
|
// Properties that may be supported by online file sources:
|
|
|
|
// Property name to set / get an access token.
|
|
// type: std::string
|
|
constexpr const char* API_KEY_KEY = "api-tkey";
|
|
|
|
// Property name to set / get base url.
|
|
// type: std::string
|
|
constexpr const char* API_BASE_URL_KEY = "api-base-url";
|
|
|
|
// Property name to set / get maximum number of concurrent requests.
|
|
// type: unsigned
|
|
constexpr const char* MAX_CONCURRENT_REQUESTS_KEY = "max-concurrent-requests";
|
|
|
|
// Properties that may be supported by database file sources:
|
|
|
|
// Property to set database mode. When set, database opens in read-only mode; database opens in read-write-create mode
|
|
// otherwise. type: bool
|
|
constexpr const char* READ_ONLY_MODE_KEY = "read-only-mode";
|
|
|
|
} // namespace mbgl
|