react-native-maps 2.0.0-beta.5 → 2.0.0-beta.7

package/android/src/main/java/com/rnmaps/maps/MapCalloutManager.java

@@ -14,7 +14,7 @@ public class MapCalloutManager extends ViewGroupManager<MapCallout> {
 
   @Override
   public String getName() {
-    return "AIRMapCallout";
+    return "RNMMapCallout";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapCircleManager.java

@@ -25,7 +25,7 @@ public class MapCircleManager extends ViewGroupManager<MapCircle> {
 
   @Override
   public String getName() {
-    return "AIRMapCircle";
+    return "RNMMapCircle";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapGradientPolyline.java

@@ -86,7 +86,7 @@ public class MapGradientPolyline extends MapFeature {
   private TileOverlayOptions createTileOverlayOptions() {
     TileOverlayOptions options = new TileOverlayOptions();
     options.zIndex(zIndex);
-    AirMapGradientPolylineProvider tileProvider = new AirMapGradientPolylineProvider(context, points, colors, width);
+    MapGradientPolylineProvider tileProvider = new MapGradientPolylineProvider(context, points, colors, width);
     options.tileProvider(tileProvider);
     return options;
   }
@@ -110,7 +110,7 @@ public class MapGradientPolyline extends MapFeature {
     return Color.rgb(rTotal, gTotal, bTotal);
   }
 
-  public class AirMapGradientPolylineProvider implements TileProvider {
+  public class MapGradientPolylineProvider implements TileProvider {
 
     public static final int BASE_TILE_SIZE = 256;
 
@@ -126,7 +126,7 @@ public class MapGradientPolyline extends MapFeature {
     protected Point[] projectedPts;
     protected Point[] projectedPtMids;
 
-    public AirMapGradientPolylineProvider(Context context, List<LatLng> points, int[] colors,
+    public MapGradientPolylineProvider(Context context, List<LatLng> points, int[] colors,
         float width) {
       super();
 
@@ -239,7 +239,7 @@ public class MapGradientPolyline extends MapFeature {
         float interp2 = ((float)i - 1) / points.size();
         float interp1to2 = (interp1 + interp2) / 2;
 
-        Log.d("AirMapGradientPolyline", String.valueOf(interp1to2));
+        Log.d("MapGradientPolyline", String.valueOf(interp1to2));
 
         // Circle for the corner (removes the weird empty corners that occur otherwise)
         colorPaint.setStyle(Paint.Style.FILL);

package/android/src/main/java/com/rnmaps/maps/MapGradientPolylineManager.java

@@ -28,7 +28,7 @@ public class MapGradientPolylineManager extends ViewGroupManager<MapGradientPoly
 
   @Override
   public String getName() {
-    return "AIRMapGradientPolyline";
+    return "RNMMapGradientPolyline";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapHeatmapManager.java

@@ -15,7 +15,7 @@ public class MapHeatmapManager extends ViewGroupManager<MapHeatmap> {
 
     @Override
     public String getName() {
-        return "AIRMapHeatmap";
+        return "RNMMapHeatmap";
     }
 
     @Override

package/android/src/main/java/com/rnmaps/maps/MapLiteManager.java

@@ -5,7 +5,7 @@ import com.google.android.gms.maps.GoogleMapOptions;
 
 public class MapLiteManager extends MapManager {
 
-  private static final String REACT_CLASS = "AIRMapLite";
+  private static final String REACT_CLASS = "RNMMapLite";
 
   @Override
   public String getName() {

package/android/src/main/java/com/rnmaps/maps/MapLocalTile.java

@@ -15,14 +15,14 @@ import java.io.InputStream;
 
 public class MapLocalTile extends MapFeature {
 
-    class AIRMapLocalTileProvider implements TileProvider {
+    class MapLocalTileProvider implements TileProvider {
         private static final int BUFFER_SIZE = 16 * 1024;
         private int tileSize;
         private String pathTemplate;
         private final boolean useAssets;
 
 
-        public AIRMapLocalTileProvider(int tileSizet, String pathTemplate, boolean useAssets) {
+        public MapLocalTileProvider(int tileSizet, String pathTemplate, boolean useAssets) {
             this.tileSize = tileSizet;
             this.pathTemplate = pathTemplate;
             this.useAssets = useAssets;
@@ -80,7 +80,7 @@ public class MapLocalTile extends MapFeature {
 
     private TileOverlayOptions tileOverlayOptions;
     private TileOverlay tileOverlay;
-    private MapLocalTile.AIRMapLocalTileProvider tileProvider;
+    private MapLocalTile.MapLocalTileProvider tileProvider;
 
     private String pathTemplate;
     private float tileSize;
@@ -129,7 +129,7 @@ public class MapLocalTile extends MapFeature {
     private TileOverlayOptions createTileOverlayOptions() {
         TileOverlayOptions options = new TileOverlayOptions();
         options.zIndex(zIndex);
-        this.tileProvider = new MapLocalTile.AIRMapLocalTileProvider((int)this.tileSize, this.pathTemplate, this.useAssets);
+        this.tileProvider = new MapLocalTile.MapLocalTileProvider((int)this.tileSize, this.pathTemplate, this.useAssets);
         options.tileProvider(this.tileProvider);
         return options;
     }

package/android/src/main/java/com/rnmaps/maps/MapLocalTileManager.java

@@ -24,7 +24,7 @@ public class MapLocalTileManager extends ViewGroupManager<MapLocalTile> {
 
     @Override
     public String getName() {
-        return "AIRMapLocalTile";
+        return "RNMMapLocalTile";
     }
 
     @Override

package/android/src/main/java/com/rnmaps/maps/MapManager.java

@@ -20,14 +20,12 @@ import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.google.android.gms.location.Priority;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.LatLngBounds;
 
 import java.util.Map;
 
 public class MapManager extends ViewGroupManager<MapView> {
 
-  private static final String REACT_CLASS = "AIRMap";
+  private static final String REACT_CLASS = "RNMMap";
 
   private final Map<String, Integer> MAP_TYPES = MapBuilder.of(
       "standard", GoogleMap.MAP_TYPE_NORMAL,
@@ -278,12 +276,6 @@ public class MapManager extends ViewGroupManager<MapView> {
 
   @Override
   public void receiveCommand(@NonNull MapView view, String commandId, @Nullable ReadableArray args) {
-    int duration;
-    double lat;
-    double lng;
-    double lngDelta;
-    double latDelta;
-    ReadableMap region;
     ReadableMap camera;
 
     switch (commandId) {
@@ -295,53 +287,6 @@ public class MapManager extends ViewGroupManager<MapView> {
         view.animateToCamera(camera, 0);
         break;
 
-      case "animateCamera":
-        if(args == null) {
-          break;
-        }
-        camera = args.getMap(0);
-        duration = args.getInt(1);
-        view.animateToCamera(camera, duration);
-        break;
-
-      case "animateToRegion":
-        if(args == null) {
-          break;
-        }
-        region = args.getMap(0);
-        duration = args.getInt(1);
-        lng = region.getDouble("longitude");
-        lat = region.getDouble("latitude");
-        lngDelta = region.getDouble("longitudeDelta");
-        latDelta = region.getDouble("latitudeDelta");
-        LatLngBounds bounds = new LatLngBounds(
-            new LatLng(lat - latDelta / 2, lng - lngDelta / 2), // southwest
-            new LatLng(lat + latDelta / 2, lng + lngDelta / 2)  // northeast
-        );
-        view.animateToRegion(bounds, duration);
-        break;
-
-      case "fitToElements":
-        if(args == null) {
-          break;
-        }
-        view.fitToElements(args.getMap(0), args.getBoolean(1));
-        break;
-
-      case "fitToSuppliedMarkers":
-        if(args == null) {
-          break;
-        }
-        view.fitToSuppliedMarkers(args.getArray(0), args.getMap(1), args.getBoolean(2));
-        break;
-
-      case "fitToCoordinates":
-        if(args == null) {
-          break;
-        }
-        view.fitToCoordinates(args.getArray(0), args.getMap(1), args.getBoolean(2));
-        break;
-
       case "setMapBoundaries":
         if(args == null) {
           break;

package/android/src/main/java/com/rnmaps/maps/MapMarker.java

@@ -332,7 +332,7 @@ public class MapMarker extends MapFeature {
       }
       if (uri != null) {
         // listening for marker bitmap descriptor update, as well as check whether to load the image.
-        MapMarkerManager.AirMapMarkerSharedIcon sharedIcon = this.markerManager.getSharedIcon(uri);
+        MapMarkerManager.MapMarkerSharedIcon sharedIcon = this.markerManager.getSharedIcon(uri);
         sharedIcon.addMarker(this);
         shouldLoadImage = sharedIcon.shouldLoadImage();
       }

package/android/src/main/java/com/rnmaps/maps/MapMarkerManager.java

@@ -25,20 +25,20 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class MapMarkerManager extends ViewGroupManager<MapMarker> {
 
-  public static class AirMapMarkerSharedIcon {
+  public static class MapMarkerSharedIcon {
     private BitmapDescriptor iconBitmapDescriptor;
     private Bitmap bitmap;
     private final Map<MapMarker, Boolean> markers;
     private boolean loadImageStarted;
 
-    public AirMapMarkerSharedIcon(){
+    public MapMarkerSharedIcon(){
       this.markers = new WeakHashMap<>();
       this.loadImageStarted = false;
     }
 
     /**
      * check whether the load image process started.
-     * caller AirMapMarker will only need to load it when this returns true.
+     * caller MapMarker will only need to load it when this returns true.
      *
      * @return true if it is not started, false otherwise.
      */
@@ -109,7 +109,7 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
     }
   }
 
-  private final Map<String, AirMapMarkerSharedIcon> sharedIcons = new ConcurrentHashMap<>();
+  private final Map<String, MapMarkerSharedIcon> sharedIcons = new ConcurrentHashMap<>();
 
   /**
    * get the shared icon object, if not existed, create a new one and store it.
@@ -117,12 +117,12 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
    * @param uri
    * @return the icon object for the given uri.
    */
-  public AirMapMarkerSharedIcon getSharedIcon(String uri) {
-    AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
+  public MapMarkerSharedIcon getSharedIcon(String uri) {
+    MapMarkerSharedIcon icon = this.sharedIcons.get(uri);
     if (icon == null) {
       synchronized (this) {
         if((icon = this.sharedIcons.get(uri)) == null) {
-          icon = new AirMapMarkerSharedIcon();
+          icon = new MapMarkerSharedIcon();
           this.sharedIcons.put(uri, icon);
         }
       }
@@ -136,7 +136,7 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
    * @param uri
    */
   public void removeSharedIconIfEmpty(String uri) {
-    AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
+    MapMarkerSharedIcon icon = this.sharedIcons.get(uri);
     if (icon == null) {return;}
     if (!icon.hasMarker()) {
       synchronized (this) {
@@ -152,7 +152,7 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
 
   @Override
   public String getName() {
-    return "AIRMapMarker";
+    return "RNMMapMarker";
   }
 
   @Override
@@ -180,20 +180,6 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
     view.setSnippet(description);
   }
 
-  // NOTE(lmr):
-  // android uses normalized coordinate systems for this, and is provided through the
-  // `anchor` property  and `calloutAnchor` instead.  Perhaps some work could be done
-  // to normalize iOS and android to use just one of the systems.
-//    @ReactProp(name = "centerOffset")
-//    public void setCenterOffset(AirMapMarker view, ReadableMap map) {
-//
-//    }
-//
-//    @ReactProp(name = "calloutOffset")
-//    public void setCalloutOffset(AirMapMarker view, ReadableMap map) {
-//
-//    }
-
   @ReactProp(name = "anchor")
   public void setAnchor(MapMarker view, ReadableMap map) {
     // should default to (0.5, 1) (bottom middle)
@@ -214,9 +200,6 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
   public void setImage(MapMarker view, @Nullable String source) {
     view.setImage(source);
   }
-//    public void setImage(AirMapMarker view, ReadableMap image) {
-//        view.setImage(image);
-//    }
 
   @ReactProp(name = "icon")
   public void setIcon(MapMarker view, @Nullable String source) {

package/android/src/main/java/com/rnmaps/maps/MapOverlayManager.java

@@ -27,7 +27,7 @@ public class MapOverlayManager extends ViewGroupManager<MapOverlay> {
 
   @Override
   public String getName() {
-    return "AIRMapOverlay";
+    return "RNMMapOverlay";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapPolygonManager.java

@@ -29,7 +29,7 @@ public class MapPolygonManager extends ViewGroupManager<MapPolygon> {
 
   @Override
   public String getName() {
-    return "AIRMapPolygon";
+    return "RNMMapPolygon";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapPolylineManager.java

@@ -33,7 +33,7 @@ public class MapPolylineManager extends ViewGroupManager<MapPolyline> {
 
   @Override
   public String getName() {
-    return "AIRMapPolyline";
+    return "RNMMapPolyline";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapTileProvider.java

@@ -43,10 +43,10 @@ import java.net.URLConnection;
 
 public class MapTileProvider implements TileProvider {
 
-	class AIRMapUrlTileProvider extends UrlTileProvider {
+	class MapUrlTileProvider extends UrlTileProvider {
     private String urlTemplate;
 
-    public AIRMapUrlTileProvider(int width, int height, String urlTemplate) {
+    public MapUrlTileProvider(int width, int height, String urlTemplate) {
       super(width, height);
       this.urlTemplate = urlTemplate;
     }
@@ -104,7 +104,7 @@ public class MapTileProvider implements TileProvider {
 	public MapTileProvider(int tileSizet, boolean doubleTileSize, String urlTemplate,
                            int maximumZ, int maximumNativeZ, int minimumZ, boolean flipY, String tileCachePath,
                            int tileCacheMaxAge, boolean offlineMode, Context context, boolean customMode) {
-		this.tileProvider = new AIRMapUrlTileProvider(tileSizet, tileSizet, urlTemplate);
+		this.tileProvider = new MapUrlTileProvider(tileSizet, tileSizet, urlTemplate);
 
 		this.tileSize = tileSizet;
     this.doubleTileSize = doubleTileSize;
@@ -448,7 +448,7 @@ public class MapTileProvider implements TileProvider {
 
 	public void setTileSize(int tileSize) {
 		if (this.tileSize != tileSize) {
-			this.tileProvider = new AIRMapUrlTileProvider(tileSize, tileSize, urlTemplate);
+			this.tileProvider = new MapUrlTileProvider(tileSize, tileSize, urlTemplate);
 		}
 		this.tileSize = tileSize;
 	}

package/android/src/main/java/com/rnmaps/maps/MapUrlTileManager.java

@@ -21,7 +21,7 @@ public class MapUrlTileManager extends ViewGroupManager<MapUrlTile> {
 
   @Override
   public String getName() {
-    return "AIRMapUrlTile";
+    return "RNMMapUrlTile";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -93,7 +93,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   private Boolean isMapLoaded = false;
   private Integer loadingBackgroundColor = null;
   private Integer loadingIndicatorColor = null;
-  private final int baseMapPadding = 50;
+  public final int baseMapPadding = 50;
 
   private LatLngBounds boundsToMove;
   private CameraUpdate cameraToSet;
@@ -114,7 +114,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   private static final String[] PERMISSIONS = new String[]{
       "android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
 
-  private final List<MapFeature> features = new ArrayList<>();
+  public final List<MapFeature> features = new ArrayList<>();
   private final Map<Marker, MapMarker> markerMap = new HashMap<>();
   private final Map<Polyline, MapPolyline> polylineMap = new HashMap<>();
   private final Map<Polygon, MapPolygon> polygonMap = new HashMap<>();
@@ -275,17 +275,17 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     markerCollection.setOnMarkerClickListener(new GoogleMap.OnMarkerClickListener() {
       @Override
       public boolean onMarkerClick(@NonNull Marker marker) {
-        MapMarker airMapMarker = getMarkerMap(marker);
+        MapMarker rnmMapMarker = getMarkerMap(marker);
 
         WritableMap event = makeClickEventData(marker.getPosition());
         event.putString("action", "marker-press");
-        event.putString("id", airMapMarker.getIdentifier());
+        event.putString("id", rnmMapMarker.getIdentifier());
         manager.pushEvent(context, view, "onMarkerPress", event);
 
         event = makeClickEventData(marker.getPosition());
         event.putString("action", "marker-press");
-        event.putString("id", airMapMarker.getIdentifier());
-        manager.pushEvent(context, airMapMarker, "onPress", event);
+        event.putString("id", rnmMapMarker.getIdentifier());
+        manager.pushEvent(context, rnmMapMarker, "onPress", event);
 
         // Return false to open the callout info window and center on the marker
         // https://developers.google.com/android/reference/com/google/android/gms/maps/GoogleMap
@@ -831,8 +831,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
   }
 
-  public void animateToCamera(ReadableMap camera, int duration) {
-    if (map == null) return;
+  public CameraUpdate buildCameraUpdate(ReadableMap camera) {
     CameraPosition.Builder builder = new CameraPosition.Builder(map.getCameraPosition());
     if (camera.hasKey("zoom")) {
       builder.zoom((float)camera.getDouble("zoom"));
@@ -848,103 +847,26 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       builder.target(new LatLng(center.getDouble("latitude"), center.getDouble("longitude")));
     }
 
-    CameraUpdate update = CameraUpdateFactory.newCameraPosition(builder.build());
-
-    if (duration <= 0) {
-      map.moveCamera(update);
-    }
-    else {
-      map.animateCamera(update, duration, null);
-    }
-  }
-
-  public void animateToRegion(LatLngBounds bounds, int duration) {
-    if (map == null) return;
-    if(duration <= 0) {
-      map.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0));
-    } else {
-      map.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0), duration, null);
-    }
+    return CameraUpdateFactory.newCameraPosition(builder.build());
   }
 
-  public void fitToElements(ReadableMap edgePadding, boolean animated) {
+  public void animateToCamera(ReadableMap camera, int duration) {
     if (map == null) return;
 
-    LatLngBounds.Builder builder = new LatLngBounds.Builder();
-
-    boolean addedPosition = false;
-
-    for (MapFeature feature : features) {
-      if (feature instanceof MapMarker) {
-        Marker marker = (Marker) feature.getFeature();
-        builder.include(marker.getPosition());
-        addedPosition = true;
-      }
-      // TODO(lmr): may want to include shapes / etc.
-    }
-    if (addedPosition) {
-      LatLngBounds bounds = builder.build();
-      CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
-
-      if (edgePadding != null) {
-        map.setPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
-          edgePadding.getInt("right"), edgePadding.getInt("bottom"));
-      }
-
-      if (animated) {
-        map.animateCamera(cu);
-      } else {
-        map.moveCamera(cu);
-      }
-    }
-  }
-
-  public void fitToSuppliedMarkers(ReadableArray markerIDsArray, ReadableMap edgePadding, boolean animated) {
-    if (map == null) return;
+    CameraUpdate update = buildCameraUpdate(camera);
 
-    LatLngBounds.Builder builder = new LatLngBounds.Builder();
-
-    String[] markerIDs = new String[markerIDsArray.size()];
-    for (int i = 0; i < markerIDsArray.size(); i++) {
-      markerIDs[i] = markerIDsArray.getString(i);
-    }
-
-    boolean addedPosition = false;
-
-    List<String> markerIDList = Arrays.asList(markerIDs);
-
-    for (MapFeature feature : features) {
-      if (feature instanceof MapMarker) {
-        String identifier = ((MapMarker) feature).getIdentifier();
-        Marker marker = (Marker) feature.getFeature();
-        if (markerIDList.contains(identifier)) {
-          builder.include(marker.getPosition());
-          addedPosition = true;
-        }
-      }
+    if (duration <= 0) {
+      map.moveCamera(update);
     }
-
-    if (addedPosition) {
-      LatLngBounds bounds = builder.build();
-      CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
-
-      if (edgePadding != null) {
-        map.setPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
-          edgePadding.getInt("right"), edgePadding.getInt("bottom"));
-      }
-
-      if (animated) {
-        map.animateCamera(cu);
-      } else {
-        map.moveCamera(cu);
-      }
+    else {
+      map.animateCamera(update, duration, null);
     }
   }
 
-  int baseLeftMapPadding;
-  int baseRightMapPadding;
-  int baseTopMapPadding;
-  int baseBottomMapPadding;
+  public int baseLeftMapPadding;
+  public int baseRightMapPadding;
+  public int baseTopMapPadding;
+  public int baseBottomMapPadding;
 
   public void applyBaseMapPadding(int left, int top, int right, int bottom){
     this.map.setPadding(left, top, right, bottom);
@@ -954,36 +876,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     baseBottomMapPadding = bottom;
   }
 
-  public void fitToCoordinates(ReadableArray coordinatesArray, ReadableMap edgePadding,
-      boolean animated) {
-    if (map == null) return;
-
-    LatLngBounds.Builder builder = new LatLngBounds.Builder();
-
-    for (int i = 0; i < coordinatesArray.size(); i++) {
-      ReadableMap latLng = coordinatesArray.getMap(i);
-      double lat = latLng.getDouble("latitude");
-      double lng = latLng.getDouble("longitude");
-      builder.include(new LatLng(lat, lng));
-    }
-
-    LatLngBounds bounds = builder.build();
-    CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
-
-    if (edgePadding != null) {
-      appendMapPadding(edgePadding.getInt("left"), edgePadding.getInt("top"), edgePadding.getInt("right"), edgePadding.getInt("bottom"));
-    }
-
-    if (animated) {
-      map.animateCamera(cu);
-    } else {
-      map.moveCamera(cu);
-    }
-    // Move the google logo to the default base padding value.
-    map.setPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
-  }
-
-  private void appendMapPadding(int iLeft,int iTop, int iRight, int iBottom) {
+  public void appendMapPadding(int iLeft,int iTop, int iRight, int iBottom) {
     int left;
     int top;
     int right;
@@ -1375,21 +1268,21 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   }
 
   private MapMarker getMarkerMap(Marker marker) {
-    MapMarker airMarker = markerMap.get(marker);
+    MapMarker rnmMarker = markerMap.get(marker);
 
-    if (airMarker != null) {
-      return airMarker;
+    if (rnmMarker != null) {
+      return rnmMarker;
     }
 
     for (Map.Entry<Marker, MapMarker> entryMarker : markerMap.entrySet()) {
       if (entryMarker.getKey().getPosition().equals(marker.getPosition())
           && entryMarker.getKey().getTitle().equals(marker.getTitle())) {
-        airMarker = entryMarker.getValue();
+        rnmMarker = entryMarker.getValue();
         break;
       }
     }
 
-    return airMarker;
+    return rnmMarker;
   }
 
   @Override