summaryrefslogtreecommitdiff
path: root/include/mbgl/util
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-24 17:44:39 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-26 11:57:39 +0300
commit2b834001cca8c2b0552c106dd404da1b238f043b (patch)
tree0380a5255f99fd104999ddde0f4efd49d8ca5213 /include/mbgl/util
parent73a9d33b29fe4be9addf50c07a50de6131a6a002 (diff)
downloadqtlocation-mapboxgl-2b834001cca8c2b0552c106dd404da1b238f043b.tar.gz
[core] type aliases and conversion traits for mapbox::base::Value
Diffstat (limited to 'include/mbgl/util')
-rw-r--r--include/mbgl/util/feature.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/mbgl/util/feature.hpp b/include/mbgl/util/feature.hpp
index 390cc65720..6080976945 100644
--- a/include/mbgl/util/feature.hpp
+++ b/include/mbgl/util/feature.hpp
@@ -3,16 +3,16 @@
#include <mbgl/util/optional.hpp>
#include <mbgl/util/string.hpp>
-#include <mapbox/feature.hpp>
+#include <mapbox/value.hpp>
namespace mbgl {
-using Value = mapbox::feature::value;
-using NullValue = mapbox::feature::null_value_t;
-using PropertyMap = mapbox::feature::property_map;
+using Value = mapbox::base::Value;
+using NullValue = mapbox::base::NullValue;
+using PropertyMap = mapbox::base::ValueObject;
using FeatureIdentifier = mapbox::feature::identifier;
using Feature = mapbox::feature::feature<double>;
-using FeatureState = PropertyMap;
+using FeatureState = mapbox::base::ValueObject;
using FeatureStates = std::unordered_map<std::string, FeatureState>; // <featureID, FeatureState>
using LayerFeatureStates = std::unordered_map<std::string, FeatureStates>; // <sourceLayer, FeatureStates>