From a8191102ea196533de10541375af50fa3f303a49 Mon Sep 17 00:00:00 2001
From: Guardiola31337 <pablo.guardiola@mapbox.com>
Date: Tue, 16 May 2017 10:55:06 +0200
Subject: [WIP] add filter to config.cmake and fix namespace issue

---
 platform/android/config.cmake                    | 2 ++
 platform/android/src/style/conversion/filter.hpp | 3 ++-
 platform/android/src/style/filter.cpp            | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index c111744ed0..087a5ef2f8 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -111,6 +111,8 @@ add_library(mbgl-android STATIC
     platform/android/src/style/conversion/property_value.hpp
     platform/android/src/style/conversion/types.hpp
     platform/android/src/style/conversion/types_string_values.hpp
+    platform/android/src/style/filter.cpp
+    platform/android/src/style/filter.hpp
     platform/android/src/map/camera_position.cpp
     platform/android/src/map/camera_position.hpp
 
diff --git a/platform/android/src/style/conversion/filter.hpp b/platform/android/src/style/conversion/filter.hpp
index f87780fb0f..79e91edbd5 100644
--- a/platform/android/src/style/conversion/filter.hpp
+++ b/platform/android/src/style/conversion/filter.hpp
@@ -32,7 +32,8 @@ inline optional<mbgl::style::Filter> toFilter(jni::JNIEnv& env, jni::Array<jni::
 template <>
 struct Converter<jni::Object<mbgl::android::Filter>, mbgl::style::Filter> {
     Result<jni::Object<mbgl::android::Filter>> operator()(jni::JNIEnv& env, const mbgl::style::Filter& value) const {
-        auto filter = android::Filter::fromFilter(env, value);
+        using namespace mbgl::android;
+        auto filter = Filter::fromFilter(env, value);
 
         return filter;
     }
diff --git a/platform/android/src/style/filter.cpp b/platform/android/src/style/filter.cpp
index d7081183d4..7a05a0056a 100644
--- a/platform/android/src/style/filter.cpp
+++ b/platform/android/src/style/filter.cpp
@@ -2,7 +2,6 @@
 
 namespace mbgl {
 namespace android {
-namespace style {
 
 jni::Object<Filter> Filter::fromFilter(jni::JNIEnv& env, const mbgl::style::Filter&) {
     static auto constructor = Filter::javaClass.template GetConstructor<>(env);
@@ -17,6 +16,5 @@ void Filter::registerNative(jni::JNIEnv& env) {
 jni::Class<Filter> Filter::javaClass;
 
 
-} // namespace style
 } // namespace android
 } // namespace mbgl
\ No newline at end of file
-- 
cgit v1.2.1