d62ff400c6
* 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
52 lines
1.8 KiB
C++
52 lines
1.8 KiB
C++
#include <mbgl/gfx/headless_frontend.hpp>
|
|
#include <mbgl/map/map.hpp>
|
|
#include <mbgl/map/map_impl.hpp>
|
|
#include <mbgl/storage/file_source.hpp>
|
|
#include <mbgl/storage/resource.hpp>
|
|
#include <mbgl/style/style.hpp>
|
|
#include <mbgl/test/map_adapter.hpp>
|
|
#include <mbgl/util/io.hpp>
|
|
#include <mbgl/util/run_loop.hpp>
|
|
#include <unordered_map>
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
using namespace mbgl;
|
|
|
|
class SyncFileSource : public FileSource {
|
|
public:
|
|
std::unique_ptr<AsyncRequest> request(const Resource& resource, FileSource::Callback callback) override {
|
|
Response response;
|
|
auto it = assets.find(resource.url);
|
|
if (it == assets.end()) {
|
|
response.error = std::make_unique<Response::Error>(
|
|
Response::Error::Reason::NotFound, std::string{ "Not Found: " } + resource.url);
|
|
} else {
|
|
response.data = it->second;
|
|
}
|
|
callback(response);
|
|
return nullptr;
|
|
}
|
|
|
|
bool canRequest(const Resource&) const override { return true; }
|
|
|
|
void add(std::string const& key, std::string const& data) {
|
|
assets.emplace(key, std::make_shared<std::string>(data));
|
|
};
|
|
|
|
private:
|
|
std::unordered_map<std::string, std::shared_ptr<std::string>> assets;
|
|
};
|
|
|
|
TEST(SyncFileSource, LoadSyncRender) {
|
|
util::RunLoop loop;
|
|
auto fs = std::make_shared<SyncFileSource>();
|
|
fs->add("maptiler://maps/streets",
|
|
util::read_file("test/fixtures/resources/source_vector.json"));
|
|
fs->add("maptiler://sprites/streets/sprite",
|
|
util::read_file("test/fixtures/resources/sprite.png"));
|
|
HeadlessFrontend frontend{ { 512, 512 }, 1.0 };
|
|
MapAdapter map{ frontend, MapObserver::nullObserver(), fs, MapOptions() };
|
|
map.getStyle().loadJSON(util::read_file("test/fixtures/resources/style_vector.json"));
|
|
}
|