Skip to content

Commit

Permalink
Android SDK has a new package
Browse files Browse the repository at this point in the history
  • Loading branch information
EddyVerbruggen committed Oct 26, 2015
1 parent cf38d47 commit cfddad9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-mapbox"
version="1.1.0">
version="1.1.1">

<name>Mapbox</name>

Expand Down
16 changes: 8 additions & 8 deletions src/android/Mapbox.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;

import com.mapbox.mapboxgl.annotations.Annotation;
import com.mapbox.mapboxgl.annotations.Marker;
import com.mapbox.mapboxgl.annotations.MarkerOptions;
import com.mapbox.mapboxgl.annotations.PolygonOptions;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxgl.geometry.LatLngZoom;
import com.mapbox.mapboxgl.views.MapView;
import com.mapbox.mapboxsdk.annotations.Annotation;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import com.mapbox.mapboxsdk.annotations.PolygonOptions;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLngZoom;
import com.mapbox.mapboxsdk.views.MapView;

import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaArgs;
Expand Down Expand Up @@ -309,7 +309,7 @@ public boolean onTouch(View v, MotionEvent event) {
if (event.getAction() == MotionEvent.ACTION_DOWN) {
// callback
if (markerCallbackContext != null) {
for (Annotation annotation : mapView.getAnnotations()) {
for (Annotation annotation : mapView.getAllAnnotations()) {
if (annotation.getId() == this.markerId) {
final Marker marker = (Marker) annotation;
final JSONObject json = new JSONObject();
Expand Down
2 changes: 1 addition & 1 deletion src/android/mapbox.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ ext.cdvMinSdkVersion = 15

dependencies {
compile 'com.android.support:appcompat-v7:22.+'
compile('com.mapbox.mapboxsdk:mapbox-android-sdk:2.0.0@aar')
compile('com.mapbox.mapboxsdk:mapbox-android-sdk:2.1.0@aar')
}

0 comments on commit cfddad9

Please sign in to comment.