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

Merge branch 'release-ios-v3.1.0'

Browse Source
This commit is contained in:
Minh Nguyễn
2016-02-24 09:06:43 -08:00
parent 662edea020 f74900e704
commit 17f44d7bd9
18 changed files with 204 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,12 @@ double TransformState::getNorthOrientationAngle() const {
return angleOrientation;
}
#pragma mark - Constrain mode
ConstrainMode TransformState::getConstrainMode() const {
return constrainMode;
}
#pragma mark - Position
LatLng TransformState::getLatLng() const {
@@ -354,8 +360,10 @@ void TransformState::constrain(double& scale_, double& x_, double& y_) const {
x_ = std::max(-max_x, std::min(x_, max_x));
}
double max_y = (scale_ * util::tileSize - (rotatedNorth() ? width : height)) / 2;
y_ = std::max(-max_y, std::min(y_, max_y));
if (constrainMode != ConstrainMode::None) {
double max_y = (scale_ * util::tileSize - (rotatedNorth() ? width : height)) / 2;
y_ = std::max(-max_y, std::min(y_, max_y));
}
}
void TransformState::moveLatLng(const LatLng& latLng, const PrecisionPoint& anchor) {