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

[core] Use pass-by-ref in CameraOptions

Browse Source 
Pass-by-const-ref is not always possible because CameraOptions gets its
members modified along the way.

Also fixes a case in Map::jumpTo where Update::Zoom should be called if
zoom is affected.
This commit is contained in:
Bruno de Oliveira Abinader
2015-11-10 12:37:02 +02:00
parent c78e769635
commit 99ac8d8720
4 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mbgl/map/map.cpp
View File

@@ -144,12 +144,12 @@ bool Map::isPanning() const {
#pragma mark -
void Map::jumpTo(CameraOptions options) {
void Map::jumpTo(const CameraOptions& options) {
transform->jumpTo(options);
update(Update::Repaint);
update(options.zoom ? Update::Zoom : Update::Repaint);
}
void Map::easeTo(CameraOptions options) {
void Map::easeTo(const CameraOptions& options) {
transform->easeTo(options);
update(options.zoom ? Update::Zoom : Update::Repaint);
}
@@ -215,7 +215,7 @@ void Map::setLatLngZoom(const LatLng& latLng, double zoom, const Duration& durat
update(Update::Zoom);
}
CameraOptions Map::cameraForLatLngBounds(LatLngBounds bounds, EdgeInsets padding) {
CameraOptions Map::cameraForLatLngBounds(const LatLngBounds& bounds, const EdgeInsets& padding) {
AnnotationSegment segment = {
{bounds.ne.latitude, bounds.sw.longitude},
bounds.sw,
@@ -225,7 +225,7 @@ CameraOptions Map::cameraForLatLngBounds(LatLngBounds bounds, EdgeInsets padding
return cameraForLatLngs(segment, padding);
}
CameraOptions Map::cameraForLatLngs(std::vector<LatLng> latLngs, EdgeInsets padding) {
CameraOptions Map::cameraForLatLngs(const std::vector<LatLng>& latLngs, const EdgeInsets& padding) {
CameraOptions options;
if (latLngs.empty()) {
return options;