* 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
160 lines
6.0 KiB
C++
160 lines
6.0 KiB
C++
#include <benchmark/benchmark.h>
|
|
|
|
#include <mbgl/gfx/headless_frontend.hpp>
|
|
#include <mbgl/map/map.hpp>
|
|
#include <mbgl/map/map_observer.hpp>
|
|
#include <mbgl/map/map_options.hpp>
|
|
#include <mbgl/renderer/renderer.hpp>
|
|
#include <mbgl/storage/network_status.hpp>
|
|
#include <mbgl/storage/resource_options.hpp>
|
|
#include <mbgl/style/image.hpp>
|
|
#include <mbgl/style/layers/symbol_layer.hpp>
|
|
#include <mbgl/style/sources/geojson_source.hpp>
|
|
#include <mbgl/style/style.hpp>
|
|
#include <mbgl/util/image.hpp>
|
|
#include <mbgl/util/io.hpp>
|
|
#include <mbgl/util/run_loop.hpp>
|
|
|
|
#include <sstream>
|
|
|
|
using namespace mbgl;
|
|
|
|
namespace {
|
|
|
|
static std::string cachePath { "benchmark/fixtures/api/cache.db" };
|
|
constexpr double pixelRatio { 1.0 };
|
|
constexpr Size size { 1000, 1000 };
|
|
|
|
class RenderBenchmark {
|
|
public:
|
|
RenderBenchmark() {
|
|
NetworkStatus::Set(NetworkStatus::Status::Offline);
|
|
}
|
|
|
|
util::RunLoop loop;
|
|
};
|
|
|
|
void prepare(Map& map, optional<std::string> json = nullopt) {
|
|
map.getStyle().loadJSON(json ? *json : util::read_file("benchmark/fixtures/api/style.json"));
|
|
map.jumpTo(CameraOptions().withCenter(LatLng { 40.726989, -73.992857 }).withZoom(15.0)); // Manhattan
|
|
|
|
auto image = decodeImage(util::read_file("benchmark/fixtures/api/default_marker.png"));
|
|
map.getStyle().addImage(std::make_unique<style::Image>("test-icon", std::move(image), 1.0));
|
|
}
|
|
|
|
void prepare_map2(Map& map, optional<std::string> json = nullopt) {
|
|
map.getStyle().loadJSON(json ? *json : util::read_file("benchmark/fixtures/api/style.json"));
|
|
map.jumpTo(CameraOptions().withCenter(LatLng{41.379800, 2.176810}).withZoom(15.0)); // Barcelona
|
|
|
|
auto image = decodeImage(util::read_file("benchmark/fixtures/api/default_marker.png"));
|
|
map.getStyle().addImage(std::make_unique<style::Image>("test-icon", std::move(image), 1.0));
|
|
}
|
|
|
|
} // end namespace
|
|
|
|
static void API_renderStill_reuse_map(::benchmark::State& state) {
|
|
RenderBenchmark bench;
|
|
HeadlessFrontend frontend { size, pixelRatio };
|
|
Map map { frontend, MapObserver::nullObserver(),
|
|
MapOptions().withMapMode(MapMode::Static).withSize(size).withPixelRatio(pixelRatio),
|
|
ResourceOptions().withCachePath(cachePath).withApiKey("foobar") };
|
|
prepare(map);
|
|
|
|
for (auto _ : state) {
|
|
frontend.render(map);
|
|
}
|
|
}
|
|
|
|
static void API_renderStill_reuse_map_formatted_labels(::benchmark::State& state) {
|
|
RenderBenchmark bench;
|
|
HeadlessFrontend frontend { size, pixelRatio };
|
|
Map map { frontend, MapObserver::nullObserver(),
|
|
MapOptions().withMapMode(MapMode::Static).withSize(size).withPixelRatio(pixelRatio),
|
|
ResourceOptions().withCachePath(cachePath).withApiKey("foobar") };
|
|
prepare(map, util::read_file("benchmark/fixtures/api/style_formatted_labels.json"));
|
|
|
|
for (auto _ : state) {
|
|
frontend.render(map);
|
|
}
|
|
}
|
|
|
|
static void API_renderStill_reuse_map_switch_styles(::benchmark::State& state) {
|
|
RenderBenchmark bench;
|
|
HeadlessFrontend frontend { size, pixelRatio };
|
|
Map map { frontend, MapObserver::nullObserver(),
|
|
MapOptions().withMapMode(MapMode::Static).withSize(size).withPixelRatio(pixelRatio),
|
|
ResourceOptions().withCachePath(cachePath).withApiKey("foobar") };
|
|
|
|
for (auto _ : state) {
|
|
prepare(map, { "{}" });
|
|
frontend.render(map);
|
|
prepare(map);
|
|
frontend.render(map);
|
|
}
|
|
}
|
|
|
|
static void API_renderStill_recreate_map(::benchmark::State& state) {
|
|
RenderBenchmark bench;
|
|
|
|
for (auto _ : state) {
|
|
HeadlessFrontend frontend { size, pixelRatio };
|
|
Map map { frontend, MapObserver::nullObserver(),
|
|
MapOptions().withMapMode(MapMode::Static).withSize(size).withPixelRatio(pixelRatio),
|
|
ResourceOptions().withCachePath(cachePath).withApiKey("foobar") };
|
|
prepare(map);
|
|
frontend.render(map);
|
|
}
|
|
}
|
|
|
|
static void API_renderStill_recreate_map_2(::benchmark::State& state) {
|
|
RenderBenchmark bench;
|
|
|
|
for (auto _ : state) {
|
|
HeadlessFrontend frontend{size, pixelRatio};
|
|
Map map{frontend,
|
|
MapObserver::nullObserver(),
|
|
MapOptions().withMapMode(MapMode::Static).withSize(size).withPixelRatio(pixelRatio),
|
|
ResourceOptions().withCachePath(cachePath).withApiKey("foobar")};
|
|
prepare_map2(map);
|
|
frontend.render(map);
|
|
}
|
|
}
|
|
|
|
static void API_renderStill_multiple_sources(::benchmark::State& state) {
|
|
using namespace mbgl::style;
|
|
RenderBenchmark bench;
|
|
HeadlessFrontend frontend{size, pixelRatio};
|
|
Map map{frontend,
|
|
MapObserver::nullObserver(),
|
|
MapOptions().withMapMode(MapMode::Static).withSize(size).withPixelRatio(pixelRatio),
|
|
ResourceOptions().withCachePath(cachePath).withApiKey("foobar")};
|
|
prepare(map);
|
|
auto& style = map.getStyle();
|
|
const int kSourcesCount = 50;
|
|
const int kLayersCount = 50;
|
|
for (int i = 0; i < kSourcesCount; ++i) {
|
|
std::ostringstream sourceOss;
|
|
sourceOss << "GeoJSONSource" << i;
|
|
std::string sourceId{sourceOss.str()};
|
|
auto source = std::make_unique<GeoJSONSource>(sourceId);
|
|
style.addSource(std::move(source));
|
|
for (int j = 0; j < kLayersCount; ++j) {
|
|
std::ostringstream layerOss;
|
|
layerOss << sourceId << '#' << j;
|
|
auto layer = std::make_unique<SymbolLayer>(layerOss.str(), sourceId);
|
|
style.addLayer(std::move(layer));
|
|
}
|
|
}
|
|
|
|
for (auto _ : state) {
|
|
frontend.render(map);
|
|
}
|
|
}
|
|
|
|
BENCHMARK(API_renderStill_reuse_map)->Unit(benchmark::kMillisecond)->Iterations(50);
|
|
BENCHMARK(API_renderStill_reuse_map_formatted_labels)->Unit(benchmark::kMillisecond)->Iterations(50);
|
|
BENCHMARK(API_renderStill_reuse_map_switch_styles)->Unit(benchmark::kMillisecond)->Iterations(50);
|
|
BENCHMARK(API_renderStill_recreate_map)->Unit(benchmark::kMillisecond)->Iterations(50);
|
|
BENCHMARK(API_renderStill_recreate_map_2)->Unit(benchmark::kMillisecond)->Iterations(50);
|
|
BENCHMARK(API_renderStill_multiple_sources)->Unit(benchmark::kMillisecond)->Iterations(50);
|