summaryrefslogtreecommitdiff
path: root/src/mbgl/geometry
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2017-11-13 11:12:03 -0800
committerChris Loer <chris.loer@mapbox.com>2017-11-17 10:05:15 -0800
commitc39232a89f1feb18454d88f2908f5cbef306b065 (patch)
tree07589ccc9f4d694688d46367b8c6338660fbf687 /src/mbgl/geometry
parent8cfeae9e458aa156e190617f378a4456c7047129 (diff)
downloadqtlocation-mapboxgl-c39232a89f1feb18454d88f2908f5cbef306b065.tar.gz
[core] Cleanup in response to review comments.
Diffstat (limited to 'src/mbgl/geometry')
-rw-r--r--src/mbgl/geometry/feature_index.hpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mbgl/geometry/feature_index.hpp b/src/mbgl/geometry/feature_index.hpp
index 07dc1b1558..e95bb94da6 100644
--- a/src/mbgl/geometry/feature_index.hpp
+++ b/src/mbgl/geometry/feature_index.hpp
@@ -25,21 +25,17 @@ public:
, sourceLayerName(std::move(sourceLayerName_))
, bucketName(std::move(bucketName_))
, sortIndex(sortIndex_)
- , z(0)
- , x(0)
- , y(0)
+ , tileID(0, 0, 0)
{}
IndexedSubfeature(std::size_t index_, std::string sourceLayerName_, std::string bucketName_, size_t sortIndex_,
- std::string sourceID_, uint8_t z_, uint32_t x_, uint32_t y_)
+ std::string sourceID_, CanonicalTileID tileID_)
: index(index_)
, sourceLayerName(std::move(sourceLayerName_))
, bucketName(std::move(bucketName_))
, sortIndex(std::move(sortIndex_))
, sourceID(std::move(sourceID_))
- , z(z_)
- , x(x_)
- , y(y_)
+ , tileID(std::move(tileID_))
{}
size_t index;
@@ -49,9 +45,7 @@ public:
// Only used for symbol features
std::string sourceID;
- uint8_t z;
- uint32_t x;
- uint32_t y;
+ CanonicalTileID tileID;
};
class FeatureIndex {