react-native-maps 1.3.2 → 1.4.0-beta.1

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapManager.java → rnmaps/maps/MapManager.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.view.View;
 
@@ -25,7 +25,7 @@ import com.google.android.gms.maps.model.LatLngBounds;
 
 import java.util.Map;
 
-public class AirMapManager extends ViewGroupManager<AirMapView> {
+public class MapManager extends ViewGroupManager<MapView> {
 
   private static final String REACT_CLASS = "AIRMap";
 
@@ -45,19 +45,19 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
   );
 
   private final ReactApplicationContext appContext;
-  private AirMapMarkerManager markerManager;
+  private MapMarkerManager markerManager;
 
   protected GoogleMapOptions googleMapOptions;
 
-  public AirMapManager(ReactApplicationContext context) {
+  public MapManager(ReactApplicationContext context) {
     this.appContext = context;
     this.googleMapOptions = new GoogleMapOptions();
   }
 
-  public AirMapMarkerManager getMarkerManager() {
+  public MapMarkerManager getMarkerManager() {
     return this.markerManager;
   }
-  public void setMarkerManager(AirMapMarkerManager markerManager) {
+  public void setMarkerManager(MapMarkerManager markerManager) {
     this.markerManager = markerManager;
   }
 
@@ -67,8 +67,8 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
   }
 
   @Override
-  protected AirMapView createViewInstance(ThemedReactContext context) {
-    return new AirMapView(context, this.appContext, this, googleMapOptions);
+  protected MapView createViewInstance(ThemedReactContext context) {
+    return new MapView(context, this.appContext, this, googleMapOptions);
   }
 
   private void emitMapError(ThemedReactContext context, String message, String type) {
@@ -82,38 +82,38 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
   }
 
   @ReactProp(name = "region")
-  public void setRegion(AirMapView view, ReadableMap region) {
+  public void setRegion(MapView view, ReadableMap region) {
     view.setRegion(region);
   }
 
   @ReactProp(name = "initialRegion")
-  public void setInitialRegion(AirMapView view, ReadableMap initialRegion) {
+  public void setInitialRegion(MapView view, ReadableMap initialRegion) {
     view.setInitialRegion(initialRegion);
   }
 
   @ReactProp(name = "camera")
-  public void setCamera(AirMapView view, ReadableMap camera) {
+  public void setCamera(MapView view, ReadableMap camera) {
     view.setCamera(camera);
   }
 
   @ReactProp(name = "initialCamera")
-  public void setInitialCamera(AirMapView view, ReadableMap initialCamera) {
+  public void setInitialCamera(MapView view, ReadableMap initialCamera) {
     view.setInitialCamera(initialCamera);
   }
 
   @ReactProp(name = "mapType")
-  public void setMapType(AirMapView view, @Nullable String mapType) {
+  public void setMapType(MapView view, @Nullable String mapType) {
     int typeId = MAP_TYPES.get(mapType);
     view.map.setMapType(typeId);
   }
 
   @ReactProp(name = "customMapStyleString")
-  public void setMapStyle(AirMapView view, @Nullable String customMapStyleString) {
+  public void setMapStyle(MapView view, @Nullable String customMapStyleString) {
     view.setMapStyle(customMapStyleString);
   }
 
   @ReactProp(name = "mapPadding")
-  public void setMapPadding(AirMapView view, @Nullable ReadableMap padding) {
+  public void setMapPadding(MapView view, @Nullable ReadableMap padding) {
     int left = 0;
     int top = 0;
     int right = 0;
@@ -143,141 +143,141 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
   }
 
   @ReactProp(name = "showsUserLocation", defaultBoolean = false)
-  public void setShowsUserLocation(AirMapView view, boolean showUserLocation) {
+  public void setShowsUserLocation(MapView view, boolean showUserLocation) {
     view.setShowsUserLocation(showUserLocation);
   }
 
   @ReactProp(name = "userLocationPriority")
-  public void setUserLocationPriority(AirMapView view, @Nullable String accuracy) {
+  public void setUserLocationPriority(MapView view, @Nullable String accuracy) {
     view.setUserLocationPriority(MY_LOCATION_PRIORITY.get(accuracy));
   }
 
   @ReactProp(name = "userLocationUpdateInterval", defaultInt = 5000)
-  public void setUserLocationUpdateInterval(AirMapView view, int updateInterval) {
+  public void setUserLocationUpdateInterval(MapView view, int updateInterval) {
     view.setUserLocationUpdateInterval(updateInterval);
   }
 
   @ReactProp(name = "userLocationFastestInterval", defaultInt = 5000)
-  public void setUserLocationFastestInterval(AirMapView view, int fastestInterval) {
+  public void setUserLocationFastestInterval(MapView view, int fastestInterval) {
     view.setUserLocationFastestInterval(fastestInterval);
   }
 
   @ReactProp(name = "showsMyLocationButton", defaultBoolean = true)
-  public void setShowsMyLocationButton(AirMapView view, boolean showMyLocationButton) {
+  public void setShowsMyLocationButton(MapView view, boolean showMyLocationButton) {
     view.setShowsMyLocationButton(showMyLocationButton);
   }
 
   @ReactProp(name = "toolbarEnabled", defaultBoolean = true)
-  public void setToolbarEnabled(AirMapView view, boolean toolbarEnabled) {
+  public void setToolbarEnabled(MapView view, boolean toolbarEnabled) {
     view.setToolbarEnabled(toolbarEnabled);
   }
 
   // This is a private prop to improve performance of panDrag by disabling it when the callback
   // is not set
   @ReactProp(name = "handlePanDrag", defaultBoolean = false)
-  public void setHandlePanDrag(AirMapView view, boolean handlePanDrag) {
+  public void setHandlePanDrag(MapView view, boolean handlePanDrag) {
     view.setHandlePanDrag(handlePanDrag);
   }
 
   @ReactProp(name = "showsTraffic", defaultBoolean = false)
-  public void setShowTraffic(AirMapView view, boolean showTraffic) {
+  public void setShowTraffic(MapView view, boolean showTraffic) {
     view.map.setTrafficEnabled(showTraffic);
   }
 
   @ReactProp(name = "showsBuildings", defaultBoolean = false)
-  public void setShowBuildings(AirMapView view, boolean showBuildings) {
+  public void setShowBuildings(MapView view, boolean showBuildings) {
     view.map.setBuildingsEnabled(showBuildings);
   }
 
   @ReactProp(name = "showsIndoors", defaultBoolean = false)
-  public void setShowIndoors(AirMapView view, boolean showIndoors) {
+  public void setShowIndoors(MapView view, boolean showIndoors) {
     view.map.setIndoorEnabled(showIndoors);
   }
 
   @ReactProp(name = "showsIndoorLevelPicker", defaultBoolean = false)
-  public void setShowsIndoorLevelPicker(AirMapView view, boolean showsIndoorLevelPicker) {
+  public void setShowsIndoorLevelPicker(MapView view, boolean showsIndoorLevelPicker) {
     view.map.getUiSettings().setIndoorLevelPickerEnabled(showsIndoorLevelPicker);
   }
 
   @ReactProp(name = "showsCompass", defaultBoolean = false)
-  public void setShowsCompass(AirMapView view, boolean showsCompass) {
+  public void setShowsCompass(MapView view, boolean showsCompass) {
     view.map.getUiSettings().setCompassEnabled(showsCompass);
   }
 
   @ReactProp(name = "scrollEnabled", defaultBoolean = false)
-  public void setScrollEnabled(AirMapView view, boolean scrollEnabled) {
+  public void setScrollEnabled(MapView view, boolean scrollEnabled) {
     view.map.getUiSettings().setScrollGesturesEnabled(scrollEnabled);
   }
 
   @ReactProp(name = "zoomEnabled", defaultBoolean = false)
-  public void setZoomEnabled(AirMapView view, boolean zoomEnabled) {
+  public void setZoomEnabled(MapView view, boolean zoomEnabled) {
     view.map.getUiSettings().setZoomGesturesEnabled(zoomEnabled);
   }
 
   @ReactProp(name = "zoomControlEnabled", defaultBoolean = true)
-  public void setZoomControlEnabled(AirMapView view, boolean zoomControlEnabled) {
+  public void setZoomControlEnabled(MapView view, boolean zoomControlEnabled) {
     view.map.getUiSettings().setZoomControlsEnabled(zoomControlEnabled);
   }
 
   @ReactProp(name = "rotateEnabled", defaultBoolean = false)
-  public void setRotateEnabled(AirMapView view, boolean rotateEnabled) {
+  public void setRotateEnabled(MapView view, boolean rotateEnabled) {
     view.map.getUiSettings().setRotateGesturesEnabled(rotateEnabled);
   }
 
   @ReactProp(name = "scrollDuringRotateOrZoomEnabled", defaultBoolean = true)
-  public void setScrollDuringRotateOrZoomEnabled(AirMapView view, boolean scrollDuringRotateOrZoomEnabled) {
+  public void setScrollDuringRotateOrZoomEnabled(MapView view, boolean scrollDuringRotateOrZoomEnabled) {
     view.map.getUiSettings().setScrollGesturesEnabledDuringRotateOrZoom(scrollDuringRotateOrZoomEnabled);
   }
 
   @ReactProp(name = "cacheEnabled", defaultBoolean = false)
-  public void setCacheEnabled(AirMapView view, boolean cacheEnabled) {
+  public void setCacheEnabled(MapView view, boolean cacheEnabled) {
     view.setCacheEnabled(cacheEnabled);
   }
 
   @ReactProp(name = "loadingEnabled", defaultBoolean = false)
-  public void setLoadingEnabled(AirMapView view, boolean loadingEnabled) {
+  public void setLoadingEnabled(MapView view, boolean loadingEnabled) {
     view.enableMapLoading(loadingEnabled);
   }
 
   @ReactProp(name = "moveOnMarkerPress", defaultBoolean = true)
-  public void setMoveOnMarkerPress(AirMapView view, boolean moveOnPress) {
+  public void setMoveOnMarkerPress(MapView view, boolean moveOnPress) {
     view.setMoveOnMarkerPress(moveOnPress);
   }
 
   @ReactProp(name = "loadingBackgroundColor", customType = "Color")
-  public void setLoadingBackgroundColor(AirMapView view, @Nullable Integer loadingBackgroundColor) {
+  public void setLoadingBackgroundColor(MapView view, @Nullable Integer loadingBackgroundColor) {
     view.setLoadingBackgroundColor(loadingBackgroundColor);
   }
 
   @ReactProp(name = "loadingIndicatorColor", customType = "Color")
-  public void setLoadingIndicatorColor(AirMapView view, @Nullable Integer loadingIndicatorColor) {
+  public void setLoadingIndicatorColor(MapView view, @Nullable Integer loadingIndicatorColor) {
     view.setLoadingIndicatorColor(loadingIndicatorColor);
   }
 
   @ReactProp(name = "pitchEnabled", defaultBoolean = false)
-  public void setPitchEnabled(AirMapView view, boolean pitchEnabled) {
+  public void setPitchEnabled(MapView view, boolean pitchEnabled) {
     view.map.getUiSettings().setTiltGesturesEnabled(pitchEnabled);
   }
 
   @ReactProp(name = "minZoomLevel")
-  public void setMinZoomLevel(AirMapView view, float minZoomLevel) {
+  public void setMinZoomLevel(MapView view, float minZoomLevel) {
     view.map.setMinZoomPreference(minZoomLevel);
   }
 
   @ReactProp(name = "maxZoomLevel")
-  public void setMaxZoomLevel(AirMapView view, float maxZoomLevel) {
+  public void setMaxZoomLevel(MapView view, float maxZoomLevel) {
     view.map.setMaxZoomPreference(maxZoomLevel);
   }
 
   @ReactProp(name = "kmlSrc")
-  public void setKmlSrc(AirMapView view, String kmlUrl) {
+  public void setKmlSrc(MapView view, String kmlUrl) {
     if (kmlUrl != null) {
       view.setKmlSrc(kmlUrl);
     }
   }
 
   @Override
-  public void receiveCommand(@NonNull AirMapView view, String commandId, @Nullable ReadableArray args) {
+  public void receiveCommand(@NonNull MapView view, String commandId, @Nullable ReadableArray args) {
     int duration;
     double lat;
     double lng;
@@ -399,27 +399,27 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
   }
 
   @Override
-  public void addView(AirMapView parent, View child, int index) {
+  public void addView(MapView parent, View child, int index) {
     parent.addFeature(child, index);
   }
 
   @Override
-  public int getChildCount(AirMapView view) {
+  public int getChildCount(MapView view) {
     return view.getFeatureCount();
   }
 
   @Override
-  public View getChildAt(AirMapView view, int index) {
+  public View getChildAt(MapView view, int index) {
     return view.getFeatureAt(index);
   }
 
   @Override
-  public void removeViewAt(AirMapView parent, int index) {
+  public void removeViewAt(MapView parent, int index) {
     parent.removeFeatureAt(index);
   }
 
   @Override
-  public void updateExtraData(AirMapView view, Object extraData) {
+  public void updateExtraData(MapView view, Object extraData) {
     view.updateExtraData(extraData);
   }
 
@@ -429,7 +429,7 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
   }
 
   @Override
-  public void onDropViewInstance(AirMapView view) {
+  public void onDropViewInstance(MapView view) {
     view.doDestroy();
     super.onDropViewInstance(view);
   }

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapMarker.java → rnmaps/maps/MapMarker.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -40,7 +40,7 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 
-public class AirMapMarker extends AirMapFeature {
+public class MapMarker extends MapFeature {
 
   private MarkerOptions markerOptions;
   private Marker marker;
@@ -56,7 +56,7 @@ public class AirMapMarker extends AirMapFeature {
   private float anchorX;
   private float anchorY;
 
-  private AirMapCallout calloutView;
+  private MapCallout calloutView;
   private View wrappedCalloutView;
   private final Context context;
 
@@ -78,7 +78,7 @@ public class AirMapMarker extends AirMapFeature {
   private boolean tracksViewChangesActive = false;
 
   private boolean hasCustomMarkerView = false;
-  private final AirMapMarkerManager markerManager;
+  private final MapMarkerManager markerManager;
   private String imageUri;
 
   private final DraweeHolder<?> logoHolder;
@@ -111,15 +111,15 @@ public class AirMapMarker extends AirMapFeature {
               CloseableReference.closeSafely(imageReference);
             }
           }
-          if (AirMapMarker.this.markerManager != null && AirMapMarker.this.imageUri != null) {
-            AirMapMarker.this.markerManager.getSharedIcon(AirMapMarker.this.imageUri)
+          if (MapMarker.this.markerManager != null && MapMarker.this.imageUri != null) {
+            MapMarker.this.markerManager.getSharedIcon(MapMarker.this.imageUri)
                 .updateIcon(iconBitmapDescriptor, iconBitmap);
           }
           update(true);
         }
       };
 
-  public AirMapMarker(Context context, AirMapMarkerManager markerManager) {
+  public MapMarker(Context context, MapMarkerManager markerManager) {
     super(context);
     this.context = context;
     this.markerManager = markerManager;
@@ -127,7 +127,7 @@ public class AirMapMarker extends AirMapFeature {
     logoHolder.onAttach();
   }
 
-  public AirMapMarker(Context context, MarkerOptions options, AirMapMarkerManager markerManager) {
+  public MapMarker(Context context, MarkerOptions options, MapMarkerManager markerManager) {
     super(context);
     this.context = context;
     this.markerManager = markerManager;
@@ -332,7 +332,7 @@ public class AirMapMarker extends AirMapFeature {
       }
       if (uri != null) {
         // listening for marker bitmap descriptor update, as well as check whether to load the image.
-        AirMapMarkerManager.AirMapMarkerSharedIcon sharedIcon = this.markerManager.getSharedIcon(uri);
+        MapMarkerManager.AirMapMarkerSharedIcon sharedIcon = this.markerManager.getSharedIcon(uri);
         sharedIcon.addMarker(this);
         shouldLoadImage = sharedIcon.shouldLoadImage();
       }
@@ -399,7 +399,7 @@ public class AirMapMarker extends AirMapFeature {
   public void addView(View child, int index) {
     super.addView(child, index);
     // if children are added, it means we are rendering a custom marker
-    if (!(child instanceof AirMapCallout)) {
+    if (!(child instanceof MapCallout)) {
       hasCustomMarkerView = true;
       updateTracksViewChanges();
     }
@@ -539,11 +539,11 @@ public class AirMapMarker extends AirMapFeature {
     return bitmap;
   }
 
-  public void setCalloutView(AirMapCallout view) {
+  public void setCalloutView(MapCallout view) {
     this.calloutView = view;
   }
 
-  public AirMapCallout getCalloutView() {
+  public MapCallout getCalloutView() {
     return this.calloutView;
   }
 

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapMarkerManager.java → rnmaps/maps/MapMarkerManager.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -23,12 +23,12 @@ import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
+public class MapMarkerManager extends ViewGroupManager<MapMarker> {
 
   public static class AirMapMarkerSharedIcon {
     private BitmapDescriptor iconBitmapDescriptor;
     private Bitmap bitmap;
-    private final Map<AirMapMarker, Boolean> markers;
+    private final Map<MapMarker, Boolean> markers;
     private boolean loadImageStarted;
 
     public AirMapMarkerSharedIcon(){
@@ -57,7 +57,7 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
      *
      * @param marker
      */
-    public synchronized void addMarker(AirMapMarker marker) {
+    public synchronized void addMarker(MapMarker marker) {
       this.markers.put(marker, true);
       if (this.iconBitmapDescriptor != null) {
         marker.setIconBitmapDescriptor(this.iconBitmapDescriptor, this.bitmap);
@@ -71,7 +71,7 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
      *
      * @param marker
      */
-    public synchronized void removeMarker(AirMapMarker marker) {
+    public synchronized void removeMarker(MapMarker marker) {
       this.markers.remove(marker);
     }
 
@@ -101,7 +101,7 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
         return;
       }
 
-      for (Map.Entry<AirMapMarker, Boolean> markerEntry: markers.entrySet()) {
+      for (Map.Entry<MapMarker, Boolean> markerEntry: markers.entrySet()) {
         if (markerEntry.getKey() != null) {
           markerEntry.getKey().setIconBitmapDescriptor(bitmapDescriptor, bitmap);
         }
@@ -147,7 +147,7 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
     }
   }
 
-  public AirMapMarkerManager() {
+  public MapMarkerManager() {
   }
 
   @Override
@@ -156,27 +156,27 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
   }
 
   @Override
-  public AirMapMarker createViewInstance(ThemedReactContext context) {
-    return new AirMapMarker(context, this);
+  public MapMarker createViewInstance(ThemedReactContext context) {
+    return new MapMarker(context, this);
   }
 
   @ReactProp(name = "coordinate")
-  public void setCoordinate(AirMapMarker view, ReadableMap map) {
+  public void setCoordinate(MapMarker view, ReadableMap map) {
     view.setCoordinate(map);
   }
 
   @ReactProp(name = "title")
-  public void setTitle(AirMapMarker view, String title) {
+  public void setTitle(MapMarker view, String title) {
     view.setTitle(title);
   }
 
   @ReactProp(name = "identifier")
-  public void setIdentifier(AirMapMarker view, String identifier) {
+  public void setIdentifier(MapMarker view, String identifier) {
     view.setIdentifier(identifier);
   }
 
   @ReactProp(name = "description")
-  public void setDescription(AirMapMarker view, String description) {
+  public void setDescription(MapMarker view, String description) {
     view.setSnippet(description);
   }
 
@@ -195,7 +195,7 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
 //    }
 
   @ReactProp(name = "anchor")
-  public void setAnchor(AirMapMarker view, ReadableMap map) {
+  public void setAnchor(MapMarker view, ReadableMap map) {
     // should default to (0.5, 1) (bottom middle)
     double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
     double y = map != null && map.hasKey("y") ? map.getDouble("y") : 1.0;
@@ -203,7 +203,7 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
   }
 
   @ReactProp(name = "calloutAnchor")
-  public void setCalloutAnchor(AirMapMarker view, ReadableMap map) {
+  public void setCalloutAnchor(MapMarker view, ReadableMap map) {
     // should default to (0.5, 0) (top middle)
     double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
     double y = map != null && map.hasKey("y") ? map.getDouble("y") : 0.0;
@@ -211,7 +211,7 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
   }
 
   @ReactProp(name = "image")
-  public void setImage(AirMapMarker view, @Nullable String source) {
+  public void setImage(MapMarker view, @Nullable String source) {
     view.setImage(source);
   }
 //    public void setImage(AirMapMarker view, ReadableMap image) {
@@ -219,12 +219,12 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
 //    }
 
   @ReactProp(name = "icon")
-  public void setIcon(AirMapMarker view, @Nullable String source) {
+  public void setIcon(MapMarker view, @Nullable String source) {
     view.setImage(source);
   }
 
   @ReactProp(name = "pinColor", defaultInt = Color.RED, customType = "Color")
-  public void setPinColor(AirMapMarker view, int pinColor) {
+  public void setPinColor(MapMarker view, int pinColor) {
     float[] hsv = new float[3];
     Color.colorToHSV(pinColor, hsv);
     // NOTE: android only supports a hue
@@ -232,23 +232,23 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
   }
 
   @ReactProp(name = "rotation", defaultFloat = 0.0f)
-  public void setMarkerRotation(AirMapMarker view, float rotation) {
+  public void setMarkerRotation(MapMarker view, float rotation) {
     view.setRotation(rotation);
   }
 
   @ReactProp(name = "flat", defaultBoolean = false)
-  public void setFlat(AirMapMarker view, boolean flat) {
+  public void setFlat(MapMarker view, boolean flat) {
     view.setFlat(flat);
   }
 
   @ReactProp(name = "draggable", defaultBoolean = false)
-  public void setDraggable(AirMapMarker view, boolean draggable) {
+  public void setDraggable(MapMarker view, boolean draggable) {
     view.setDraggable(draggable);
   }
 
   @Override
   @ReactProp(name = "zIndex", defaultFloat = 0.0f)
-  public void setZIndex(AirMapMarker view, float zIndex) {
+  public void setZIndex(MapMarker view, float zIndex) {
     super.setZIndex(view, zIndex);
     int integerZIndex = Math.round(zIndex);
     view.setZIndex(integerZIndex);
@@ -256,22 +256,22 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
 
   @Override
   @ReactProp(name = "opacity", defaultFloat = 1.0f)
-  public void setOpacity(AirMapMarker view, float opacity) {
+  public void setOpacity(MapMarker view, float opacity) {
     super.setOpacity(view, opacity);
     view.setOpacity(opacity);
   }
 
   @ReactProp(name = "tracksViewChanges", defaultBoolean = true)
-  public void setTracksViewChanges(AirMapMarker view, boolean tracksViewChanges) {
+  public void setTracksViewChanges(MapMarker view, boolean tracksViewChanges) {
     view.setTracksViewChanges(tracksViewChanges);
   }
 
   @Override
-  public void addView(AirMapMarker parent, View child, int index) {
+  public void addView(MapMarker parent, View child, int index) {
     // if an <Callout /> component is a child, then it is a callout view, NOT part of the
     // marker.
-    if (child instanceof AirMapCallout) {
-      parent.setCalloutView((AirMapCallout) child);
+    if (child instanceof MapCallout) {
+      parent.setCalloutView((MapCallout) child);
     } else {
       super.addView(parent, child, index);
       parent.update(true);
@@ -279,13 +279,13 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
   }
 
   @Override
-  public void removeViewAt(AirMapMarker parent, int index) {
+  public void removeViewAt(MapMarker parent, int index) {
     super.removeViewAt(parent, index);
     parent.update(true);
   }
 
   @Override
-  public void receiveCommand(@NonNull AirMapMarker view, String commandId, @Nullable ReadableArray args) {
+  public void receiveCommand(@NonNull MapMarker view, String commandId, @Nullable ReadableArray args) {
     int duration;
     double lat;
     double lng;
@@ -347,7 +347,7 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
   }
 
   @Override
-  public void updateExtraData(AirMapMarker view, Object extraData) {
+  public void updateExtraData(MapMarker view, Object extraData) {
     // This method is called from the shadow node with the width/height of the rendered
     // marker view.
     HashMap<String, Float> data = (HashMap<String, Float>) extraData;