diff options
| -rw-r--r-- | platform/android/src/geojson/conversion/feature.cpp | 3 | ||||
| -rw-r--r-- | platform/android/src/geojson/conversion/geometry.hpp | 24 |
2 files changed, 1 insertions, 26 deletions
diff --git a/platform/android/src/geojson/conversion/feature.cpp b/platform/android/src/geojson/conversion/feature.cpp index 8dff05aa12..3cb6d37b17 100644 --- a/platform/android/src/geojson/conversion/feature.cpp +++ b/platform/android/src/geojson/conversion/feature.cpp @@ -1,5 +1,4 @@ #include "feature.hpp" -#include "geometry.hpp" #include "../../conversion/constant.hpp" #include "../../conversion/conversion.hpp" @@ -161,7 +160,7 @@ Result<jni::Object<android::geojson::Feature>> Converter<jni::Object<android::ge auto properties = jni::Object<gson::JsonObject>(*convert<jni::jobject*>(env, value.properties)); // Convert geometry - auto geometry = *convert<jni::Object<android::geojson::Geometry>>(env, value.geometry); + auto geometry = android::geojson::Geometry::New(env, value.geometry); // Create feature auto feature = android::geojson::Feature::fromGeometry(env, geometry, properties, jid); diff --git a/platform/android/src/geojson/conversion/geometry.hpp b/platform/android/src/geojson/conversion/geometry.hpp deleted file mode 100644 index 242a68df02..0000000000 --- a/platform/android/src/geojson/conversion/geometry.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include <mapbox/geometry.hpp> -#include "../geometry.hpp" -#include <jni/jni.hpp> - -namespace mbgl { -namespace android { -namespace conversion { - -/** - * mapbox::geometry::geometry<T> -> Java GeoJson Geometry - */ -template <class T> -struct Converter<jni::Object<android::geojson::Geometry>, mapbox::geometry::geometry<T>> { - Result<jni::Object<android::geojson::Geometry>> operator()(jni::JNIEnv& env, const mapbox::geometry::geometry<T>& value) const { - return { android::geojson::Geometry::New(env, value) }; - } -}; - - -} // conversion -} // android -} // mbgl |