diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2016-10-19 17:52:43 +0300 |
---|---|---|
committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2016-10-20 11:41:24 +0300 |
commit | 5527887c4bb1299fd2351e1a0c7550fab5f39bef (patch) | |
tree | bc1a0ce9d7a5878c6b2dc6072def90ea0045f315 /platform/android | |
parent | 6d504358807fc851282cfe6a1e7baf2032b7fb91 (diff) | |
download | qtlocation-mapboxgl-5527887c4bb1299fd2351e1a0c7550fab5f39bef.tar.gz |
[android] geojson source - remove explicit repaint requests
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/src/style/sources/geojson_source.cpp | 6 | ||||
-rw-r--r-- | platform/android/src/style/sources/source.cpp | 13 | ||||
-rw-r--r-- | platform/android/src/style/sources/source.hpp | 1 |
3 files changed, 0 insertions, 20 deletions
diff --git a/platform/android/src/style/sources/geojson_source.cpp b/platform/android/src/style/sources/geojson_source.cpp index cb03cc06c6..234dccb315 100644 --- a/platform/android/src/style/sources/geojson_source.cpp +++ b/platform/android/src/style/sources/geojson_source.cpp @@ -36,17 +36,11 @@ namespace android { //Update the core source source.as<mbgl::style::GeoJSONSource>()->GeoJSONSource::setGeoJSON(*converted); - - //Repaint - updateStyle(false); } void GeoJSONSource::setURL(jni::JNIEnv& env, jni::String url) { //Update the core source source.as<mbgl::style::GeoJSONSource>()->GeoJSONSource::setURL(jni::Make<std::string>(env, url)); - - //Repaint - updateStyle(false); } jni::Class<GeoJSONSource> GeoJSONSource::javaClass; diff --git a/platform/android/src/style/sources/source.cpp b/platform/android/src/style/sources/source.cpp index 4f306e7c54..f3daa777d1 100644 --- a/platform/android/src/style/sources/source.cpp +++ b/platform/android/src/style/sources/source.cpp @@ -35,19 +35,6 @@ namespace android { return jni::Make<jni::String>(env, source.getID()); } - void Source::updateStyle(jni::jboolean updateClasses) { - //Update the style only if attached - if (ownedSource == nullptr) { - Update flags = mbgl::Update::RecalculateStyle; - if(updateClasses) { - flags = flags | mbgl::Update::Classes; - } - map->update(flags); - } else { - mbgl::Log::Debug(mbgl::Event::JNI, "Not updating as source is not attached to map (yet)"); - } - } - std::unique_ptr<mbgl::style::Source> Source::releaseCoreSource() { assert(ownedSource != nullptr); return std::move(ownedSource); diff --git a/platform/android/src/style/sources/source.hpp b/platform/android/src/style/sources/source.hpp index 7fdc43a833..5794cd4e62 100644 --- a/platform/android/src/style/sources/source.hpp +++ b/platform/android/src/style/sources/source.hpp @@ -40,7 +40,6 @@ public: std::unique_ptr<mbgl::style::Source> releaseCoreSource(); protected: - void updateStyle(jni::jboolean); std::unique_ptr<mbgl::style::Source> ownedSource; mbgl::style::Source& source; |