summaryrefslogtreecommitdiff
path: root/src/mbgl/style
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-03-09 17:58:33 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-03-09 18:32:20 -0700
commit4d3dcea82c44f36d3b3cc4e284373d98410ae689 (patch)
treee2c7c1389c277420423d832040ab8c07bd638f35 /src/mbgl/style
parentb7f04ee7c231d8165411161ff3f88138945da702 (diff)
downloadqtlocation-mapboxgl-4d3dcea82c44f36d3b3cc4e284373d98410ae689.tar.gz
Revert FeatureType rename
Diffstat (limited to 'src/mbgl/style')
-rw-r--r--src/mbgl/style/filter_expression.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/style/filter_expression.cpp b/src/mbgl/style/filter_expression.cpp
index e5a2e3abc3..ec44b57b55 100644
--- a/src/mbgl/style/filter_expression.cpp
+++ b/src/mbgl/style/filter_expression.cpp
@@ -5,14 +5,14 @@ namespace mbgl {
Value parseFeatureType(const Value& value) {
if (value == std::string("Point")) {
- return Value(uint64_t(GeometryFeatureType::Point));
+ return Value(uint64_t(FeatureType::Point));
} else if (value == std::string("LineString")) {
- return Value(uint64_t(GeometryFeatureType::LineString));
+ return Value(uint64_t(FeatureType::LineString));
} else if (value == std::string("Polygon")) {
- return Value(uint64_t(GeometryFeatureType::Polygon));
+ return Value(uint64_t(FeatureType::Polygon));
} else {
Log::Warning(Event::ParseStyle, "value for $type filter must be Point, LineString, or Polygon");
- return Value(uint64_t(GeometryFeatureType::Unknown));
+ return Value(uint64_t(FeatureType::Unknown));
}
}