[core] Move setStyleJSON/URL to Style; add Map::setStyle

2017-06-20 17:12:58 -07:00
parent 1520a56813
commit 40e4755621
25 changed files with 221 additions and 209 deletions
--- a/test/api/query.test.cpp
+++ b/test/api/query.test.cpp
@@ -20,7 +20,7 @@ namespace {
 class QueryTest {
 public:
    QueryTest() {
-        map.setStyleJSON(util::read_file("test/fixtures/api/query_style.json"));
+        map.getStyle().loadJSON(util::read_file("test/fixtures/api/query_style.json"));
        map.getStyle().addImage(std::make_unique<style::Image>("test-icon",
            decodeImage(util::read_file("test/fixtures/sprites/default_marker.png")), 1.0));