[core] Coordinate is now GeometryCoordinate

Also introduced GeometryCoordinates (vector of GeometryCoordinate
items), to better cope with GeometryCollection.

3 files changed, 6 insertions, 3 deletions

diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index d8eabf00a2..fceae19619 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -51,7 +51,7 @@ std::unique_ptr<GeoJSONTile> convertTile(const mapbox::geojsonvt::Tile& tile) {
 
     if (tile) {
         std::vector<std::shared_ptr<const GeoJSONTileFeature>> features;
-        std::vector<Coordinate> line;
+        GeometryCoordinates line;
 
         for (auto& feature : tile.features) {
             const FeatureType featureType =
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 5cb2f96fdc..13333dab53 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -24,7 +24,10 @@ enum class FeatureType : uint8_t {
     Polygon = 3
 };
 
-typedef std::vector<std::vector<Coordinate>> GeometryCollection;
+// Normalized vector tile coordinates.
+using GeometryCoordinate  = vec2<int16_t>;
+using GeometryCoordinates = std::vector<GeometryCoordinate>;
+using GeometryCollection  = std::vector<GeometryCoordinates>;
 
 class GeometryTileFeature : private util::noncopyable {
 public:
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index 9e35debbff..8b58ade169 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -94,7 +94,7 @@ GeometryCollection VectorTileFeature::getGeometries() const {
     GeometryCollection lines;
 
     lines.emplace_back();
-    std::vector<Coordinate>* line = &lines.back();
+    GeometryCoordinates* line = &lines.back();
 
     while (data.data < data.end) {
         if (length == 0) {