diff options
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/sources/raster_source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/sources/raster_source_impl.cpp | 8 | ||||
-rw-r--r-- | src/mbgl/style/sources/raster_source_impl.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/sources/vector_source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/sources/vector_source_impl.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/sources/vector_source_impl.hpp | 5 |
6 files changed, 7 insertions, 18 deletions
diff --git a/src/mbgl/style/sources/raster_source.cpp b/src/mbgl/style/sources/raster_source.cpp index 2d08e4be80..b4fbe22ae1 100644 --- a/src/mbgl/style/sources/raster_source.cpp +++ b/src/mbgl/style/sources/raster_source.cpp @@ -65,7 +65,7 @@ void RasterSource::loadDescription(FileSource& fileSource) { } util::mapbox::canonicalizeTileset(*tileset, url, getType(), getTileSize()); - bool changed = impl().getTileset() != *tileset; + bool changed = impl().tileset != *tileset; baseImpl = makeMutable<Impl>(impl(), *tileset); loaded = true; diff --git a/src/mbgl/style/sources/raster_source_impl.cpp b/src/mbgl/style/sources/raster_source_impl.cpp index 4db25aafd1..4201fd0578 100644 --- a/src/mbgl/style/sources/raster_source_impl.cpp +++ b/src/mbgl/style/sources/raster_source_impl.cpp @@ -10,18 +10,14 @@ RasterSource::Impl::Impl(SourceType sourceType, std::string id_, uint16_t tileSi RasterSource::Impl::Impl(const Impl& other, Tileset tileset_) : Source::Impl(other), - tileSize(other.tileSize), - tileset(std::move(tileset_)) { + tileset(std::move(tileset_)), + tileSize(other.tileSize) { } uint16_t RasterSource::Impl::getTileSize() const { return tileSize; } -optional<Tileset> RasterSource::Impl::getTileset() const { - return tileset; -} - optional<std::string> RasterSource::Impl::getAttribution() const { if (!tileset) { return {}; diff --git a/src/mbgl/style/sources/raster_source_impl.hpp b/src/mbgl/style/sources/raster_source_impl.hpp index 96f59a2159..bb58455140 100644 --- a/src/mbgl/style/sources/raster_source_impl.hpp +++ b/src/mbgl/style/sources/raster_source_impl.hpp @@ -11,14 +11,14 @@ public: Impl(SourceType sourceType, std::string id, uint16_t tileSize); Impl(const Impl&, Tileset); - optional<Tileset> getTileset() const; uint16_t getTileSize() const; optional<std::string> getAttribution() const final; + const optional<Tileset> tileset; + private: uint16_t tileSize; - optional<Tileset> tileset; }; } // namespace style diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp index d141d291e1..8fa694e4d0 100644 --- a/src/mbgl/style/sources/vector_source.cpp +++ b/src/mbgl/style/sources/vector_source.cpp @@ -62,7 +62,7 @@ void VectorSource::loadDescription(FileSource& fileSource) { } util::mapbox::canonicalizeTileset(*tileset, url, getType(), util::tileSize); - bool changed = impl().getTileset() != *tileset; + bool changed = impl().tileset != *tileset; baseImpl = makeMutable<Impl>(impl(), *tileset); loaded = true; diff --git a/src/mbgl/style/sources/vector_source_impl.cpp b/src/mbgl/style/sources/vector_source_impl.cpp index b06f0557bf..8f85a41ddb 100644 --- a/src/mbgl/style/sources/vector_source_impl.cpp +++ b/src/mbgl/style/sources/vector_source_impl.cpp @@ -12,10 +12,6 @@ VectorSource::Impl::Impl(const Impl& other, Tileset tileset_) tileset(std::move(tileset_)) { } -optional<Tileset> VectorSource::Impl::getTileset() const { - return tileset; -} - optional<std::string> VectorSource::Impl::getAttribution() const { if (!tileset) { return {}; diff --git a/src/mbgl/style/sources/vector_source_impl.hpp b/src/mbgl/style/sources/vector_source_impl.hpp index 5e559b9266..4526fbe356 100644 --- a/src/mbgl/style/sources/vector_source_impl.hpp +++ b/src/mbgl/style/sources/vector_source_impl.hpp @@ -11,12 +11,9 @@ public: Impl(std::string id); Impl(const Impl&, Tileset); - optional<Tileset> getTileset() const; - optional<std::string> getAttribution() const final; -private: - optional<Tileset> tileset; + const optional<Tileset> tileset; }; } // namespace style |