react-native-maps 1.21.0-alpha.99 → 1.22.0

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

@@ -330,11 +330,12 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
     @Nullable
     public Map getExportedCustomDirectEventTypeConstants() {
         return MapBuilder.<String, Map<String, String>>builder()
-                .put("onPress", MapBuilder.of("registrationName", "onPress"))
                 .put("onCalloutPress", MapBuilder.of("registrationName", "onCalloutPress"))
                 .put("onDragStart", MapBuilder.of("registrationName", "onDragStart"))
                 .put("onDrag", MapBuilder.of("registrationName", "onDrag"))
                 .put("onDragEnd", MapBuilder.of("registrationName", "onDragEnd"))
+                .put("onSelect", MapBuilder.of("registrationName", "onSelect"))
+                .put("onDeselect", MapBuilder.of("registrationName", "onDeselect"))
                 .build();
     }
 
@@ -342,8 +343,7 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
     @Nullable
     public Map getExportedCustomBubblingEventTypeConstants() {
         return MapBuilder.<String, Map<String, Object>>builder()
-                .put("onSelect", MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onSelect")))
-                .put("onDeselect", MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onDeselect")))
+                .put("onPress", MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onPress")))
                 .build();
     }
 

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

@@ -68,29 +68,9 @@ public class MapOverlay extends MapFeature {
     }
 
 
-    // seems like apple users north west, south east
-    // google uses north east, south west
-    private static LatLngBounds fixBoundsIfNecessary(ReadableArray bounds) {
-        double lat1 = bounds.getArray(0).getDouble(0);
-        double lon1 = bounds.getArray(0).getDouble(1);
-        double lat2 = bounds.getArray(1).getDouble(0);
-        double lon2 = bounds.getArray(1).getDouble(1);
-
-// Ensure lat1/lon1 is the SW corner and lat2/lon2 is the NE corner
-        double southLat = Math.min(lat1, lat2);
-        double northLat = Math.max(lat1, lat2);
-        double westLon = Math.min(lon1, lon2);
-        double eastLon = Math.max(lon1, lon2);
-
-// Create corrected LatLngs
-        LatLng sw = new LatLng(southLat, westLon);
-        LatLng ne = new LatLng(northLat, eastLon);
-        return new LatLngBounds(sw, ne);
-    }
-
-    public void setBounds(ReadableArray bounds) {
 
-        this.bounds = fixBoundsIfNecessary(bounds);
+    public void setBounds(LatLngBounds bounds) {
+        this.bounds = bounds;
         if (this.groundOverlay != null) {
             this.groundOverlay.setPositionFromBounds(this.bounds);
         }

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

@@ -12,6 +12,8 @@ import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
 
 import java.util.Map;
 
@@ -37,7 +39,27 @@ public class MapOverlayManager extends ViewGroupManager<MapOverlay> {
 
   @ReactProp(name = "bounds")
   public void setBounds(MapOverlay view, ReadableArray bounds) {
-    view.setBounds(bounds);
+    view.setBounds(fixBoundsIfNecessary(bounds));
+  }
+
+  // seems like apple users north west, south east
+  // google uses north east, south west
+  private static LatLngBounds fixBoundsIfNecessary(ReadableArray bounds) {
+    double lat1 = bounds.getArray(0).getDouble(0);
+    double lon1 = bounds.getArray(0).getDouble(1);
+    double lat2 = bounds.getArray(1).getDouble(0);
+    double lon2 = bounds.getArray(1).getDouble(1);
+
+// Ensure lat1/lon1 is the SW corner and lat2/lon2 is the NE corner
+    double southLat = Math.min(lat1, lat2);
+    double northLat = Math.max(lat1, lat2);
+    double westLon = Math.min(lon1, lon2);
+    double eastLon = Math.max(lon1, lon2);
+
+// Create corrected LatLngs
+    LatLng sw = new LatLng(southLat, westLon);
+    LatLng ne = new LatLng(northLat, eastLon);
+    return new LatLngBounds(sw, ne);
   }
 
   @ReactProp(name = "bearing")

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

@@ -18,14 +18,14 @@ public class MapUrlTile extends MapFeature {
 
   protected String urlTemplate;
   protected float zIndex;
-  protected float maximumZ;
-  protected float maximumNativeZ = 100;
-  protected float minimumZ;
+  protected int maximumZ;
+  protected int maximumNativeZ = 100;
+  protected int minimumZ;
   protected boolean flipY = false;
-  protected float tileSize = 256;
+  protected int tileSize = 256;
   protected boolean doubleTileSize = false;
   protected String tileCachePath;
-  protected float tileCacheMaxAge;
+  protected int tileCacheMaxAge;
   protected boolean offlineMode = false;
   protected float opacity = 1;
   protected Context context;
@@ -53,20 +53,20 @@ public class MapUrlTile extends MapFeature {
     }
   }
 
-  public void setMaximumZ(float maximumZ) {
+  public void setMaximumZ(int maximumZ) {
     this.maximumZ = maximumZ;
     if (tileProvider != null) {
-      tileProvider.setMaximumZ((int)maximumZ);
+      tileProvider.setMaximumZ(maximumZ);
     }
     if (tileOverlay != null) {
       tileOverlay.clearTileCache();
     }
   }
 
-  public void setMaximumNativeZ(float maximumNativeZ) {
+  public void setMaximumNativeZ(int maximumNativeZ) {
     this.maximumNativeZ = maximumNativeZ;
     if (tileProvider != null) {
-      tileProvider.setMaximumNativeZ((int)maximumNativeZ);
+      tileProvider.setMaximumNativeZ(maximumNativeZ);
     }
     setCustomTileProviderMode();
     if (tileOverlay != null) {
@@ -74,10 +74,10 @@ public class MapUrlTile extends MapFeature {
     }
   }
 
-  public void setMinimumZ(float minimumZ) {
+  public void setMinimumZ(int minimumZ) {
     this.minimumZ = minimumZ;
     if (tileProvider != null) {
-      tileProvider.setMinimumZ((int)minimumZ);
+      tileProvider.setMinimumZ(minimumZ);
     }
     if (tileOverlay != null) {
       tileOverlay.clearTileCache();
@@ -105,10 +105,10 @@ public class MapUrlTile extends MapFeature {
     }
   }
 
-  public void setTileSize(float tileSize) {
+  public void setTileSize(int tileSize) {
     this.tileSize = tileSize;
     if (tileProvider != null) {
-      tileProvider.setTileSize((int)tileSize);
+      tileProvider.setTileSize(tileSize);
     }
     if (tileOverlay != null) {
       tileOverlay.clearTileCache();
@@ -136,10 +136,10 @@ public class MapUrlTile extends MapFeature {
     }
   }
 
-  public void setTileCacheMaxAge(float tileCacheMaxAge) {
+  public void setTileCacheMaxAge(int tileCacheMaxAge) {
     this.tileCacheMaxAge = tileCacheMaxAge;
     if (tileProvider != null) {
-      tileProvider.setTileCacheMaxAge((int)tileCacheMaxAge);
+      tileProvider.setTileCacheMaxAge(tileCacheMaxAge);
     }
     if (tileOverlay != null) {
       tileOverlay.clearTileCache();
@@ -176,7 +176,7 @@ public class MapUrlTile extends MapFeature {
     if (tileProvider != null) {
       tileProvider.setCustomMode();
     }
-  } 
+  }
 
   protected TileOverlayOptions createTileOverlayOptions() {
     Log.d("urlTile ", "creating TileProvider");
@@ -184,8 +184,8 @@ public class MapUrlTile extends MapFeature {
     options.zIndex(zIndex);
     options.transparency(1 - this.opacity);
     this.tileProvider = new MapTileProvider((int)this.tileSize, this.doubleTileSize, this.urlTemplate,
-      (int)this.maximumZ, (int)this.maximumNativeZ, (int)this.minimumZ, this.flipY, this.tileCachePath, 
-      (int)this.tileCacheMaxAge, this.offlineMode, this.context, this.customTileProviderNeeded);
+      this.maximumZ, this.maximumNativeZ, this.minimumZ, this.flipY, this.tileCachePath,
+      this.tileCacheMaxAge, this.offlineMode, this.context, this.customTileProviderNeeded);
     options.tileProvider(this.tileProvider);
     return options;
   }

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

@@ -13,10 +13,6 @@ public class MapUrlTileManager extends ViewGroupManager<MapUrlTile> {
 
   public MapUrlTileManager(ReactApplicationContext reactContext) {
     super();
-    DisplayMetrics metrics = new DisplayMetrics();
-    ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
-        .getDefaultDisplay()
-        .getRealMetrics(metrics);
   }
 
   @Override
@@ -39,18 +35,18 @@ public class MapUrlTileManager extends ViewGroupManager<MapUrlTile> {
     view.setZIndex(zIndex);
   }
 
-  @ReactProp(name = "minimumZ", defaultFloat = 0.0f)
-  public void setMinimumZ(MapUrlTile view, float minimumZ) {
+  @ReactProp(name = "minimumZ", defaultInt = 0)
+  public void setMinimumZ(MapUrlTile view, int minimumZ) {
     view.setMinimumZ(minimumZ);
   }
 
-  @ReactProp(name = "maximumZ", defaultFloat = 100.0f)
-  public void setMaximumZ(MapUrlTile view, float maximumZ) {
+  @ReactProp(name = "maximumZ", defaultInt = 100)
+  public void setMaximumZ(MapUrlTile view, int maximumZ) {
     view.setMaximumZ(maximumZ);
   }
 
-  @ReactProp(name = "maximumNativeZ", defaultFloat = 100.0f)
-  public void setMaximumNativeZ(MapUrlTile view, float maximumNativeZ) {
+  @ReactProp(name = "maximumNativeZ", defaultInt = 100)
+  public void setMaximumNativeZ(MapUrlTile view, int maximumNativeZ) {
     view.setMaximumNativeZ(maximumNativeZ);
   }
 
@@ -59,8 +55,8 @@ public class MapUrlTileManager extends ViewGroupManager<MapUrlTile> {
     view.setFlipY(flipY);
   }
 
-  @ReactProp(name = "tileSize", defaultFloat = 256.0f)
-  public void setTileSize(MapUrlTile view, float tileSize) {
+  @ReactProp(name = "tileSize", defaultInt = 256)
+  public void setTileSize(MapUrlTile view, int tileSize) {
     view.setTileSize(tileSize);
   }
 
@@ -74,8 +70,8 @@ public class MapUrlTileManager extends ViewGroupManager<MapUrlTile> {
     view.setTileCachePath(tileCachePath);
   }
 
-  @ReactProp(name = "tileCacheMaxAge", defaultFloat = 0.0f)
-  public void setTileCacheMaxAge(MapUrlTile view, float tileCacheMaxAge) {
+  @ReactProp(name = "tileCacheMaxAge", defaultInt = 0)
+  public void setTileCacheMaxAge(MapUrlTile view, int tileCacheMaxAge) {
     view.setTileCacheMaxAge(tileCacheMaxAge);
   }
 

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

@@ -9,6 +9,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.location.Location;
+
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 
@@ -194,15 +195,16 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
 
 
-@Override
-public void onCreate(LifecycleOwner owner) {
-    super.onCreate(null);
-}
+    @Override
+    public void onCreate(LifecycleOwner owner) {
+        super.onCreate(null);
+    }
 
     @Override
     public void onStart(LifecycleOwner owner) {
         super.onStart();
     }
+
     @Override
     public void onResume(LifecycleOwner owner) {
         if (hasPermissions() && map != null) {
@@ -220,7 +222,7 @@ public void onCreate(LifecycleOwner owner) {
 
 
     @Override
-    public void onPause(LifecycleOwner owner){
+    public void onPause(LifecycleOwner owner) {
         super.onPause();
         if (hasPermissions() && map != null) {
             //noinspection MissingPermission
@@ -240,7 +242,7 @@ public void onCreate(LifecycleOwner owner) {
     }
 
     @Override
-    public void onDestroy(LifecycleOwner owner){
+    public void onDestroy(LifecycleOwner owner) {
         MapView.this.doDestroy();
     }
 
@@ -250,7 +252,7 @@ public void onCreate(LifecycleOwner owner) {
         this.context = context;
         Activity activity = context.getCurrentActivity();
         if (activity instanceof LifecycleOwner) {
-          ((LifecycleOwner) activity).getLifecycle().addObserver(this);
+            ((LifecycleOwner) activity).getLifecycle().addObserver(this);
         }
         super.getMapAsync(this);
 
@@ -324,7 +326,7 @@ public void onCreate(LifecycleOwner owner) {
         }
         if (addedPosition) {
 
-           LatLngBounds bounds = builder.build();
+            LatLngBounds bounds = builder.build();
             LatLng northEast = bounds.northeast;
             LatLng southWest = bounds.southwest;
 
@@ -338,7 +340,7 @@ public void onCreate(LifecycleOwner owner) {
 
     public void setShowsTraffic(boolean value) {
         showsTraffic = value;
-        if (map != null){
+        if (map != null) {
             map.setTrafficEnabled(value);
         }
     }
@@ -554,8 +556,8 @@ public void onCreate(LifecycleOwner owner) {
                 event.putString("action", "overlay-press");
 
                 dispatchEvent(event, OnPressEvent::new);
-                event =  makeClickEventData(groundOverlay.getPosition());
-                dispatchEvent(event, OnPressEvent::new,overlayMap.get(groundOverlay).getId(), context);
+                event = makeClickEventData(groundOverlay.getPosition());
+                dispatchEvent(event, OnPressEvent::new, overlayMap.get(groundOverlay).getId(), context);
             }
         });
 
@@ -599,7 +601,7 @@ public void onCreate(LifecycleOwner owner) {
 
 
         isMapReady = true;
-        if (kmlSrc != null){
+        if (kmlSrc != null) {
             setKmlSrc(kmlSrc);
             kmlSrc = null;
         }
@@ -647,32 +649,36 @@ public void onCreate(LifecycleOwner owner) {
 
     public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
         MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
-        builder.put(OnMarkerPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerPressEvent.EVENT_NAME));
         builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
-        builder.put(OnMarkerSelectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerSelectEvent.EVENT_NAME));
-        builder.put(OnMarkerDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDeselectEvent.EVENT_NAME));
+        builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnLongPressEvent.EVENT_NAME));
+        return builder.build();
+    }
+
+    //                 , ,
+    public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+        builder.put(OnMarkerPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerPressEvent.EVENT_NAME));
+        builder.put(OnCalloutPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnCalloutPressEvent.EVENT_NAME));
         builder.put(OnMarkerDragEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragEvent.EVENT_NAME));
         builder.put(OnMarkerDragStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragStartEvent.EVENT_NAME));
         builder.put(OnMarkerDragEndEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragEndEvent.EVENT_NAME));
         builder.put(OnPoiClickEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPoiClickEvent.EVENT_NAME));
-        builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnLongPressEvent.EVENT_NAME));
-        builder.put(OnRegionChangeStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeStartEvent.EVENT_NAME));
         builder.put(OnDoublePressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDoublePressEvent.EVENT_NAME));
         builder.put(OnPanDragEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPanDragEvent.EVENT_NAME));
+        builder.put(OnMarkerSelectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerSelectEvent.EVENT_NAME));
+        builder.put(OnMarkerDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDeselectEvent.EVENT_NAME));
+        builder.put(OnMapLoadedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMapLoadedEvent.EVENT_NAME));
+        builder.put(OnMapReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMapReadyEvent.EVENT_NAME));
+        builder.put(OnUserLocationChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnUserLocationChangeEvent.EVENT_NAME));
+        builder.put(OnRegionChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeEvent.EVENT_NAME));
+        builder.put(OnRegionChangeStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeStartEvent.EVENT_NAME));
+        builder.put(OnRegionChangeCompleteEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeCompleteEvent.EVENT_NAME));
+        builder.put(OnIndoorBuildingFocusedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorBuildingFocusedEvent.EVENT_NAME));
+        builder.put(OnIndoorLevelActivatedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorLevelActivatedEvent.EVENT_NAME));
+        builder.put(OnKmlReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnKmlReadyEvent.EVENT_NAME));
         return builder.build();
     }
 
-    public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-        return MapBuilder.of(
-                OnMapReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMapReadyEvent.EVENT_NAME),
-                OnUserLocationChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnUserLocationChangeEvent.EVENT_NAME),
-                OnRegionChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeEvent.EVENT_NAME),
-                OnIndoorBuildingFocusedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorBuildingFocusedEvent.EVENT_NAME),
-                OnIndoorLevelActivatedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorLevelActivatedEvent.EVENT_NAME),
-                OnKmlReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnKmlReadyEvent.EVENT_NAME)
-        );
-    }
-
 
     /*
     onDestroy is final method so I can't override it.
@@ -732,6 +738,13 @@ public void onCreate(LifecycleOwner owner) {
             map.setMapStyle(new MapStyleOptions(customMapStyleString));
         }
         this.setPoiClickEnabled(poiClickEnabled);
+        if (setPaddingDeferred &&
+                (baseLeftMapPadding != 0 ||
+                        baseTopMapPadding != 0 ||
+                        baseRightMapPadding != 0 ||
+                        baseBottomMapPadding != 0)) {
+            applyBaseMapPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
+        }
     }
 
     public static LatLngBounds latLngBoundsFromRegion(ReadableMap region) {
@@ -862,7 +875,7 @@ public void onCreate(LifecycleOwner owner) {
 
     public void setShowsUserLocation(boolean showUserLocation) {
         this.showUserLocation = showUserLocation; // hold onto this for lifecycle handling
-        if (hasPermissions()) {
+        if (hasPermissions() && map != null) {
             map.setLocationSource(fusedLocationSource);
             //noinspection MissingPermission
             map.setMyLocationEnabled(showUserLocation);
@@ -1216,6 +1229,7 @@ public void onCreate(LifecycleOwner owner) {
             cameraToSet = null;
         }
     }
+
     public void animateToCamera(CameraPosition position, int duration) {
         if (map == null) return;
         CameraUpdate update = CameraUpdateFactory.newCameraPosition(position);
@@ -1260,16 +1274,16 @@ public void onCreate(LifecycleOwner owner) {
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
 
         boolean addedPosition = false;
-       if (features.size() > 0) {
-           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 (features.size() > 0) {
+            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, 0);
@@ -1376,6 +1390,7 @@ public void onCreate(LifecycleOwner owner) {
 
         // Move the google logo to the default base padding value.
         map.setPadding(left, top, right, bottom);
+        setPaddingDeferred = false;
     }
 
     public void fitToCoordinates(ReadableArray coordinatesArray, ReadableMap edgePadding,
@@ -1725,7 +1740,7 @@ public void onCreate(LifecycleOwner owner) {
                 e.printStackTrace();
             }
         } else {
-           this.kmlSrc = kmlSrc;
+            this.kmlSrc = kmlSrc;
         }
     }
 
@@ -1744,24 +1759,20 @@ public void onCreate(LifecycleOwner owner) {
                 levelsArray.pushMap(levelMap);
                 index++;
             }
-            WritableMap event = Arguments.createMap();
             WritableMap indoorBuilding = Arguments.createMap();
             indoorBuilding.putArray("levels", levelsArray);
             indoorBuilding.putInt("activeLevelIndex", building.getActiveLevelIndex());
             indoorBuilding.putBoolean("underground", building.isUnderground());
 
-            event.putMap("indoorBuilding", indoorBuilding);
-            dispatchEvent(event, OnIndoorBuildingFocusedEvent::new);
+            dispatchEvent(indoorBuilding, OnIndoorBuildingFocusedEvent::new);
         } else {
-            WritableMap event = Arguments.createMap();
             WritableArray levelsArray = Arguments.createArray();
             WritableMap indoorBuilding = Arguments.createMap();
             indoorBuilding.putArray("levels", levelsArray);
             indoorBuilding.putInt("activeLevelIndex", 0);
             indoorBuilding.putBoolean("underground", false);
 
-            event.putMap("indoorBuilding", indoorBuilding);
-            dispatchEvent(event, OnIndoorBuildingFocusedEvent::new);
+            dispatchEvent(indoorBuilding, OnIndoorBuildingFocusedEvent::new);
         }
     }
 
@@ -1776,15 +1787,13 @@ public void onCreate(LifecycleOwner owner) {
         }
         IndoorLevel level = building.getLevels().get(activeLevelIndex);
 
-        WritableMap event = Arguments.createMap();
         WritableMap indoorlevel = Arguments.createMap();
 
         indoorlevel.putInt("activeLevelIndex", activeLevelIndex);
         indoorlevel.putString("name", level.getName());
         indoorlevel.putString("shortName", level.getShortName());
 
-        event.putMap("indoorLevel", indoorlevel);
-        dispatchEvent(event, OnIndoorLevelActivatedEvent::new);
+        dispatchEvent(indoorlevel, OnIndoorLevelActivatedEvent::new);
     }
 
     public void setIndoorActiveLevelIndex(int activeLevelIndex) {

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

@@ -85,9 +85,9 @@ public class MapWMSTile extends MapUrlTile {
     TileOverlayOptions options = new TileOverlayOptions();
     options.zIndex(zIndex);
     options.transparency(1 - this.opacity);
-    AIRMapGSUrlTileProvider tileProvider = new AIRMapGSUrlTileProvider((int) this.tileSize, this.urlTemplate,
-            (int) this.maximumZ, (int) this.maximumNativeZ, (int) this.minimumZ, this.tileCachePath,
-            (int) this.tileCacheMaxAge, this.offlineMode, this.context, this.customTileProviderNeeded);
+    AIRMapGSUrlTileProvider tileProvider = new AIRMapGSUrlTileProvider(this.tileSize, this.urlTemplate,
+            this.maximumZ, this.maximumNativeZ, this.minimumZ, this.tileCachePath,
+            this.tileCacheMaxAge, this.offlineMode, this.context, this.customTileProviderNeeded);
     options.tileProvider(tileProvider);
     return options;
   }

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

@@ -39,23 +39,23 @@ public class MapWMSTileManager extends ViewGroupManager<MapWMSTile> {
     view.setZIndex(zIndex);
   }
 
-  @ReactProp(name = "minimumZ", defaultFloat = 0.0f)
-  public void setMinimumZ(MapWMSTile view, float minimumZ) {
+  @ReactProp(name = "minimumZ", defaultInt = 0)
+  public void setMinimumZ(MapWMSTile view, int minimumZ) {
     view.setMinimumZ(minimumZ);
   }
 
-  @ReactProp(name = "maximumZ", defaultFloat = 100.0f)
-  public void setMaximumZ(MapWMSTile view, float maximumZ) {
+  @ReactProp(name = "maximumZ", defaultInt = 100)
+  public void setMaximumZ(MapWMSTile view, int maximumZ) {
     view.setMaximumZ(maximumZ);
   }
 
-  @ReactProp(name = "maximumNativeZ", defaultFloat = 100.0f)
-  public void setMaximumNativeZ(MapWMSTile view, float maximumNativeZ) {
+  @ReactProp(name = "maximumNativeZ", defaultInt= 100)
+  public void setMaximumNativeZ(MapWMSTile view, int maximumNativeZ) {
     view.setMaximumNativeZ(maximumNativeZ);
   }
 
-  @ReactProp(name = "tileSize", defaultFloat = 256.0f)
-  public void setTileSize(MapWMSTile view, float tileSize) {
+  @ReactProp(name = "tileSize", defaultInt = 256)
+  public void setTileSize(MapWMSTile view, int tileSize) {
     view.setTileSize(tileSize);
   }
 
@@ -64,8 +64,8 @@ public class MapWMSTileManager extends ViewGroupManager<MapWMSTile> {
     view.setTileCachePath(tileCachePath);
   }
 
-  @ReactProp(name = "tileCacheMaxAge", defaultFloat = 0.0f)
-  public void setTileCacheMaxAge(MapWMSTile view, float tileCacheMaxAge) {
+  @ReactProp(name = "tileCacheMaxAge", defaultInt = 0)
+  public void setTileCacheMaxAge(MapWMSTile view, int tileCacheMaxAge) {
     view.setTileCacheMaxAge(tileCacheMaxAge);
   }
 

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,36 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/RNMapsSpecs/*.cpp)
+
+add_library(
+  react_codegen_RNMapsSpecs
+  OBJECT
+  ${react_codegen_SRCS}
+)
+
+target_include_directories(react_codegen_RNMapsSpecs PUBLIC . react/renderer/components/RNMapsSpecs)
+
+target_link_libraries(
+  react_codegen_RNMapsSpecs
+  fbjni
+  jsi
+  # We need to link different libraries based on whether we are building rncore or not, that's necessary
+  # because we want to break a circular dependency between react_codegen_rncore and reactnative
+  reactnative
+)
+
+target_compile_options(
+  react_codegen_RNMapsSpecs
+  PRIVATE
+  -DLOG_TAG=\"ReactNative\"
+  -fexceptions
+  -frtti
+  -std=c++20
+  -Wall
+)