diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 12:46:29 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-15 11:28:34 -0700 |
| commit | 41760b5696e71c3d201d94d5c8b2423c1f348446 (patch) | |
| tree | 4483b3e5795410e96dc2629a798cf285528241e2 /src/mbgl/tile/geojson_tile.cpp | |
| parent | 87edff4047ddaf5a49b31c060bfae55d74d6c0cb (diff) | |
| download | qtlocation-mapboxgl-41760b5696e71c3d201d94d5c8b2423c1f348446.tar.gz | |
[core] Use variant<std::string, GeoJSON> in GeoJSON source
Diffstat (limited to 'src/mbgl/tile/geojson_tile.cpp')
| -rw-r--r-- | src/mbgl/tile/geojson_tile.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index f7bf969e7c..9334cf2fec 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -109,11 +109,9 @@ std::unique_ptr<GeoJSONTileData> convertTile(const mapbox::geojsonvt::Tile& tile GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID, std::string sourceID, const style::UpdateParameters& parameters, - mapbox::geojsonvt::GeoJSONVT* geojsonvt) + mapbox::geojsonvt::GeoJSONVT& geojsonvt) : GeometryTile(overscaledTileID, sourceID, parameters.style, parameters.mode) { - if (geojsonvt) { - setData(convertTile(geojsonvt->getTile(id.canonical.z, id.canonical.x, id.canonical.y))); - } + setData(convertTile(geojsonvt.getTile(id.canonical.z, id.canonical.x, id.canonical.y))); } void GeoJSONTile::setNecessity(Necessity) {} |