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

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapGradientPolylineManager.java → rnmaps/maps/MapGradientPolylineManager.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
@@ -15,10 +15,10 @@ import com.google.android.gms.maps.model.LatLng;
 import java.util.List;
 import java.util.ArrayList;
 
-public class AirMapGradientPolylineManager extends ViewGroupManager<AirMapGradientPolyline> {
+public class MapGradientPolylineManager extends ViewGroupManager<MapGradientPolyline> {
   private final DisplayMetrics metrics;
 
-  public AirMapGradientPolylineManager(ReactApplicationContext reactContext) {
+  public MapGradientPolylineManager(ReactApplicationContext reactContext) {
     super();
     metrics = new DisplayMetrics();
     ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
@@ -32,12 +32,12 @@ public class AirMapGradientPolylineManager extends ViewGroupManager<AirMapGradie
   }
 
   @Override
-  public AirMapGradientPolyline createViewInstance(ThemedReactContext context) {
-    return new AirMapGradientPolyline(context);
+  public MapGradientPolyline createViewInstance(ThemedReactContext context) {
+    return new MapGradientPolyline(context);
   }
 
   @ReactProp(name = "coordinates")
-  public void setCoordinates(AirMapGradientPolyline view, ReadableArray coordinates) {
+  public void setCoordinates(MapGradientPolyline view, ReadableArray coordinates) {
     List<LatLng> p = new ArrayList<LatLng>();
     for (int i = 0; i < coordinates.size(); i++) {
       ReadableMap point = coordinates.getMap(i);
@@ -48,7 +48,7 @@ public class AirMapGradientPolylineManager extends ViewGroupManager<AirMapGradie
   }
 
   @ReactProp(name = "strokeColors", customType = "ColorArray")
-  public void setStrokeColors(AirMapGradientPolyline view, ReadableArray colors) {
+  public void setStrokeColors(MapGradientPolyline view, ReadableArray colors) {
     if (colors != null) {
       if (colors.size() == 0) {
         int[] colorValues = {0,0};
@@ -70,13 +70,13 @@ public class AirMapGradientPolylineManager extends ViewGroupManager<AirMapGradie
   }
 
   @ReactProp(name = "zIndex", defaultFloat = 1.0f)
-  public void setZIndex(AirMapGradientPolyline view, float zIndex) {
+  public void setZIndex(MapGradientPolyline view, float zIndex) {
     view.setZIndex(zIndex);
   }
 
 
   @ReactProp(name = "strokeWidth", defaultFloat = 1f)
-  public void setStrokeWidth(AirMapGradientPolyline view, float widthInPoints) {
+  public void setStrokeWidth(MapGradientPolyline view, float widthInPoints) {
     float widthInScreenPx = metrics.density * widthInPoints; // done for parity with iOS
     view.setWidth(widthInScreenPx);
   }

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapHeatmap.java → rnmaps/maps/MapHeatmap.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 import android.util.Log;
@@ -13,7 +13,7 @@ import com.google.maps.android.heatmaps.Gradient;
 import java.util.Arrays;
 import java.util.List;
 
-public class AirMapHeatmap extends AirMapFeature {
+public class MapHeatmap extends MapFeature {
 
     private TileOverlayOptions heatmapOptions;
     private TileOverlay heatmap;
@@ -24,7 +24,7 @@ public class AirMapHeatmap extends AirMapFeature {
     private Double opacity;
     private Integer radius;
 
-    public AirMapHeatmap(Context context) {
+    public MapHeatmap(Context context) {
         super(context);
     }
 

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapHeatmapManager.java → rnmaps/maps/MapHeatmapManager.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
@@ -11,7 +11,7 @@ import com.google.maps.android.heatmaps.WeightedLatLng;
 import com.google.maps.android.heatmaps.Gradient;
 
 
-public class AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
+public class MapHeatmapManager extends ViewGroupManager<MapHeatmap> {
 
     @Override
     public String getName() {
@@ -19,12 +19,12 @@ public class AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
     }
 
     @Override
-    public AirMapHeatmap createViewInstance(ThemedReactContext context) {
-        return new AirMapHeatmap(context);
+    public MapHeatmap createViewInstance(ThemedReactContext context) {
+        return new MapHeatmap(context);
     }
 
     @ReactProp(name = "points")
-    public void setPoints(AirMapHeatmap view, ReadableArray points) {
+    public void setPoints(MapHeatmap view, ReadableArray points) {
         WeightedLatLng[] p = new WeightedLatLng[points.size()];
         for (int i = 0; i < points.size(); i++) {
             ReadableMap point = points.getMap(i);
@@ -41,7 +41,7 @@ public class AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
     }
 
     @ReactProp(name = "gradient")
-    public void setGradient(AirMapHeatmap view, ReadableMap gradient) {
+    public void setGradient(MapHeatmap view, ReadableMap gradient) {
         ReadableArray srcColors = gradient.getArray("colors");
         int[] colors = new int[srcColors.size()];
         for (int i = 0; i < srcColors.size(); i++) {
@@ -63,12 +63,12 @@ public class AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
     }
 
     @ReactProp(name = "opacity")
-    public void setOpacity(AirMapHeatmap view, double opacity) {
+    public void setOpacity(MapHeatmap view, double opacity) {
         view.setOpacity(opacity);
     }
 
     @ReactProp(name = "radius")
-    public void setRadius(AirMapHeatmap view, int radius) {
+    public void setRadius(MapHeatmap view, int radius) {
         view.setRadius(radius);
     }
 }

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapLiteManager.java → rnmaps/maps/MapLiteManager.java}

@@ -1,9 +1,9 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.google.android.gms.maps.GoogleMapOptions;
 
-public class AirMapLiteManager extends AirMapManager {
+public class MapLiteManager extends MapManager {
 
   private static final String REACT_CLASS = "AIRMapLite";
 
@@ -12,7 +12,7 @@ public class AirMapLiteManager extends AirMapManager {
     return REACT_CLASS;
   }
 
-  public AirMapLiteManager(ReactApplicationContext context) {
+  public MapLiteManager(ReactApplicationContext context) {
     super(context);
     this.googleMapOptions = new GoogleMapOptions().liteMode(true);
   }

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapLocalTile.java → rnmaps/maps/MapLocalTile.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 
@@ -13,7 +13,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class AirMapLocalTile extends AirMapFeature {
+public class MapLocalTile extends MapFeature {
 
     class AIRMapLocalTileProvider implements TileProvider {
         private static final int BUFFER_SIZE = 16 * 1024;
@@ -80,14 +80,14 @@ public class AirMapLocalTile extends AirMapFeature {
 
     private TileOverlayOptions tileOverlayOptions;
     private TileOverlay tileOverlay;
-    private AirMapLocalTile.AIRMapLocalTileProvider tileProvider;
+    private MapLocalTile.AIRMapLocalTileProvider tileProvider;
 
     private String pathTemplate;
     private float tileSize;
     private float zIndex;
     private boolean useAssets;
 
-    public AirMapLocalTile(Context context) {
+    public MapLocalTile(Context context) {
         super(context);
     }
 
@@ -129,7 +129,7 @@ public class AirMapLocalTile extends AirMapFeature {
     private TileOverlayOptions createTileOverlayOptions() {
         TileOverlayOptions options = new TileOverlayOptions();
         options.zIndex(zIndex);
-        this.tileProvider = new AirMapLocalTile.AIRMapLocalTileProvider((int)this.tileSize, this.pathTemplate, this.useAssets);
+        this.tileProvider = new MapLocalTile.AIRMapLocalTileProvider((int)this.tileSize, this.pathTemplate, this.useAssets);
         options.tileProvider(this.tileProvider);
         return options;
     }

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapLocalTileManager.java → rnmaps/maps/MapLocalTileManager.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
@@ -12,9 +12,9 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 /**
  * Created by zavadpe on 30/11/2017.
  */
-public class AirMapLocalTileManager extends ViewGroupManager<AirMapLocalTile> {
+public class MapLocalTileManager extends ViewGroupManager<MapLocalTile> {
 
-    public AirMapLocalTileManager(ReactApplicationContext reactContext) {
+    public MapLocalTileManager(ReactApplicationContext reactContext) {
         super();
         DisplayMetrics metrics = new DisplayMetrics();
         ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
@@ -28,27 +28,27 @@ public class AirMapLocalTileManager extends ViewGroupManager<AirMapLocalTile> {
     }
 
     @Override
-    public AirMapLocalTile createViewInstance(ThemedReactContext context) {
-        return new AirMapLocalTile(context);
+    public MapLocalTile createViewInstance(ThemedReactContext context) {
+        return new MapLocalTile(context);
     }
 
     @ReactProp(name = "pathTemplate")
-    public void setPathTemplate(AirMapLocalTile view, String pathTemplate) {
+    public void setPathTemplate(MapLocalTile view, String pathTemplate) {
         view.setPathTemplate(pathTemplate);
     }
 
     @ReactProp(name = "tileSize", defaultFloat = 256f)
-    public void setTileSize(AirMapLocalTile view, float tileSize) {
+    public void setTileSize(MapLocalTile view, float tileSize) {
         view.setTileSize(tileSize);
     }
 
     @ReactProp(name = "zIndex", defaultFloat = -1.0f)
-    public void setZIndex(AirMapLocalTile view, float zIndex) {
+    public void setZIndex(MapLocalTile view, float zIndex) {
         view.setZIndex(zIndex);
     }
 
     @ReactProp(name = "useAssets", defaultBoolean = false)
-    public void setUseAssets(AirMapLocalTile view, boolean useAssets) {
+    public void setUseAssets(MapLocalTile view, boolean useAssets) {
         view.setUseAssets(useAssets);
     }
 }

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;
   }