* 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
108 lines
3.8 KiB
C++
108 lines
3.8 KiB
C++
#include <mbgl/test/util.hpp>
|
|
#include <mbgl/test/fake_file_source.hpp>
|
|
#include <mbgl/tile/vector_tile.hpp>
|
|
#include <mbgl/tile/vector_tile_data.hpp>
|
|
#include <mbgl/tile/tile_loader_impl.hpp>
|
|
#include <mbgl/storage/resource_options.hpp>
|
|
|
|
#include <mbgl/util/run_loop.hpp>
|
|
#include <mbgl/map/transform.hpp>
|
|
#include <mbgl/style/style.hpp>
|
|
#include <mbgl/style/layers/symbol_layer.hpp>
|
|
#include <mbgl/renderer/tile_parameters.hpp>
|
|
#include <mbgl/renderer/buckets/symbol_bucket.hpp>
|
|
#include <mbgl/renderer/query.hpp>
|
|
#include <mbgl/geometry/feature_index.hpp>
|
|
#include <mbgl/annotation/annotation_manager.hpp>
|
|
#include <mbgl/renderer/image_manager.hpp>
|
|
#include <mbgl/text/glyph_manager.hpp>
|
|
|
|
#include <memory>
|
|
|
|
using namespace mbgl;
|
|
|
|
class VectorTileTest {
|
|
public:
|
|
std::shared_ptr<FileSource> fileSource = std::make_shared<FakeFileSource>(ResourceOptions::Default());
|
|
TransformState transformState;
|
|
util::RunLoop loop;
|
|
style::Style style{fileSource, 1};
|
|
AnnotationManager annotationManager { style };
|
|
ImageManager imageManager;
|
|
GlyphManager glyphManager;
|
|
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
|
|
|
|
TileParameters tileParameters{1.0,
|
|
MapDebugOptions(),
|
|
transformState,
|
|
fileSource,
|
|
MapMode::Continuous,
|
|
annotationManager.makeWeakPtr(),
|
|
imageManager,
|
|
glyphManager,
|
|
0};
|
|
};
|
|
|
|
TEST(VectorTile, setError) {
|
|
VectorTileTest test;
|
|
VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
|
|
tile.setError(std::make_exception_ptr(std::runtime_error("test")));
|
|
EXPECT_FALSE(tile.isRenderable());
|
|
EXPECT_TRUE(tile.isLoaded());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
}
|
|
|
|
TEST(VectorTile, onError) {
|
|
VectorTileTest test;
|
|
VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
|
|
tile.onError(std::make_exception_ptr(std::runtime_error("test")), 0);
|
|
|
|
EXPECT_FALSE(tile.isRenderable());
|
|
EXPECT_TRUE(tile.isLoaded());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
}
|
|
|
|
TEST(VectorTile, Issue8542) {
|
|
VectorTileTest test;
|
|
VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
|
|
|
|
// Query before data is set
|
|
std::vector<Feature> result;
|
|
tile.querySourceFeatures(result, { { {"layer"} }, {} });
|
|
}
|
|
|
|
TEST(VectorTileData, ParseResults) {
|
|
VectorTileData data(std::make_shared<std::string>(util::read_file("test/fixtures/map/issue12432/0-0-0.mvt")));
|
|
|
|
std::vector<std::string> layerNames = data.layerNames();
|
|
ASSERT_EQ(layerNames.size(), 2u);
|
|
ASSERT_EQ(layerNames.at(0), "admin");
|
|
ASSERT_EQ(layerNames.at(1), "water");
|
|
|
|
ASSERT_FALSE(data.getLayer("invalid"));
|
|
|
|
std::unique_ptr<GeometryTileLayer> layer = data.getLayer("admin");
|
|
ASSERT_EQ(layer->getName(), "admin");
|
|
ASSERT_EQ(layer->featureCount(), 17154u);
|
|
|
|
try {
|
|
layer->getFeature(17154u);
|
|
ASSERT_TRUE(false) << "should throw: feature index is out of range.";
|
|
} catch (const std::out_of_range&) {
|
|
ASSERT_TRUE(true);
|
|
} catch (...) { // needed for iOS when MBGL_WITH_RTTI=OFF
|
|
ASSERT_TRUE(true);
|
|
}
|
|
|
|
std::unique_ptr<GeometryTileFeature> feature = layer->getFeature(0u);
|
|
ASSERT_EQ(feature->getType(), mbgl::FeatureType::LineString);
|
|
ASSERT_TRUE(feature->getID().is<uint64_t>());
|
|
ASSERT_EQ(feature->getID().get<uint64_t>(), 1u);
|
|
|
|
const std::unordered_map<std::string, Value>& properties = feature->getProperties();
|
|
ASSERT_EQ(properties.size(), 3u);
|
|
ASSERT_EQ(properties.at("disputed"), *feature->getValue("disputed"));
|
|
|
|
ASSERT_EQ(feature->getValue("invalid"), nullopt);
|
|
}
|