onTap/onCalloutTap not working from XML declared map #49

Yermo · Oct 26, 2016 · 0f301b3 · 0f301b3
1 parent 19ec0f5
commit 0f301b3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/mapbox.android.js b/mapbox.android.js
@@ -179,30 +179,6 @@ mapbox.show = function(arg) {
                 mapbox._markers = [];
                 mapbox._addMarkers(settings.markers);
 
-                mapbox.mapboxMap.setOnMarkerClickListener(
-                    new com.mapbox.mapboxsdk.maps.MapboxMap.OnMarkerClickListener ({
-                      onMarkerClick: function (marker) {
-                        var cachedMarker = mapbox._getClickedMarkerDetails(marker);
-                        if (cachedMarker && cachedMarker.onTap) {
-                          cachedMarker.onTap(cachedMarker);
-                        }
-                        return false;
-                      }
-                    })
-                );
-
-                mapbox.mapboxMap.setOnInfoWindowClickListener(
-                    new com.mapbox.mapboxsdk.maps.MapboxMap.OnInfoWindowClickListener ({
-                      onInfoWindowClick: function (marker) {
-                        var cachedMarker = mapbox._getClickedMarkerDetails(marker);
-                        if (cachedMarker && cachedMarker.onCalloutTap) {
-                          cachedMarker.onCalloutTap(cachedMarker);
-                        }
-                        return true;
-                      }
-                    })
-                );
-
                 if (settings.showUserLocation) {
                   if (mapbox._fineLocationPermissionGranted()) {
                     mapbox.locationServices = com.mapbox.mapboxsdk.location.LocationServices.getLocationServices(application.android.context);
@@ -379,6 +355,33 @@ mapbox._addMarkers = function(markers, nativeMap) {
     return;
   }
   var theMap = nativeMap || mapbox;
+
+  theMap.mapboxMap.setOnMarkerClickListener(
+      new com.mapbox.mapboxsdk.maps.MapboxMap.OnMarkerClickListener ({
+        onMarkerClick: function (marker) {
+          console.log("-- marker click");
+          var cachedMarker = mapbox._getClickedMarkerDetails(marker);
+          if (cachedMarker && cachedMarker.onTap) {
+            cachedMarker.onTap(cachedMarker);
+          }
+          return false;
+        }
+      })
+  );
+
+  theMap.mapboxMap.setOnInfoWindowClickListener(
+      new com.mapbox.mapboxsdk.maps.MapboxMap.OnInfoWindowClickListener ({
+        onInfoWindowClick: function (marker) {
+          console.log("-- info click");
+          var cachedMarker = mapbox._getClickedMarkerDetails(marker);
+          if (cachedMarker && cachedMarker.onCalloutTap) {
+            cachedMarker.onCalloutTap(cachedMarker);
+          }
+          return true;
+        }
+      })
+  );
+
   var iconFactory = com.mapbox.mapboxsdk.annotations.IconFactory.getInstance(application.android.context);
   for (var m in markers) {
     var marker = markers[m];
@@ -392,7 +395,6 @@ mapbox._addMarkers = function(markers, nativeMap) {
         var resourcename = marker.icon.substring(6);
         var res = utils.ad.getApplicationContext().getResources();
         var identifier = res.getIdentifier(resourcename, "drawable", utils.ad.getApplication().getPackageName());
-        console.log("-- loc identifier: " + identifier);
 
         if (identifier === 0) {
           console.log("No icon found for this device desity for icon " + marker.icon + ", using default");

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-mapbox",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Native Maps, by Mapbox.",
   "main": "mapbox.js",
   "typings": "mapbox.d.ts",