summaryrefslogtreecommitdiff
path: root/android/cpp
diff options
context:
space:
mode:
authorNicholas Hallahan <nick@theoutpost.io>2015-07-13 17:32:05 -0700
committerNicholas Hallahan <nick@theoutpost.io>2015-07-13 17:32:05 -0700
commit7efa69ff24a05d4972c38308feb30f005b972a04 (patch)
tree6bafef5c30b4f57d04831e410bbbaaecc443fd01 /android/cpp
parent92501e3b41338780fd9d00de36b0560b87bd30a5 (diff)
downloadqtlocation-mapboxgl-7efa69ff24a05d4972c38308feb30f005b972a04.tar.gz
Refactored PointAnnotation to be called Markers a la Google Maps
Diffstat (limited to 'android/cpp')
-rw-r--r--android/cpp/jni.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp
index f04ed94b3f..7b905598cf 100644
--- a/android/cpp/jni.cpp
+++ b/android/cpp/jni.cpp
@@ -434,8 +434,8 @@ void JNICALL nativeSetLatLng(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, j
nativeMapView->getMap().setLatLng(mbgl::LatLng(latitude, longitude), std::chrono::milliseconds(duration));
}
-void JNICALL nativeAddAnnotation(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jobject latLng) {
- mbgl::Log::Debug(mbgl::Event::JNI, "nativeAddAnnotation");
+void JNICALL nativeAddMarker(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jobject latLng) {
+ mbgl::Log::Debug(mbgl::Event::JNI, "nativeAddMarker");
assert(nativeMapViewPtr != 0);
NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
@@ -997,8 +997,8 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
{"nativeMoveBy", "(JDDJ)V", reinterpret_cast<void *>(&nativeMoveBy)},
{"nativeSetLatLng", "(JLcom/mapbox/mapboxgl/geometry/LatLng;J)V",
reinterpret_cast<void *>(&nativeSetLatLng)},
- {"nativeAddAnnotation", "(JLcom/mapbox/mapboxgl/geometry/LatLng;)V",
- reinterpret_cast<void *>(&nativeAddAnnotation)},
+ {"nativeAddMarker", "(JLcom/mapbox/mapboxgl/geometry/LatLng;)V",
+ reinterpret_cast<void *>(&nativeAddMarker)},
{"nativeGetLatLng", "(J)Lcom/mapbox/mapboxgl/geometry/LatLng;",
reinterpret_cast<void *>(&nativeGetLatLng)},
{"nativeResetPosition", "(J)V", reinterpret_cast<void *>(&nativeResetPosition)},