summaryrefslogtreecommitdiff
path: root/src/mbgl/tile/geometry_tile_data.hpp
diff options
context:
space:
mode:
authorTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-09-14 14:03:58 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2017-09-14 15:39:09 +0200
commit7702e877b2a61af33354a66d337448ef0f81b8b4 (patch)
tree37cd55170718f6001567d395c37da23ba3f55879 /src/mbgl/tile/geometry_tile_data.hpp
parenta22825e2c31286a11881880881edb86adc249be1 (diff)
downloadqtlocation-mapboxgl-7702e877b2a61af33354a66d337448ef0f81b8b4.tar.gz
Diffstat (limited to 'src/mbgl/tile/geometry_tile_data.hpp')
-rw-r--r--src/mbgl/tile/geometry_tile_data.hpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mbgl/tile/geometry_tile_data.hpp b/src/mbgl/tile/geometry_tile_data.hpp
index 5677db2b16..9673c35c74 100644
--- a/src/mbgl/tile/geometry_tile_data.hpp
+++ b/src/mbgl/tile/geometry_tile_data.hpp
@@ -75,11 +75,9 @@ std::vector<GeometryCollection> classifyRings(const GeometryCollection&);
// Truncate polygon to the largest `maxHoles` inner rings by area.
void limitHoles(GeometryCollection&, uint32_t maxHoles);
-// convert from GeometryTileFeature to Feature (eventually we should eliminate GeometryTileFeature)
-Feature convertFeature(const GeometryTileFeature&, const CanonicalTileID&);
-
-// convert from GeometryTileFeature to Feature without geometry (eventually we should eliminate GeometryTileFeature)
-Feature convertFeatureProperties(const GeometryTileFeature&);
+// convert from GeometryTileFeature to Feature with optional geometry conversion
+// (eventually we should eliminate GeometryTileFeature)
+Feature convertFeature(const GeometryTileFeature&, const CanonicalTileID&, const bool = true);
// Fix up possibly-non-V2-compliant polygon geometry using angus clipper.
// The result is guaranteed to have correctly wound, strictly simple rings.