diff options
| author | Anand Thakker <github@anandthakker.net> | 2017-10-16 16:10:28 -0400 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-10-16 16:32:53 -0700 |
| commit | b8654b3b04599988f1f7a519853e98d4ca54cfd0 (patch) | |
| tree | c51053801e9835ea9de1ef2f3272a6ebc6605a51 /include | |
| parent | e43e2aa3d700cb086e8de0e1c07a6623a192bfe0 (diff) | |
| download | qtlocation-mapboxgl-b8654b3b04599988f1f7a519853e98d4ca54cfd0.tar.gz | |
[core] Move SourceType to the 'style' namespace
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/storage/offline.hpp | 6 | ||||
| -rw-r--r-- | include/mbgl/style/types.hpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp index 117dd0591b..ef4a499e83 100644 --- a/include/mbgl/storage/offline.hpp +++ b/include/mbgl/storage/offline.hpp @@ -30,15 +30,15 @@ public: OfflineTilePyramidRegionDefinition(std::string, LatLngBounds, double, double, float); /* Private */ - std::vector<CanonicalTileID> tileCover(SourceType, uint16_t tileSize, const Range<uint8_t>& zoomRange) const; - uint64_t tileCount(SourceType, uint16_t tileSize, const Range<uint8_t>& zoomRange) const; + std::vector<CanonicalTileID> tileCover(style::SourceType, uint16_t tileSize, const Range<uint8_t>& zoomRange) const; + uint64_t tileCount(style::SourceType, uint16_t tileSize, const Range<uint8_t>& zoomRange) const; const std::string styleURL; const LatLngBounds bounds; const double minZoom; const double maxZoom; const float pixelRatio; private: - Range<uint8_t> coveringZoomRange(SourceType, uint16_t tileSize, const Range<uint8_t>& zoomRange) const; + Range<uint8_t> coveringZoomRange(style::SourceType, uint16_t tileSize, const Range<uint8_t>& zoomRange) const; }; /* diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index ec7358de8c..2ed95f08b8 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -4,7 +4,9 @@ namespace mbgl { -// TODO: should be in public source.hpp header and style namespace +namespace style { + +// TODO: should be in public source.hpp header enum class SourceType : uint8_t { Vector, Raster, @@ -14,8 +16,6 @@ enum class SourceType : uint8_t { Image }; -namespace style { - enum class VisibilityType : bool { Visible, None, |