summaryrefslogtreecommitdiff
path: root/src/mbgl/tile
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r--src/mbgl/tile/custom_geometry_tile.cpp2
-rw-r--r--src/mbgl/tile/geojson_tile.cpp3
-rw-r--r--src/mbgl/tile/geometry_tile.cpp5
-rw-r--r--src/mbgl/tile/geometry_tile_data.cpp4
-rw-r--r--src/mbgl/tile/raster_dem_tile.cpp27
-rw-r--r--src/mbgl/tile/raster_dem_tile.hpp2
-rw-r--r--src/mbgl/tile/raster_dem_tile_worker.cpp9
-rw-r--r--src/mbgl/tile/raster_dem_tile_worker.hpp4
-rw-r--r--src/mbgl/tile/raster_tile.cpp27
-rw-r--r--src/mbgl/tile/raster_tile.hpp2
-rw-r--r--src/mbgl/tile/raster_tile_worker.cpp7
-rw-r--r--src/mbgl/tile/raster_tile_worker.hpp4
-rw-r--r--src/mbgl/tile/vector_tile.cpp14
-rw-r--r--src/mbgl/tile/vector_tile.hpp2
14 files changed, 58 insertions, 54 deletions
diff --git a/src/mbgl/tile/custom_geometry_tile.cpp b/src/mbgl/tile/custom_geometry_tile.cpp
index 660dcf64d4..e13b16a4f1 100644
--- a/src/mbgl/tile/custom_geometry_tile.cpp
+++ b/src/mbgl/tile/custom_geometry_tile.cpp
@@ -17,7 +17,7 @@ CustomGeometryTile::CustomGeometryTile(const OverscaledTileID& overscaledTileID,
const TileParameters& parameters,
Immutable<style::CustomGeometrySource::TileOptions> options_,
ActorRef<style::CustomTileLoader> loader_)
- : GeometryTile(overscaledTileID, sourceID_, parameters),
+ : GeometryTile(overscaledTileID, std::move(sourceID_), parameters),
necessity(TileNecessity::Optional),
options(std::move(options_)),
loader(std::move(loader_)),
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index 65a9d80aec..0b37510978 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -3,13 +3,14 @@
#include <mbgl/style/sources/geojson_source.hpp>
#include <mbgl/tile/geojson_tile.hpp>
#include <mbgl/tile/geojson_tile_data.hpp>
+#include <utility>
namespace mbgl {
GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID,
std::string sourceID_,
const TileParameters& parameters,
std::shared_ptr<style::GeoJSONData> data_)
- : GeometryTile(overscaledTileID, sourceID_, parameters) {
+ : GeometryTile(overscaledTileID, std::move(sourceID_), parameters) {
updateData(std::move(data_), false /*needsRelayout*/);
}
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 92b0a1fa9a..306c95baab 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -22,6 +22,7 @@
#include <mbgl/util/logging.hpp>
#include <mbgl/gfx/upload_pass.hpp>
+#include <utility>
namespace mbgl {
@@ -176,7 +177,7 @@ void GeometryTile::markObsolete() {
void GeometryTile::setError(std::exception_ptr err) {
loaded = true;
- observer->onTileError(*this, err);
+ observer->onTileError(*this, std::move(err));
}
void GeometryTile::setData(std::unique_ptr<const GeometryTileData> data_) {
@@ -257,7 +258,7 @@ void GeometryTile::onError(std::exception_ptr err, const uint64_t resultCorrelat
if (resultCorrelationID == correlationID) {
pending = false;
}
- observer->onTileError(*this, err);
+ observer->onTileError(*this, std::move(err));
}
void GeometryTile::onGlyphsAvailable(GlyphMap glyphs) {
diff --git a/src/mbgl/tile/geometry_tile_data.cpp b/src/mbgl/tile/geometry_tile_data.cpp
index d30875ab3b..472b07739b 100644
--- a/src/mbgl/tile/geometry_tile_data.cpp
+++ b/src/mbgl/tile/geometry_tile_data.cpp
@@ -224,7 +224,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
}
return result;
},
- [&](const Polygon<double> polygon) -> GeometryCollection {
+ [&](const Polygon<double>& polygon) -> GeometryCollection {
GeometryCollection result;
result.reserve(polygon.size());
for (const auto& ring : polygon) {
@@ -237,7 +237,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
}
return result;
},
- [&](const MultiPolygon<double> polygons) -> GeometryCollection {
+ [&](const MultiPolygon<double>& polygons) -> GeometryCollection {
GeometryCollection result;
result.reserve(polygons.size());
for (const auto& pg : polygons) {
diff --git a/src/mbgl/tile/raster_dem_tile.cpp b/src/mbgl/tile/raster_dem_tile.cpp
index c092809130..6d0c89048f 100644
--- a/src/mbgl/tile/raster_dem_tile.cpp
+++ b/src/mbgl/tile/raster_dem_tile.cpp
@@ -1,15 +1,16 @@
#include <mbgl/tile/raster_dem_tile.hpp>
-#include <mbgl/tile/raster_dem_tile_worker.hpp>
-#include <mbgl/tile/tile_observer.hpp>
-#include <mbgl/tile/tile_loader_impl.hpp>
-#include <mbgl/style/source.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/response.hpp>
+#include <mbgl/actor/scheduler.hpp>
+#include <mbgl/renderer/buckets/hillshade_bucket.hpp>
#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/renderer/tile_render_data.hpp>
-#include <mbgl/renderer/buckets/hillshade_bucket.hpp>
-#include <mbgl/actor/scheduler.hpp>
+#include <mbgl/storage/resource.hpp>
+#include <mbgl/storage/response.hpp>
+#include <mbgl/style/source.hpp>
+#include <mbgl/tile/raster_dem_tile_worker.hpp>
+#include <mbgl/tile/tile_loader_impl.hpp>
+#include <mbgl/tile/tile_observer.hpp>
+#include <utility>
namespace mbgl {
@@ -42,15 +43,15 @@ std::unique_ptr<TileRenderData> RasterDEMTile::createRenderData() {
void RasterDEMTile::setError(std::exception_ptr err) {
loaded = true;
- observer->onTileError(*this, err);
+ observer->onTileError(*this, std::move(err));
}
void RasterDEMTile::setMetadata(optional<Timestamp> modified_, optional<Timestamp> expires_) {
- modified = modified_;
- expires = expires_;
+ modified = std::move(modified_);
+ expires = std::move(expires_);
}
-void RasterDEMTile::setData(std::shared_ptr<const std::string> data) {
+void RasterDEMTile::setData(const std::shared_ptr<const std::string>& data) {
pending = true;
++correlationID;
worker.self().invoke(&RasterDEMTileWorker::parse, data, correlationID, encoding);
@@ -71,7 +72,7 @@ void RasterDEMTile::onError(std::exception_ptr err, const uint64_t resultCorrela
if (resultCorrelationID == correlationID) {
pending = false;
}
- observer->onTileError(*this, err);
+ observer->onTileError(*this, std::move(err));
}
bool RasterDEMTile::layerPropertiesUpdated(const Immutable<style::LayerProperties>&) {
diff --git a/src/mbgl/tile/raster_dem_tile.hpp b/src/mbgl/tile/raster_dem_tile.hpp
index e6a6b6f9f5..0cfaedd88d 100644
--- a/src/mbgl/tile/raster_dem_tile.hpp
+++ b/src/mbgl/tile/raster_dem_tile.hpp
@@ -71,7 +71,7 @@ public:
void setError(std::exception_ptr);
void setMetadata(optional<Timestamp> modified, optional<Timestamp> expires);
- void setData(std::shared_ptr<const std::string> data);
+ void setData(const std::shared_ptr<const std::string>& data);
bool layerPropertiesUpdated(const Immutable<style::LayerProperties>& layerProperties) override;
diff --git a/src/mbgl/tile/raster_dem_tile_worker.cpp b/src/mbgl/tile/raster_dem_tile_worker.cpp
index 7338e578c7..92fe3d919a 100644
--- a/src/mbgl/tile/raster_dem_tile_worker.cpp
+++ b/src/mbgl/tile/raster_dem_tile_worker.cpp
@@ -6,11 +6,12 @@
namespace mbgl {
-RasterDEMTileWorker::RasterDEMTileWorker(ActorRef<RasterDEMTileWorker>, ActorRef<RasterDEMTile> parent_)
- : parent(std::move(parent_)) {
-}
+RasterDEMTileWorker::RasterDEMTileWorker(const ActorRef<RasterDEMTileWorker>&, ActorRef<RasterDEMTile> parent_)
+ : parent(std::move(parent_)) {}
-void RasterDEMTileWorker::parse(std::shared_ptr<const std::string> data, uint64_t correlationID, Tileset::DEMEncoding encoding) {
+void RasterDEMTileWorker::parse(const std::shared_ptr<const std::string>& data,
+ uint64_t correlationID,
+ Tileset::DEMEncoding encoding) {
if (!data) {
parent.invoke(&RasterDEMTile::onParsed, nullptr, correlationID); // No data; empty tile.
return;
diff --git a/src/mbgl/tile/raster_dem_tile_worker.hpp b/src/mbgl/tile/raster_dem_tile_worker.hpp
index 5a8222bc2d..cce569c41e 100644
--- a/src/mbgl/tile/raster_dem_tile_worker.hpp
+++ b/src/mbgl/tile/raster_dem_tile_worker.hpp
@@ -12,9 +12,9 @@ class RasterDEMTile;
class RasterDEMTileWorker {
public:
- RasterDEMTileWorker(ActorRef<RasterDEMTileWorker>, ActorRef<RasterDEMTile>);
+ RasterDEMTileWorker(const ActorRef<RasterDEMTileWorker>&, ActorRef<RasterDEMTile>);
- void parse(std::shared_ptr<const std::string> data, uint64_t correlationID, Tileset::DEMEncoding encoding);
+ void parse(const std::shared_ptr<const std::string>& data, uint64_t correlationID, Tileset::DEMEncoding encoding);
private:
ActorRef<RasterDEMTile> parent;
diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp
index 50a0d700b8..697e26d936 100644
--- a/src/mbgl/tile/raster_tile.cpp
+++ b/src/mbgl/tile/raster_tile.cpp
@@ -1,15 +1,16 @@
#include <mbgl/tile/raster_tile.hpp>
-#include <mbgl/tile/raster_tile_worker.hpp>
-#include <mbgl/tile/tile_observer.hpp>
-#include <mbgl/tile/tile_loader_impl.hpp>
-#include <mbgl/style/source.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/response.hpp>
+#include <mbgl/actor/scheduler.hpp>
+#include <mbgl/renderer/buckets/raster_bucket.hpp>
#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/renderer/tile_render_data.hpp>
-#include <mbgl/renderer/buckets/raster_bucket.hpp>
-#include <mbgl/actor/scheduler.hpp>
+#include <mbgl/storage/resource.hpp>
+#include <mbgl/storage/response.hpp>
+#include <mbgl/style/source.hpp>
+#include <mbgl/tile/raster_tile_worker.hpp>
+#include <mbgl/tile/tile_loader_impl.hpp>
+#include <mbgl/tile/tile_observer.hpp>
+#include <utility>
namespace mbgl {
@@ -31,15 +32,15 @@ std::unique_ptr<TileRenderData> RasterTile::createRenderData() {
void RasterTile::setError(std::exception_ptr err) {
loaded = true;
- observer->onTileError(*this, err);
+ observer->onTileError(*this, std::move(err));
}
void RasterTile::setMetadata(optional<Timestamp> modified_, optional<Timestamp> expires_) {
- modified = modified_;
- expires = expires_;
+ modified = std::move(modified_);
+ expires = std::move(expires_);
}
-void RasterTile::setData(std::shared_ptr<const std::string> data) {
+void RasterTile::setData(const std::shared_ptr<const std::string>& data) {
pending = true;
++correlationID;
worker.self().invoke(&RasterTileWorker::parse, data, correlationID);
@@ -60,7 +61,7 @@ void RasterTile::onError(std::exception_ptr err, const uint64_t resultCorrelatio
if (resultCorrelationID == correlationID) {
pending = false;
}
- observer->onTileError(*this, err);
+ observer->onTileError(*this, std::move(err));
}
bool RasterTile::layerPropertiesUpdated(const Immutable<style::LayerProperties>&) {
diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp
index 49ca3239ef..3ff05d2f9d 100644
--- a/src/mbgl/tile/raster_tile.hpp
+++ b/src/mbgl/tile/raster_tile.hpp
@@ -27,7 +27,7 @@ public:
void setError(std::exception_ptr);
void setMetadata(optional<Timestamp> modified, optional<Timestamp> expires);
- void setData(std::shared_ptr<const std::string> data);
+ void setData(const std::shared_ptr<const std::string>& data);
bool layerPropertiesUpdated(const Immutable<style::LayerProperties>& layerProperties) override;
diff --git a/src/mbgl/tile/raster_tile_worker.cpp b/src/mbgl/tile/raster_tile_worker.cpp
index 4afa876429..2a4cfeaf31 100644
--- a/src/mbgl/tile/raster_tile_worker.cpp
+++ b/src/mbgl/tile/raster_tile_worker.cpp
@@ -6,11 +6,10 @@
namespace mbgl {
-RasterTileWorker::RasterTileWorker(ActorRef<RasterTileWorker>, ActorRef<RasterTile> parent_)
- : parent(std::move(parent_)) {
-}
+RasterTileWorker::RasterTileWorker(const ActorRef<RasterTileWorker>&, ActorRef<RasterTile> parent_)
+ : parent(std::move(parent_)) {}
-void RasterTileWorker::parse(std::shared_ptr<const std::string> data, uint64_t correlationID) {
+void RasterTileWorker::parse(const std::shared_ptr<const std::string>& data, uint64_t correlationID) {
if (!data) {
parent.invoke(&RasterTile::onParsed, nullptr, correlationID); // No data; empty tile.
return;
diff --git a/src/mbgl/tile/raster_tile_worker.hpp b/src/mbgl/tile/raster_tile_worker.hpp
index 520973c3c3..44e12557ca 100644
--- a/src/mbgl/tile/raster_tile_worker.hpp
+++ b/src/mbgl/tile/raster_tile_worker.hpp
@@ -11,9 +11,9 @@ class RasterTile;
class RasterTileWorker {
public:
- RasterTileWorker(ActorRef<RasterTileWorker>, ActorRef<RasterTile>);
+ RasterTileWorker(const ActorRef<RasterTileWorker>&, ActorRef<RasterTile>);
- void parse(std::shared_ptr<const std::string> data, uint64_t correlationID);
+ void parse(const std::shared_ptr<const std::string>& data, uint64_t correlationID);
private:
ActorRef<RasterTile> parent;
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index 0756d3e526..e3e7a2dff8 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -1,7 +1,8 @@
+#include <mbgl/renderer/tile_parameters.hpp>
+#include <mbgl/tile/tile_loader_impl.hpp>
#include <mbgl/tile/vector_tile.hpp>
#include <mbgl/tile/vector_tile_data.hpp>
-#include <mbgl/tile/tile_loader_impl.hpp>
-#include <mbgl/renderer/tile_parameters.hpp>
+#include <utility>
namespace mbgl {
@@ -9,19 +10,18 @@ VectorTile::VectorTile(const OverscaledTileID& id_,
std::string sourceID_,
const TileParameters& parameters,
const Tileset& tileset)
- : GeometryTile(id_, sourceID_, parameters), loader(*this, id_, parameters, tileset) {
-}
+ : GeometryTile(id_, std::move(sourceID_), parameters), loader(*this, id_, parameters, tileset) {}
void VectorTile::setNecessity(TileNecessity necessity) {
loader.setNecessity(necessity);
}
void VectorTile::setMetadata(optional<Timestamp> modified_, optional<Timestamp> expires_) {
- modified = modified_;
- expires = expires_;
+ modified = std::move(modified_);
+ expires = std::move(expires_);
}
-void VectorTile::setData(std::shared_ptr<const std::string> data_) {
+void VectorTile::setData(const std::shared_ptr<const std::string>& data_) {
GeometryTile::setData(data_ ? std::make_unique<VectorTileData>(data_) : nullptr);
}
diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp
index 7dae414fef..205fd642f0 100644
--- a/src/mbgl/tile/vector_tile.hpp
+++ b/src/mbgl/tile/vector_tile.hpp
@@ -17,7 +17,7 @@ public:
void setNecessity(TileNecessity) final;
void setMetadata(optional<Timestamp> modified, optional<Timestamp> expires);
- void setData(std::shared_ptr<const std::string> data);
+ void setData(const std::shared_ptr<const std::string>& data);
private:
TileLoader<VectorTile> loader;
View Lorry Controller Status