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

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapView.java → rnmaps/maps/MapView.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -36,7 +36,6 @@ import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
-import com.google.android.gms.maps.MapView;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.Projection;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
@@ -71,7 +70,7 @@ import java.util.concurrent.ExecutionException;
 
 import static androidx.core.content.PermissionChecker.checkSelfPermission;
 
-public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
+public class MapView extends com.google.android.gms.maps.MapView implements GoogleMap.InfoWindowAdapter,
     GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener {
   public GoogleMap map;
   private ProgressBar mapLoadingProgressBar;
@@ -101,15 +100,15 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   private static final String[] PERMISSIONS = new String[]{
       "android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
 
-  private final List<AirMapFeature> features = new ArrayList<>();
-  private final Map<Marker, AirMapMarker> markerMap = new HashMap<>();
-  private final Map<Polyline, AirMapPolyline> polylineMap = new HashMap<>();
-  private final Map<Polygon, AirMapPolygon> polygonMap = new HashMap<>();
-  private final Map<GroundOverlay, AirMapOverlay> overlayMap = new HashMap<>();
-  private final Map<TileOverlay, AirMapHeatmap> heatmapMap = new HashMap<>();
-  private final Map<TileOverlay, AirMapGradientPolyline> gradientPolylineMap = new HashMap<>();
+  private 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<>();
+  private final Map<GroundOverlay, MapOverlay> overlayMap = new HashMap<>();
+  private final Map<TileOverlay, MapHeatmap> heatmapMap = new HashMap<>();
+  private final Map<TileOverlay, MapGradientPolyline> gradientPolylineMap = new HashMap<>();
   private final GestureDetectorCompat gestureDetector;
-  private final AirMapManager manager;
+  private final MapManager manager;
   private LifecycleEventListener lifecycleListener;
   private boolean paused = false;
   private boolean destroyed = false;
@@ -150,9 +149,9 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     return superContext;
   }
 
-  public AirMapView(ThemedReactContext reactContext, ReactApplicationContext appContext,
-      AirMapManager manager,
-      GoogleMapOptions googleMapOptions) {
+  public MapView(ThemedReactContext reactContext, ReactApplicationContext appContext,
+                 MapManager manager,
+                 GoogleMapOptions googleMapOptions) {
     super(getNonBuggyContext(reactContext, appContext), googleMapOptions);
 
     this.manager = manager;
@@ -163,7 +162,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     super.onResume();
     super.getMapAsync(this);
 
-    final AirMapView view = this;
+    final MapView view = this;
 
     fusedLocationSource = new FusedLocationSource(context);
 
@@ -190,7 +189,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
       @Override public void onLayoutChange(View v, int left, int top, int right, int bottom,
           int oldLeft, int oldTop, int oldRight, int oldBottom) {
         if (!paused) {
-          AirMapView.this.cacheView();
+          MapView.this.cacheView();
         }
       }
     });
@@ -224,7 +223,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
     manager.pushEvent(context, this, "onMapReady", new WritableNativeMap());
 
-    final AirMapView view = this;
+    final MapView view = this;
 
     map.setOnMyLocationChangeListener(new GoogleMap.OnMyLocationChangeListener() {
       @Override
@@ -251,7 +250,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
       @Override
       public boolean onMarkerClick(Marker marker) {
         WritableMap event;
-        AirMapMarker airMapMarker = getMarkerMap(marker);
+        MapMarker airMapMarker = getMarkerMap(marker);
 
         event = makeClickEventData(marker.getPosition());
         event.putString("action", "marker-press");
@@ -304,12 +303,12 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
         event = makeClickEventData(marker.getPosition());
         event.putString("action", "callout-press");
-        AirMapMarker markerView = getMarkerMap(marker);
+        MapMarker markerView = getMarkerMap(marker);
         manager.pushEvent(context, markerView, "onCalloutPress", event);
 
         event = makeClickEventData(marker.getPosition());
         event.putString("action", "callout-press");
-        AirMapCallout infoWindow = markerView.getCalloutView();
+        MapCallout infoWindow = markerView.getCalloutView();
         if (infoWindow != null) manager.pushEvent(context, infoWindow, "onPress", event);
       }
     });
@@ -382,7 +381,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
       @Override public void onMapLoaded() {
         isMapLoaded = true;
         manager.pushEvent(context, view, "onMapLoaded", new WritableNativeMap());
-        AirMapView.this.cacheView();
+        MapView.this.cacheView();
       }
     });
 
@@ -401,9 +400,9 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
           map.setMyLocationEnabled(showUserLocation);
           map.setLocationSource(fusedLocationSource);
         }
-        synchronized (AirMapView.this) {
+        synchronized (MapView.this) {
           if (!destroyed) {
-            AirMapView.this.onResume();
+            MapView.this.onResume();
           }
           paused = false;
         }
@@ -415,9 +414,9 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
           //noinspection MissingPermission
           map.setMyLocationEnabled(false);
         }
-        synchronized (AirMapView.this) {
+        synchronized (MapView.this) {
           if (!destroyed) {
-            AirMapView.this.onPause();
+            MapView.this.onPause();
           }
           paused = true;
         }
@@ -425,7 +424,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
       @Override
       public void onHostDestroy() {
-        AirMapView.this.doDestroy();
+        MapView.this.doDestroy();
       }
     };
 
@@ -654,8 +653,8 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   public void addFeature(View child, int index) {
     // Our desired API is to pass up annotations/overlays as children to the mapview component.
     // This is where we intercept them and do the appropriate underlying mapview action.
-    if (child instanceof AirMapMarker) {
-      AirMapMarker annotation = (AirMapMarker) child;
+    if (child instanceof MapMarker) {
+      MapMarker annotation = (MapMarker) child;
       annotation.addToMap(map);
       features.add(index, annotation);
 
@@ -680,48 +679,48 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
       Marker marker = (Marker) annotation.getFeature();
       markerMap.put(marker, annotation);
-    } else if (child instanceof AirMapPolyline) {
-      AirMapPolyline polylineView = (AirMapPolyline) child;
+    } else if (child instanceof MapPolyline) {
+      MapPolyline polylineView = (MapPolyline) child;
       polylineView.addToMap(map);
       features.add(index, polylineView);
       Polyline polyline = (Polyline) polylineView.getFeature();
       polylineMap.put(polyline, polylineView);
-    } else if (child instanceof AirMapGradientPolyline) {
-      AirMapGradientPolyline polylineView = (AirMapGradientPolyline) child;
+    } else if (child instanceof MapGradientPolyline) {
+      MapGradientPolyline polylineView = (MapGradientPolyline) child;
       polylineView.addToMap(map);
       features.add(index, polylineView);
       TileOverlay tileOverlay = (TileOverlay) polylineView.getFeature();
       gradientPolylineMap.put(tileOverlay, polylineView);
-    } else if (child instanceof AirMapPolygon) {
-      AirMapPolygon polygonView = (AirMapPolygon) child;
+    } else if (child instanceof MapPolygon) {
+      MapPolygon polygonView = (MapPolygon) child;
       polygonView.addToMap(map);
       features.add(index, polygonView);
       Polygon polygon = (Polygon) polygonView.getFeature();
       polygonMap.put(polygon, polygonView);
-    } else if (child instanceof AirMapCircle) {
-      AirMapCircle circleView = (AirMapCircle) child;
+    } else if (child instanceof MapCircle) {
+      MapCircle circleView = (MapCircle) child;
       circleView.addToMap(map);
       features.add(index, circleView);
-    } else if (child instanceof AirMapUrlTile) {
-      AirMapUrlTile urlTileView = (AirMapUrlTile) child;
+    } else if (child instanceof MapUrlTile) {
+      MapUrlTile urlTileView = (MapUrlTile) child;
       urlTileView.addToMap(map);
       features.add(index, urlTileView);
-    } else if (child instanceof AirMapWMSTile) {
-      AirMapWMSTile urlTileView = (AirMapWMSTile) child;
+    } else if (child instanceof MapWMSTile) {
+      MapWMSTile urlTileView = (MapWMSTile) child;
       urlTileView.addToMap(map);
       features.add(index, urlTileView);
-    } else if (child instanceof AirMapLocalTile) {
-      AirMapLocalTile localTileView = (AirMapLocalTile) child;
+    } else if (child instanceof MapLocalTile) {
+      MapLocalTile localTileView = (MapLocalTile) child;
       localTileView.addToMap(map);
       features.add(index, localTileView);
-    } else if (child instanceof AirMapOverlay) {
-      AirMapOverlay overlayView = (AirMapOverlay) child;
+    } else if (child instanceof MapOverlay) {
+      MapOverlay overlayView = (MapOverlay) child;
       overlayView.addToMap(map);
       features.add(index, overlayView);
       GroundOverlay overlay = (GroundOverlay) overlayView.getFeature();
       overlayMap.put(overlay, overlayView);
-    } else if (child instanceof AirMapHeatmap) {
-      AirMapHeatmap heatmapView = (AirMapHeatmap) child;
+    } else if (child instanceof MapHeatmap) {
+      MapHeatmap heatmapView = (MapHeatmap) child;
       heatmapView.addToMap(map);
       features.add(index, heatmapView);
       TileOverlay heatmap = (TileOverlay)heatmapView.getFeature();
@@ -745,10 +744,10 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   }
 
   public void removeFeatureAt(int index) {
-    AirMapFeature feature = features.remove(index);
-    if (feature instanceof AirMapMarker) {
+    MapFeature feature = features.remove(index);
+    if (feature instanceof MapMarker) {
       markerMap.remove(feature.getFeature());
-    } else if (feature instanceof AirMapHeatmap) {
+    } else if (feature instanceof MapHeatmap) {
       heatmapMap.remove(feature.getFeature());
     }
     feature.removeFromMap(map);
@@ -841,8 +840,8 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
     boolean addedPosition = false;
 
-    for (AirMapFeature feature : features) {
-      if (feature instanceof AirMapMarker) {
+    for (MapFeature feature : features) {
+      if (feature instanceof MapMarker) {
         Marker marker = (Marker) feature.getFeature();
         builder.include(marker.getPosition());
         addedPosition = true;
@@ -880,9 +879,9 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
     List<String> markerIDList = Arrays.asList(markerIDs);
 
-    for (AirMapFeature feature : features) {
-      if (feature instanceof AirMapMarker) {
-        String identifier = ((AirMapMarker) feature).getIdentifier();
+    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());
@@ -1001,13 +1000,13 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
   @Override
   public View getInfoWindow(Marker marker) {
-    AirMapMarker markerView = getMarkerMap(marker);
+    MapMarker markerView = getMarkerMap(marker);
     return markerView.getCallout();
   }
 
   @Override
   public View getInfoContents(Marker marker) {
-    AirMapMarker markerView = getMarkerMap(marker);
+    MapMarker markerView = getMarkerMap(marker);
     return markerView.getInfoContents();
   }
 
@@ -1042,7 +1041,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     WritableMap event = makeClickEventData(marker.getPosition());
     manager.pushEvent(context, this, "onMarkerDragStart", event);
 
-    AirMapMarker markerView = getMarkerMap(marker);
+    MapMarker markerView = getMarkerMap(marker);
     event = makeClickEventData(marker.getPosition());
     manager.pushEvent(context, markerView, "onDragStart", event);
   }
@@ -1052,7 +1051,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     WritableMap event = makeClickEventData(marker.getPosition());
     manager.pushEvent(context, this, "onMarkerDrag", event);
 
-    AirMapMarker markerView = getMarkerMap(marker);
+    MapMarker markerView = getMarkerMap(marker);
     event = makeClickEventData(marker.getPosition());
     manager.pushEvent(context, markerView, "onDrag", event);
   }
@@ -1062,7 +1061,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     WritableMap event = makeClickEventData(marker.getPosition());
     manager.pushEvent(context, this, "onMarkerDragEnd", event);
 
-    AirMapMarker markerView = getMarkerMap(marker);
+    MapMarker markerView = getMarkerMap(marker);
     event = makeClickEventData(marker.getPosition());
     manager.pushEvent(context, markerView, "onDragEnd", event);
   }
@@ -1235,7 +1234,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
         options.title(title);
         options.snippet(snippet);
 
-        AirMapMarker marker = new AirMapMarker(context, options, this.manager.getMarkerManager());
+        MapMarker marker = new MapMarker(context, options, this.manager.getMarkerManager());
 
         if (placemark.getInlineStyle() != null
             && placemark.getInlineStyle().getIconUrl() != null) {
@@ -1341,14 +1340,14 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     }
   }
 
-  private AirMapMarker getMarkerMap(Marker marker) {
-    AirMapMarker airMarker = markerMap.get(marker);
+  private MapMarker getMarkerMap(Marker marker) {
+    MapMarker airMarker = markerMap.get(marker);
 
     if (airMarker != null) {
       return airMarker;
     }
 
-    for (Map.Entry<Marker, AirMapMarker> entryMarker : markerMap.entrySet()) {
+    for (Map.Entry<Marker, MapMarker> entryMarker : markerMap.entrySet()) {
       if (entryMarker.getKey().getPosition().equals(marker.getPosition())
           && entryMarker.getKey().getTitle().equals(marker.getTitle())) {
         airMarker = entryMarker.getValue();

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapWMSTile.java → rnmaps/maps/MapWMSTile.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 
@@ -8,11 +8,11 @@ import com.google.android.gms.maps.model.UrlTileProvider;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-public class AirMapWMSTile extends AirMapUrlTile {
+public class MapWMSTile extends MapUrlTile {
   private static final double[] mapBound = {-20037508.34789244, 20037508.34789244};
   private static final double FULL = 20037508.34789244 * 2;
 
-  class AIRMapGSUrlTileProvider extends AirMapTileProvider {
+  class AIRMapGSUrlTileProvider extends MapTileProvider {
 
     class AIRMapWMSTileProvider extends UrlTileProvider {
     private String urlTemplate;
@@ -26,11 +26,11 @@ public class AirMapWMSTile extends AirMapUrlTile {
 
     @Override
     public URL getTileUrl(int x, int y, int zoom) {
-      if(AirMapWMSTile.this.maximumZ > 0 && zoom > maximumZ) {
+      if(MapWMSTile.this.maximumZ > 0 && zoom > maximumZ) {
           return null;
       }
 
-      if(AirMapWMSTile.this.minimumZ > 0 && zoom < minimumZ) {
+      if(MapWMSTile.this.minimumZ > 0 && zoom < minimumZ) {
           return null;
       }
 
@@ -76,7 +76,7 @@ public class AirMapWMSTile extends AirMapUrlTile {
     }
   }
 
-  public AirMapWMSTile(Context context) {
+  public MapWMSTile(Context context) {
     super(context);
   }
 

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapWMSTileManager.java → rnmaps/maps/MapWMSTileManager.java}

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
@@ -9,9 +9,9 @@ import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
-public class AirMapWMSTileManager extends ViewGroupManager<AirMapWMSTile> {
+public class MapWMSTileManager extends ViewGroupManager<MapWMSTile> {
 
-  public AirMapWMSTileManager(ReactApplicationContext reactContext) {
+  public MapWMSTileManager(ReactApplicationContext reactContext) {
     super();
     DisplayMetrics metrics = new DisplayMetrics();
     ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
@@ -25,57 +25,57 @@ public class AirMapWMSTileManager extends ViewGroupManager<AirMapWMSTile> {
   }
 
   @Override
-  public AirMapWMSTile createViewInstance(ThemedReactContext context) {
-    return new AirMapWMSTile(context);
+  public MapWMSTile createViewInstance(ThemedReactContext context) {
+    return new MapWMSTile(context);
   }
 
   @ReactProp(name = "urlTemplate")
-  public void setUrlTemplate(AirMapWMSTile view, String urlTemplate) {
+  public void setUrlTemplate(MapWMSTile view, String urlTemplate) {
     view.setUrlTemplate(urlTemplate);
   }
 
   @ReactProp(name = "zIndex", defaultFloat = -1.0f)
-  public void setZIndex(AirMapWMSTile view, float zIndex) {
+  public void setZIndex(MapWMSTile view, float zIndex) {
     view.setZIndex(zIndex);
   }
 
   @ReactProp(name = "minimumZ", defaultFloat = 0.0f)
-  public void setMinimumZ(AirMapWMSTile view, float minimumZ) {
+  public void setMinimumZ(MapWMSTile view, float minimumZ) {
     view.setMinimumZ(minimumZ);
   }
 
   @ReactProp(name = "maximumZ", defaultFloat = 100.0f)
-  public void setMaximumZ(AirMapWMSTile view, float maximumZ) {
+  public void setMaximumZ(MapWMSTile view, float maximumZ) {
     view.setMaximumZ(maximumZ);
   }
 
   @ReactProp(name = "maximumNativeZ", defaultFloat = 100.0f)
-  public void setMaximumNativeZ(AirMapWMSTile view, float maximumNativeZ) {
+  public void setMaximumNativeZ(MapWMSTile view, float maximumNativeZ) {
     view.setMaximumNativeZ(maximumNativeZ);
   }
 
   @ReactProp(name = "tileSize", defaultFloat = 256.0f)
-  public void setTileSize(AirMapWMSTile view, float tileSize) {
+  public void setTileSize(MapWMSTile view, float tileSize) {
     view.setTileSize(tileSize);
   }
 
   @ReactProp(name = "tileCachePath")
-  public void setTileCachePath(AirMapWMSTile view, String tileCachePath) {
+  public void setTileCachePath(MapWMSTile view, String tileCachePath) {
     view.setTileCachePath(tileCachePath);
   }
 
   @ReactProp(name = "tileCacheMaxAge", defaultFloat = 0.0f)
-  public void setTileCacheMaxAge(AirMapWMSTile view, float tileCacheMaxAge) {
+  public void setTileCacheMaxAge(MapWMSTile view, float tileCacheMaxAge) {
     view.setTileCacheMaxAge(tileCacheMaxAge);
   }
 
   @ReactProp(name = "offlineMode", defaultBoolean = false)
-  public void setOfflineMode(AirMapWMSTile view, boolean offlineMode) {
+  public void setOfflineMode(MapWMSTile view, boolean offlineMode) {
     view.setOfflineMode(offlineMode);
   }
 
   @ReactProp(name = "opacity", defaultFloat = 1.0f)
-  public void setOpacity(AirMapWMSTile view, float opacity) {
+  public void setOpacity(MapWMSTile view, float opacity) {
     view.setOpacity(opacity);
   }
 }

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

@@ -0,0 +1,46 @@
+package com.rnmaps.maps;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MapsPackage implements ReactPackage {
+
+  @Override
+  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    List<NativeModule> modules = new ArrayList<>();
+
+    modules.add(new MapModule(reactContext));
+
+    return modules;
+  }
+
+  @Override
+  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    MapManager mapManager = new MapManager(reactContext);
+    MapMarkerManager annotationManager = new MapMarkerManager();
+    mapManager.setMarkerManager(annotationManager);
+
+    List<ViewManager> viewManagers = new ArrayList<>();
+
+    viewManagers.add(mapManager);
+    viewManagers.add(annotationManager);
+    viewManagers.add(new MapCalloutManager());
+    viewManagers.add(new MapPolylineManager(reactContext));
+    viewManagers.add(new MapGradientPolylineManager(reactContext));
+    viewManagers.add(new MapPolygonManager(reactContext));
+    viewManagers.add(new MapCircleManager(reactContext));
+    viewManagers.add(new MapLiteManager(reactContext));
+    viewManagers.add(new MapUrlTileManager(reactContext));
+    viewManagers.add(new MapWMSTileManager(reactContext));
+    viewManagers.add(new MapLocalTileManager(reactContext));
+    viewManagers.add(new MapOverlayManager(reactContext));
+    viewManagers.add(new MapHeatmapManager());
+
+    return viewManagers;
+  }
+}

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

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;

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

@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.UIViewOperationQueue;

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

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 import android.graphics.Rect;

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

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.os.Handler;
 import android.os.Looper;
@@ -9,7 +9,7 @@ public class ViewChangesTracker {
 
   private static ViewChangesTracker instance;
   private final Handler handler;
-  private final LinkedList<AirMapMarker> markers = new LinkedList<>();
+  private final LinkedList<MapMarker> markers = new LinkedList<>();
   private boolean hasScheduledFrame = false;
   private final Runnable updateRunnable;
   private final long fps = 40;
@@ -39,7 +39,7 @@ public class ViewChangesTracker {
     return instance;
   }
 
-  public void addMarker(AirMapMarker marker) {
+  public void addMarker(MapMarker marker) {
     markers.add(marker);
 
     if (!hasScheduledFrame) {
@@ -48,18 +48,18 @@ public class ViewChangesTracker {
     }
   }
 
-  public void removeMarker(AirMapMarker marker) {
+  public void removeMarker(MapMarker marker) {
     markers.remove(marker);
   }
 
-  public boolean containsMarker(AirMapMarker marker) {
+  public boolean containsMarker(MapMarker marker) {
     return markers.contains(marker);
   }
 
-  private final LinkedList<AirMapMarker> markersToRemove = new LinkedList<>();
+  private final LinkedList<MapMarker> markersToRemove = new LinkedList<>();
 
   public void update() {
-    for (AirMapMarker marker : markers) {
+    for (MapMarker marker : markers) {
       if (!marker.updateCustomForTracking()) {
         markersToRemove.add(marker);
       }

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.3.2",
+  "version": "1.4.0-beta.1",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -57,16 +57,16 @@
     "@react-native-community/eslint-config": "3.1.0",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
-    "@types/react-native": "0.70.3",
-    "babel-jest": "29.0.3",
-    "eslint": "8.23.1",
+    "@types/react-native": "0.70.4",
+    "babel-jest": "29.1.2",
+    "eslint": "8.25.0",
     "husky": "8.0.1",
-    "jest": "29.0.3",
+    "jest": "29.1.2",
     "prettier": "2.7.1",
     "react": "18.1.0",
-    "react-native": "0.70.1",
+    "react-native": "0.70.2",
     "semantic-release": "19.0.5",
-    "typescript": "4.8.3"
+    "typescript": "4.8.4"
   },
   "dependencies": {
     "@types/geojson": "^7946.0.8"