a1da06cb68
Before this change, GeoJSON tiles data were updated before the corresponding layers were applied, therefore `GeometryTileWorker` parsed new data with the outdated layers. It caused the following render test failure: `mbgl-render-test text-max-width/unlimited regressions/mapbox-gl-native#9976 --recycle-map` Now a GeoJSON tile, which needs relayout, is not parsed until the valid layers are set.
43 lines
1.5 KiB
C++
43 lines
1.5 KiB
C++
#include <mbgl/tile/geojson_tile.hpp>
|
|
#include <mbgl/tile/geojson_tile_data.hpp>
|
|
#include <mbgl/renderer/query.hpp>
|
|
#include <mbgl/renderer/tile_parameters.hpp>
|
|
|
|
namespace mbgl {
|
|
|
|
GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID,
|
|
std::string sourceID_,
|
|
const TileParameters& parameters,
|
|
mapbox::feature::feature_collection<int16_t> features)
|
|
: GeometryTile(overscaledTileID, sourceID_, parameters) {
|
|
updateData(std::move(features));
|
|
}
|
|
|
|
void GeoJSONTile::updateData(mapbox::feature::feature_collection<int16_t> features, bool resetLayers) {
|
|
setData(std::make_unique<GeoJSONTileData>(std::move(features)), resetLayers);
|
|
}
|
|
|
|
void GeoJSONTile::querySourceFeatures(
|
|
std::vector<Feature>& result,
|
|
const SourceQueryOptions& options) {
|
|
|
|
// Ignore the sourceLayer, there is only one
|
|
if (auto tileData = getData()) {
|
|
if (auto layer = tileData->getLayer({})) {
|
|
auto featureCount = layer->featureCount();
|
|
for (std::size_t i = 0; i < featureCount; i++) {
|
|
auto feature = layer->getFeature(i);
|
|
|
|
// Apply filter, if any
|
|
if (options.filter && !(*options.filter)(style::expression::EvaluationContext { static_cast<float>(this->id.overscaledZ), feature.get() })) {
|
|
continue;
|
|
}
|
|
|
|
result.push_back(convertFeature(*feature, id.canonical));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace mbgl
|