diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-05 16:31:03 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-08 13:48:57 -0700 |
| commit | baaae99a03202641ae5b8024e57b691fe61a6688 (patch) | |
| tree | 459045e56197696aa1312594f1e452b03931775d /test/fixtures | |
| parent | e34d8b5c802186008e49364668e4a7bd5668d0fd (diff) | |
| download | qtlocation-mapboxgl-baaae99a03202641ae5b8024e57b691fe61a6688.tar.gz | |
[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.
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/style_parser/tilejson.raster.json | 8 | ||||
| -rw-r--r-- | test/fixtures/style_parser/tilejson.vector.json | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/test/fixtures/style_parser/tilejson.raster.json b/test/fixtures/style_parser/tilejson.raster.json deleted file mode 100644 index 3fc819f292..0000000000 --- a/test/fixtures/style_parser/tilejson.raster.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "minzoom": 0, - "maxzoom": 15, - "center": [ 1, 2, 3 ], - "bounds": [ 4, 5, 6, 7 ], - "attribution": "attribution", - "tiles": [ "http://a.tiles.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.png?access_token=key" ] -} diff --git a/test/fixtures/style_parser/tilejson.vector.json b/test/fixtures/style_parser/tilejson.vector.json deleted file mode 100644 index 9144bd502c..0000000000 --- a/test/fixtures/style_parser/tilejson.vector.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "minzoom": 0, - "maxzoom": 15, - "center": [ 1, 2, 3 ], - "bounds": [ 4, 5, 6, 7 ], - "attribution": "attribution", - "tiles": [ "http://a.tiles.mapbox.com/v4/mapbox.streets/{z}/{x}/{y}.vector.pbf?access_token=key" ] -} |