diff options
Diffstat (limited to 'src/mbgl/style')
| -rw-r--r-- | src/mbgl/style/layers/custom_layer_impl.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/style/source_impl.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/style/layers/custom_layer_impl.cpp b/src/mbgl/style/layers/custom_layer_impl.cpp index a0686e353c..124d6b0ce9 100644 --- a/src/mbgl/style/layers/custom_layer_impl.cpp +++ b/src/mbgl/style/layers/custom_layer_impl.cpp @@ -48,8 +48,8 @@ void CustomLayer::Impl::render(const TransformState& state) const { CustomLayerRenderParameters parameters; - parameters.width = state.getWidth(); - parameters.height = state.getHeight(); + parameters.width = state.getSize().width; + parameters.height = state.getSize().height; parameters.latitude = state.getLatLng().latitude; parameters.longitude = state.getLatLng().longitude; parameters.zoom = state.getZoom(); diff --git a/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp index 68e2feed1b..afaa94878c 100644 --- a/src/mbgl/style/source_impl.cpp +++ b/src/mbgl/style/source_impl.cpp @@ -139,8 +139,8 @@ void Source::Impl::updateTiles(const UpdateParameters& parameters) { if (type != SourceType::Raster && type != SourceType::Annotations && cache.getSize() == 0) { size_t conservativeCacheSize = - ((float)parameters.transformState.getWidth() / util::tileSize) * - ((float)parameters.transformState.getHeight() / util::tileSize) * + ((float)parameters.transformState.getSize().width / util::tileSize) * + ((float)parameters.transformState.getSize().height / util::tileSize) * (parameters.transformState.getMaxZoom() - parameters.transformState.getMinZoom() + 1) * 0.5; cache.setSize(conservativeCacheSize); @@ -202,7 +202,7 @@ std::unordered_map<std::string, std::vector<Feature>> Source::Impl::queryRendere for (const auto& p : parameters.geometry) { queryGeometry.push_back(TileCoordinate::fromScreenCoordinate( - parameters.transformState, 0, { p.x, parameters.transformState.getHeight() - p.y }).p); + parameters.transformState, 0, { p.x, parameters.transformState.getSize().height - p.y }).p); } mapbox::geometry::box<double> box = mapbox::geometry::envelope(queryGeometry); |