tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Make TransformState LatLngBounds optional

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2017-06-01 00:58:03 +03:00
parent 8935845171
commit 99cfbacdfb
7 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mbgl/map/transform_state.cpp
View File

@@ -142,12 +142,14 @@ double TransformState::getZoomFraction() const {
#pragma mark - Bounds
void TransformState::setLatLngBounds(const LatLngBounds& bounds_) {
bounds = bounds_;
setLatLngZoom(getLatLng(LatLng::Unwrapped), getZoom());
void TransformState::setLatLngBounds(optional<LatLngBounds> bounds_) {
if (bounds_ != bounds) {
bounds = bounds_;
setLatLngZoom(getLatLng(LatLng::Unwrapped), getZoom());
}
}
LatLngBounds TransformState::getLatLngBounds() const {
optional<LatLngBounds> TransformState::getLatLngBounds() const {
return bounds;
}
@@ -350,8 +352,11 @@ void TransformState::moveLatLng(const LatLng& latLng, const ScreenCoordinate& an
setLatLngZoom(Projection::unproject(centerCoord + latLngCoord - anchorCoord, scale), getZoom());
}
void TransformState::setLatLngZoom(const LatLng &latLng, double zoom) {
const LatLng constrained = bounds.constrain(latLng);
void TransformState::setLatLngZoom(const LatLng& latLng, double zoom) {
LatLng constrained = latLng;
if (bounds) {
constrained = bounds->constrain(latLng);
}
double newScale = zoomScale(zoom);
const double newWorldSize = newScale * util::tileSize;