diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-21 13:35:34 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-22 08:04:39 -0700 |
| commit | 1520a56813f82bbe875774fdc2b3df26392278d6 (patch) | |
| tree | d8f6ccc10e118bd2be6a954951c037f9c2fc1384 /platform/android/src/style | |
| parent | be7e9bbb8d54c775127f53d793c117c4bf5e2764 (diff) | |
| download | qtlocation-mapboxgl-1520a56813f82bbe875774fdc2b3df26392278d6.tar.gz | |
[all] Promote Style to public API
Diffstat (limited to 'platform/android/src/style')
4 files changed, 6 insertions, 2 deletions
diff --git a/platform/android/src/style/android_conversion.hpp b/platform/android/src/style/android_conversion.hpp index 6327ed96d0..082fe411e2 100644 --- a/platform/android/src/style/android_conversion.hpp +++ b/platform/android/src/style/android_conversion.hpp @@ -2,6 +2,7 @@ #include "value.hpp" +#include <mbgl/util/feature.hpp> #include <mbgl/util/logging.hpp> #include <mbgl/style/conversion.hpp> #include <mbgl/util/optional.hpp> diff --git a/platform/android/src/style/conversion/transition_options.hpp b/platform/android/src/style/conversion/transition_options.hpp index 3614878f43..ae65a32194 100644 --- a/platform/android/src/style/conversion/transition_options.hpp +++ b/platform/android/src/style/conversion/transition_options.hpp @@ -3,6 +3,7 @@ #include "../../conversion/conversion.hpp" #include <jni/jni.hpp> +#include <mbgl/style/transition_options.hpp> #include "../../jni/local_object.hpp" #include "../transition_options.hpp" diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index 965b304dcf..02a1f0be82 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -3,6 +3,7 @@ #include <jni/jni.hpp> +#include <mbgl/style/style.hpp> #include <mbgl/style/transition_options.hpp> #include <mbgl/util/logging.hpp> @@ -53,7 +54,7 @@ namespace android { } // Add layer to map - _map.addLayer(releaseCoreLayer(), before); + _map.getStyle().addLayer(releaseCoreLayer(), before); // Save pointer to the map this->map = &_map; diff --git a/platform/android/src/style/sources/source.cpp b/platform/android/src/style/sources/source.cpp index e0e9bb9870..05f981953a 100644 --- a/platform/android/src/style/sources/source.cpp +++ b/platform/android/src/style/sources/source.cpp @@ -3,6 +3,7 @@ #include <jni/jni.hpp> +#include <mbgl/style/style.hpp> #include <mbgl/util/logging.hpp> // Java -> C++ conversion @@ -55,7 +56,7 @@ namespace android { } // Add source to map - _map.addSource(releaseCoreSource()); + _map.getStyle().addSource(releaseCoreSource()); // Save pointer to the map this->map = &_map; |