Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.5-master

Also reran make style-code and manually discarded anything related to fill extrusion layers.
This commit is contained in:
Minh Nguyễn
2016-12-20 12:41:40 -08:00
153 changed files with 4808 additions and 2364 deletions

View File

@@ -396,6 +396,18 @@ TEST(Map, RemoveImage) {
test::checkImage("test/fixtures/map/remove_icon", test::render(map, test.view));
}
TEST(Map, GetImage) {
MapTest test;
Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
auto decoded = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png"));
auto image = std::make_unique<SpriteImage>(std::move(decoded), 1.0);
map.setStyleJSON(util::read_file("test/fixtures/api/icon_style.json"));
map.addImage("test-icon", std::move(image));
test::checkImage("test/fixtures/map/get_icon", map.getImage("test-icon")->image);
}
TEST(Map, DontLoadUnneededTiles) {
MapTest test;