From bf8b24fa8d30df374ee36be781b6a572036187b9 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Tue, 6 Nov 2018 16:11:47 +0200
Subject: [build] Update to geometry v1.0.0

---
 include/mbgl/annotation/annotation.hpp |  2 +-
 include/mbgl/util/feature.hpp          | 12 ++++++------
 include/mbgl/util/geometry.hpp         |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp
index 8c099141c4..fb9ea5eba2 100644
--- a/include/mbgl/annotation/annotation.hpp
+++ b/include/mbgl/annotation/annotation.hpp
@@ -12,7 +12,7 @@
 
 namespace mbgl {
 
-using AnnotationID = uint32_t;
+using AnnotationID = uint64_t;
 using AnnotationIDs = std::vector<AnnotationID>;
 
 class SymbolAnnotation {
diff --git a/include/mbgl/util/feature.hpp b/include/mbgl/util/feature.hpp
index 4eeceda944..9e2286018c 100644
--- a/include/mbgl/util/feature.hpp
+++ b/include/mbgl/util/feature.hpp
@@ -2,15 +2,15 @@
 
 #include <mbgl/util/optional.hpp>
 
-#include <mapbox/geometry/feature.hpp>
+#include <mapbox/feature.hpp>
 
 namespace mbgl {
 
-using Value = mapbox::geometry::value;
-using NullValue = mapbox::geometry::null_value_t;
-using PropertyMap = mapbox::geometry::property_map;
-using FeatureIdentifier = mapbox::geometry::identifier;
-using Feature = mapbox::geometry::feature<double>;
+using Value = mapbox::feature::value;
+using NullValue = mapbox::feature::null_value_t;
+using PropertyMap = mapbox::feature::property_map;
+using FeatureIdentifier = mapbox::feature::identifier;
+using Feature = mapbox::feature::feature<double>;
 
 template <class T>
 optional<T> numericValue(const Value& value) {
diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp
index a28c59a47d..17384f2224 100644
--- a/include/mbgl/util/geometry.hpp
+++ b/include/mbgl/util/geometry.hpp
@@ -13,6 +13,8 @@ enum class FeatureType : uint8_t {
     Polygon = 3
 };
 
+using EmptyGeometry = mapbox::geometry::empty;
+
 template <class T>
 using Point = mapbox::geometry::point<T>;
 
@@ -43,6 +45,7 @@ Point<S> convertPoint(const Point<T>& p) {
 }
 
 struct ToFeatureType {
+    FeatureType operator()(const EmptyGeometry&) const { return FeatureType::Unknown; }
     template <class T>
     FeatureType operator()(const Point<T> &) const { return FeatureType::Point; }
     template <class T>
-- 
cgit v1.2.1