diff options
| author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-10-02 18:44:02 -0700 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-10-10 16:53:14 -0700 |
| commit | f028525df704681e97004a8c9a5e67da5b3efa95 (patch) | |
| tree | 5335cceddc23c24bc51694eefb5404950049401d | |
| parent | f71f20dd2265ad6b588a9b679a94a0a1990575ef (diff) | |
| download | qtlocation-mapboxgl-f028525df704681e97004a8c9a5e67da5b3efa95.tar.gz | |
Build fix: CustomTile::setTileData::data shadows GeometryTile::data
| -rw-r--r-- | src/mbgl/tile/custom_tile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/tile/custom_tile.cpp b/src/mbgl/tile/custom_tile.cpp index c462e95d0f..db9efaab95 100644 --- a/src/mbgl/tile/custom_tile.cpp +++ b/src/mbgl/tile/custom_tile.cpp @@ -30,7 +30,7 @@ CustomTile::~CustomTile() { void CustomTile::setTileData(const CanonicalTileID&, const mapbox::geojson::geojson& geoJSON) { - auto data = mapbox::geometry::feature_collection<int16_t>(); + auto featureData = mapbox::geometry::feature_collection<int16_t>(); if (geoJSON.is<FeatureCollection>() && !geoJSON.get<FeatureCollection>().empty()) { const double scale = util::EXTENT / options.tileSize; @@ -40,9 +40,9 @@ void CustomTile::setTileData(const CanonicalTileID&, const mapbox::geojson::geoj vtOptions.buffer = std::round(scale * options.buffer); vtOptions.tolerance = scale * options.tolerance; auto geojsonVt = std::make_unique<mapbox::geojsonvt::GeoJSONVT>(geoJSON, vtOptions); - data = geojsonVt->getTile(id.canonical.z, id.canonical.x, id.canonical.y).features; + featureData = geojsonVt->getTile(id.canonical.z, id.canonical.x, id.canonical.y).features; } - setData(std::make_unique<GeoJSONTileData>(std::move(data))); + setData(std::make_unique<GeoJSONTileData>(std::move(featureData))); } void CustomTile::setNecessity(Necessity newNecessity) { |