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

[ios, macos] Only set snapshotter camera options if camera is valid

Browse Source
This commit is contained in:
Minh Nguyễn
2020-04-23 20:01:45 -07:00
committed by Minh Nguyễn
parent 6c764cbe31
commit f3da2d7053
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/darwin/src/MGLMapSnapshotter.mm
View File

@@ -736,10 +736,18 @@ NSArray<MGLAttributionInfo *> *MGLAttributionInfosFromAttributions(mbgl::MapSnap
if (CLLocationCoordinate2DIsValid(options.camera.centerCoordinate)) {
cameraOptions.center = MGLLatLngFromLocationCoordinate2D(options.camera.centerCoordinate);
}
cameraOptions.bearing = MAX(0, options.camera.heading);
cameraOptions.zoom = MAX(0, options.zoomLevel);
cameraOptions.pitch = MAX(0, options.camera.pitch);
_mbglMapSnapshotter->setCameraOptions(cameraOptions);
if (options.camera.heading >= 0) {
cameraOptions.bearing = MAX(0, options.camera.heading);
}
if (options.zoomLevel >= 0) {
cameraOptions.zoom = MAX(0, options.zoomLevel);
}
if (options.camera.pitch >= 0) {
cameraOptions.pitch = MAX(0, options.camera.pitch);
}
if (cameraOptions != mbgl::CameraOptions()) {
_mbglMapSnapshotter->setCameraOptions(cameraOptions);
}
// Region
if (!MGLCoordinateBoundsIsEmpty(options.coordinateBounds)) {

4
platform/ios/CHANGELOG.md
View File

@@ -8,6 +8,10 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
* Fixed an issue where properties such as `MGLFillStyleLayer.fillColor` and `MGLLineStyleLayer.lineColor` misinterpreted non-opaque `UIColor`s. ([#266](https://github.com/mapbox/mapbox-gl-native-ios/pull/266))
### Other changes
* Fixed an issue where an `MGLMapSnapshotOptions` with an invalid `MGLMapCamera.centerCoordinate`, negative `MGLMapCamera.heading`, negative `MGLMapCamera.pitch`, and negative `MGLMapSnapshotOptions.zoomLevel` resulted in a snapshot centered on Null Island at zoom level 0 even if the style specified a different initial center coordinate or zoom level. ([#280](https://github.com/mapbox/mapbox-gl-native-ios/pull/280))
## 5.8.0
### Styles and rendering

6
platform/macos/CHANGELOG.md
View File

@@ -1,5 +1,11 @@
# Changelog for Mapbox Maps SDK for macOS
## master
### Other changes
* Fixed an issue where an `MGLMapSnapshotOptions` with an invalid `MGLMapCamera.centerCoordinate`, negative `MGLMapCamera.heading`, negative `MGLMapCamera.pitch`, and negative `MGLMapSnapshotOptions.zoomLevel` resulted in a snapshot centered on Null Island at zoom level 0 even if the style specified a different initial center coordinate or zoom level. ([#280](https://github.com/mapbox/mapbox-gl-native-ios/pull/280))
## 0.15.0
### Styles and rendering