From baaae99a03202641ae5b8024e57b691fe61a6688 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 5 May 2017 16:31:03 -0700
Subject: [core, android] Factor JSON string conversions

This adds a `convertJSON` template, to be used like:

   Error error
   optional<Foo> foo = convertJSON<Foo>(string, error);

Internally, it parses the string with RapidJSON and then calls `convert<Foo>(parsed, error)`.

While here, rationalize GeoJSON converters and fix error handling for Tileset conversion in OfflineDownload.
---
 cmake/test-files.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmake/test-files.cmake')

diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake
index 51dedb0052..6026374de6 100644
--- a/cmake/test-files.cmake
+++ b/cmake/test-files.cmake
@@ -59,6 +59,7 @@ set(MBGL_TEST_FILES
     test/src/mbgl/test/stub_file_source.hpp
     test/src/mbgl/test/stub_geometry_tile_feature.hpp
     test/src/mbgl/test/stub_layer_observer.hpp
+    test/src/mbgl/test/stub_render_source_observer.hpp
     test/src/mbgl/test/stub_style_observer.hpp
     test/src/mbgl/test/stub_tile_observer.hpp
     test/src/mbgl/test/test.cpp
@@ -100,7 +101,6 @@ set(MBGL_TEST_FILES
     test/style/style_image.test.cpp
     test/style/style_layer.test.cpp
     test/style/style_parser.test.cpp
-    test/style/tile_source.test.cpp
 
     # text
     test/text/glyph_atlas.test.cpp
-- 
cgit v1.2.1