* Move asset:// URL handling to DefaultFileSource. * AssetFileSource implements FileSource interface and follows familiar implementation patterns. * Move default implementation to platform/default, zip implementation to platform/android. * Don't bother with modified / expires / etag -- assets are not cached so it doesn't matter. * Don't bother with interleaving individual IO calls on the implementation thread. That adds a lot of complexity for very little benefit.
219 lines
7.1 KiB
C++
219 lines
7.1 KiB
C++
#include "../fixtures/util.hpp"
|
|
|
|
#include <mbgl/annotation/point_annotation.hpp>
|
|
#include <mbgl/annotation/shape_annotation.hpp>
|
|
#include <mbgl/sprite/sprite_image.hpp>
|
|
#include <mbgl/map/map.hpp>
|
|
#include <mbgl/platform/default/headless_display.hpp>
|
|
#include <mbgl/platform/default/headless_view.hpp>
|
|
#include <mbgl/storage/online_file_source.hpp>
|
|
#include <mbgl/util/io.hpp>
|
|
|
|
#include <future>
|
|
#include <vector>
|
|
|
|
using namespace mbgl;
|
|
|
|
std::shared_ptr<SpriteImage> namedMarker(const std::string &name) {
|
|
PremultipliedImage image = decodeImage(util::read_file("test/fixtures/sprites/" + name));
|
|
return std::make_shared<SpriteImage>(image.width, image.height, 1.0, std::string(reinterpret_cast<char*>(image.data.get()), image.size()));
|
|
}
|
|
|
|
namespace {
|
|
|
|
void checkRendering(Map& map, const char * name) {
|
|
test::checkImage(std::string("test/fixtures/annotations/") + name + "/",
|
|
test::render(map), 0.0002, 0.1);
|
|
}
|
|
|
|
} // end namespace
|
|
|
|
TEST(Annotations, PointAnnotation) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
|
|
map.addPointAnnotation(PointAnnotation({ 0, 0 }, "default_marker"));
|
|
|
|
checkRendering(map, "point_annotation");
|
|
}
|
|
|
|
TEST(Annotations, LineAnnotation) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
|
|
AnnotationSegments segments = {{ {{ { 0, 0 }, { 45, 45 } }} }};
|
|
|
|
LineAnnotationProperties properties;
|
|
properties.color = {{ 255, 0, 0, 1 }};
|
|
properties.width = 5;
|
|
|
|
map.addShapeAnnotation(ShapeAnnotation(segments, properties));
|
|
|
|
checkRendering(map, "line_annotation");
|
|
}
|
|
|
|
TEST(Annotations, FillAnnotation) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
|
|
AnnotationSegments segments = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }};
|
|
|
|
FillAnnotationProperties properties;
|
|
properties.color = {{ 255, 0, 0, 1 }};
|
|
|
|
map.addShapeAnnotation(ShapeAnnotation(segments, properties));
|
|
|
|
checkRendering(map, "fill_annotation");
|
|
}
|
|
|
|
TEST(Annotations, StyleSourcedShapeAnnotation) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/annotation.json"), "");
|
|
|
|
AnnotationSegments segments = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }};
|
|
|
|
map.addShapeAnnotation(ShapeAnnotation(segments, "annotation"));
|
|
|
|
checkRendering(map, "style_sourced_shape_annotation");
|
|
}
|
|
|
|
TEST(Annotations, AddMultiple) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
|
|
map.addPointAnnotation(PointAnnotation({ 0, -10 }, "default_marker"));
|
|
|
|
test::render(map);
|
|
|
|
map.addPointAnnotation(PointAnnotation({ 0, 10 }, "default_marker"));
|
|
|
|
checkRendering(map, "add_multiple");
|
|
}
|
|
|
|
TEST(Annotations, NonImmediateAdd) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
|
|
test::render(map);
|
|
|
|
AnnotationSegments segments = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }};
|
|
|
|
FillAnnotationProperties properties;
|
|
properties.color = {{ 255, 0, 0, 1 }};
|
|
|
|
map.addShapeAnnotation(ShapeAnnotation(segments, properties));
|
|
|
|
checkRendering(map, "non_immediate_add");
|
|
}
|
|
|
|
TEST(Annotations, UpdatePoint) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
map.addAnnotationIcon("flipped_marker", namedMarker("default_marker.png"));
|
|
map.addPointAnnotation(PointAnnotation({ 0, 0 }, "flipped_marker"));
|
|
|
|
test::render(map);
|
|
|
|
map.removeAnnotationIcon("flipped_marker");
|
|
map.addAnnotationIcon("flipped_marker", namedMarker("flipped_marker.png"));
|
|
map.update(Update::Annotations);
|
|
|
|
checkRendering(map, "update_point");
|
|
}
|
|
|
|
TEST(Annotations, RemovePoint) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
|
|
uint32_t point = map.addPointAnnotation(PointAnnotation({ 0, 0 }, "default_marker"));
|
|
|
|
test::render(map);
|
|
|
|
map.removeAnnotation(point);
|
|
|
|
checkRendering(map, "remove_point");
|
|
}
|
|
|
|
TEST(Annotations, RemoveShape) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
AnnotationSegments segments = {{ {{ { 0, 0 }, { 45, 45 } }} }};
|
|
|
|
LineAnnotationProperties properties;
|
|
properties.color = {{ 255, 0, 0, 1 }};
|
|
properties.width = 5;
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
uint32_t shape = map.addShapeAnnotation(ShapeAnnotation(segments, properties));
|
|
|
|
test::render(map);
|
|
|
|
map.removeAnnotation(shape);
|
|
|
|
checkRendering(map, "remove_shape");
|
|
}
|
|
|
|
TEST(Annotations, ImmediateRemoveShape) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
Map map(view, fileSource, MapMode::Still);
|
|
|
|
map.removeAnnotation(map.addShapeAnnotation(ShapeAnnotation({}, {})));
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
|
|
test::render(map);
|
|
}
|
|
|
|
TEST(Annotations, SwitchStyle) {
|
|
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
|
HeadlessView view(display, 1);
|
|
OnlineFileSource fileSource(nullptr);
|
|
|
|
Map map(view, fileSource, MapMode::Still);
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
|
|
map.addPointAnnotation(PointAnnotation({ 0, 0 }, "default_marker"));
|
|
|
|
test::render(map);
|
|
|
|
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
|
|
|
|
checkRendering(map, "switch_style");
|
|
}
|