* 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
93 lines
2.9 KiB
C++
93 lines
2.9 KiB
C++
#include <benchmark/benchmark.h>
|
|
|
|
#include <mbgl/map/map.hpp>
|
|
#include <mbgl/map/map_options.hpp>
|
|
#include <mbgl/gfx/headless_frontend.hpp>
|
|
#include <mbgl/renderer/renderer.hpp>
|
|
#include <mbgl/style/style.hpp>
|
|
#include <mbgl/style/image.hpp>
|
|
#include <mbgl/storage/network_status.hpp>
|
|
#include <mbgl/util/image.hpp>
|
|
#include <mbgl/util/io.hpp>
|
|
#include <mbgl/util/run_loop.hpp>
|
|
|
|
using namespace mbgl;
|
|
|
|
namespace {
|
|
|
|
class QueryBenchmark {
|
|
public:
|
|
QueryBenchmark() {
|
|
NetworkStatus::Set(NetworkStatus::Status::Offline);
|
|
|
|
map.getStyle().loadJSON(util::read_file("benchmark/fixtures/api/style.json"));
|
|
map.jumpTo(CameraOptions().withCenter(LatLng { 40.726989, -73.992857 }).withZoom(15.0)); // Manhattan
|
|
map.getStyle().addImage(std::make_unique<style::Image>("test-icon",
|
|
decodeImage(util::read_file("benchmark/fixtures/api/default_marker.png")), 1.0));
|
|
|
|
frontend.render(map);
|
|
}
|
|
|
|
util::RunLoop loop;
|
|
HeadlessFrontend frontend { { 1000, 1000 }, 1 };
|
|
Map map { frontend, MapObserver::nullObserver(),
|
|
MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize()),
|
|
ResourceOptions().withCachePath("benchmark/fixtures/api/cache.db").withAssetPath(".").withApiKey("foobar") };
|
|
ScreenBox box{{ 0, 0 }, { 1000, 1000 }};
|
|
};
|
|
|
|
} // end namespace
|
|
|
|
static void API_queryPixelsForLatLngs(::benchmark::State& state) {
|
|
std::vector<LatLng> points;
|
|
int count = 10000;
|
|
for (int i = 0; i < count; ++i) {
|
|
points.emplace_back(1, 1);
|
|
}
|
|
QueryBenchmark bench;
|
|
while (state.KeepRunning()) {
|
|
(void)bench.map.pixelsForLatLngs(points);
|
|
}
|
|
}
|
|
|
|
static void API_queryLatLngsForPixels(::benchmark::State& state) {
|
|
std::vector<ScreenCoordinate> points;
|
|
int count = 10000;
|
|
for (int i = 0; i < count; ++i) {
|
|
points.emplace_back(1, 1);
|
|
}
|
|
QueryBenchmark bench;
|
|
while (state.KeepRunning()) {
|
|
(void)bench.map.latLngsForPixels(points);
|
|
}
|
|
}
|
|
|
|
static void API_queryRenderedFeaturesAll(::benchmark::State& state) {
|
|
QueryBenchmark bench;
|
|
|
|
while (state.KeepRunning()) {
|
|
bench.frontend.getRenderer()->queryRenderedFeatures(bench.box, {});
|
|
}
|
|
}
|
|
|
|
static void API_queryRenderedFeaturesLayerFromLowDensity(::benchmark::State& state) {
|
|
QueryBenchmark bench;
|
|
|
|
while (state.KeepRunning()) {
|
|
bench.frontend.getRenderer()->queryRenderedFeatures(bench.box, {{{ "testlayer" }}, {}});
|
|
}
|
|
}
|
|
|
|
static void API_queryRenderedFeaturesLayerFromHighDensity(::benchmark::State& state) {
|
|
QueryBenchmark bench;
|
|
|
|
while (state.KeepRunning()) {
|
|
bench.frontend.getRenderer()->queryRenderedFeatures(bench.box, {{{"road-street" }}, {}});
|
|
}
|
|
}
|
|
BENCHMARK(API_queryPixelsForLatLngs);
|
|
BENCHMARK(API_queryLatLngsForPixels);
|
|
BENCHMARK(API_queryRenderedFeaturesAll)->Iterations(50);
|
|
BENCHMARK(API_queryRenderedFeaturesLayerFromLowDensity);
|
|
BENCHMARK(API_queryRenderedFeaturesLayerFromHighDensity);
|