react-native-maps 1.21.0-alpha.53 → 1.21.0-alpha.54

package/android/src/main/java/com/rnmaps/fabric/MapViewManager.java

@@ -1,6 +1,8 @@
 package com.rnmaps.fabric;
 
 
+import static com.rnmaps.maps.MapManager.MY_LOCATION_PRIORITY;
+
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -23,7 +25,7 @@ import java.util.Map;
 public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsMapViewManagerInterface<MapView> {
 
 
-    public MapViewManager(ReactApplicationContext context){
+    public MapViewManager(ReactApplicationContext context) {
         super(context);
     }
     private GoogleMapOptions options;
@@ -72,12 +74,12 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setCompassOffset(MapView view, @Nullable ReadableMap value) {
-
+        // not supported
     }
 
     @Override
     public void setFollowsUserLocation(MapView view, boolean value) {
-
+        // not supported
     }
 
     @Override
@@ -102,7 +104,7 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setLegalLabelInsets(MapView view, @Nullable ReadableMap value) {
-
+        // not supported
     }
 
     @Override
@@ -122,22 +124,47 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setLoadingBackgroundColor(MapView view, @Nullable Integer value) {
-
+        view.setLoadingBackgroundColor(value);
     }
 
     @Override
     public void setLoadingEnabled(MapView view, boolean value) {
-
+        view.setLoadingEnabled(value);
     }
 
     @Override
     public void setLoadingIndicatorColor(MapView view, @Nullable Integer value) {
-
+        view.setLoadingIndicatorColor(value);
     }
 
     @Override
-    public void setMapPadding(MapView view, @Nullable ReadableMap value) {
+    public void setMapPadding(MapView view, @Nullable ReadableMap padding) {
+        int left = 0;
+        int top = 0;
+        int right = 0;
+        int bottom = 0;
+        double density = (double) view.getResources().getDisplayMetrics().density;
+
+        if (padding != null) {
+            if (padding.hasKey("left")) {
+                left = (int) (padding.getDouble("left") * density);
+            }
+
+            if (padding.hasKey("top")) {
+                top = (int) (padding.getDouble("top") * density);
+            }
 
+            if (padding.hasKey("right")) {
+                right = (int) (padding.getDouble("right") * density);
+            }
+
+            if (padding.hasKey("bottom")) {
+                bottom = (int) (padding.getDouble("bottom") * density);
+            }
+        }
+
+        view.applyBaseMapPadding(left, top, right, bottom);
+        view.map.setPadding(left, top, right, bottom);
     }
 
     @Override
@@ -148,47 +175,47 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
     @Override
     public void setMapType(MapView view, @Nullable String value) {
         //hybrid | none | satellite | standard | terrain
-        if ("hybrid".equals(value)){
+        if ("hybrid".equals(value)) {
             view.setMapType(GoogleMap.MAP_TYPE_HYBRID);
-        } else if ("none".equals(value)){
+        } else if ("none".equals(value)) {
             view.setMapType(GoogleMap.MAP_TYPE_NONE);
-        } else if ("satellite".equals(value)){
+        } else if ("satellite".equals(value)) {
             view.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
-        } else if ("standard".equals(value)){
+        } else if ("standard".equals(value)) {
             view.setMapType(GoogleMap.MAP_TYPE_NORMAL);
-        } else if ("terrain".equals(value)){
+        } else if ("terrain".equals(value)) {
             view.setMapType(GoogleMap.MAP_TYPE_TERRAIN);
         }
     }
 
     @Override
     public void setMaxDelta(MapView view, double value) {
-
+        // not supported
     }
 
     @Override
     public void setMaxZoom(MapView view, float value) {
-
+        view.setMaxZoomLevel(value);
     }
 
     @Override
     public void setMinDelta(MapView view, double value) {
-
+        // not supported
     }
 
     @Override
     public void setMinZoom(MapView view, float value) {
-
+        view.setMinZoomLevel(value);
     }
 
     @Override
     public void setMoveOnMarkerPress(MapView view, boolean value) {
-
+            view.setMoveOnMarkerPress(value);
     }
 
     @Override
     public void setHandlePanDrag(MapView view, boolean value) {
-
+        view.setHandlePanDrag(value);
     }
 
     @Override
@@ -198,27 +225,27 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setPitchEnabled(MapView view, boolean value) {
-
+        view.setPitchEnabled(value);
     }
 
     @Override
     public void setRegion(MapView view, @Nullable ReadableMap value) {
-
+        view.setRegion(value);
     }
 
     @Override
     public void setRotateEnabled(MapView view, boolean value) {
-
+        view.setRotateEnabled(value);
     }
 
     @Override
     public void setScrollDuringRotateOrZoomEnabled(MapView view, boolean value) {
-
+        view.setScrollDuringRotateOrZoomEnabled(value);
     }
 
     @Override
     public void setScrollEnabled(MapView view, boolean value) {
-
+        view.setScrollEnabled(value);
     }
 
     @Override
@@ -228,92 +255,92 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setShowsCompass(MapView view, boolean value) {
-
+        view.setShowsCompass(value);
     }
 
     @Override
     public void setShowsIndoorLevelPicker(MapView view, boolean value) {
-
+        view.setShowsIndoorLevelPicker(value);
     }
 
     @Override
     public void setShowsIndoors(MapView view, boolean value) {
-
+        view.setShowIndoors(value);
     }
 
     @Override
     public void setShowsMyLocationButton(MapView view, boolean value) {
-
+        view.setShowsMyLocationButton(value);
     }
 
     @Override
     public void setShowsScale(MapView view, boolean value) {
-
+        // not supported
     }
 
     @Override
     public void setShowsUserLocation(MapView view, boolean value) {
-
+        view.setShowsUserLocation(value);
     }
 
     @Override
     public void setTintColor(MapView view, @Nullable Integer value) {
-
+        // not supported
     }
 
     @Override
     public void setToolbarEnabled(MapView view, boolean value) {
-
+        view.setToolbarEnabled(value);
     }
 
     @Override
     public void setUserInterfaceStyle(MapView view, @Nullable String value) {
-
+        // not supported
     }
 
     @Override
     public void setUserLocationAnnotationTitle(MapView view, @Nullable String value) {
-
+        // not supported
     }
 
     @Override
     public void setUserLocationCalloutEnabled(MapView view, boolean value) {
-
+        // not supported
     }
 
     @Override
     public void setUserLocationFastestInterval(MapView view, int value) {
-
+        view.setUserLocationFastestInterval(value);
     }
 
     @Override
     public void setUserLocationPriority(MapView view, @Nullable String value) {
-
+        view.setUserLocationPriority(MY_LOCATION_PRIORITY.get(value));
     }
 
     @Override
     public void setUserLocationUpdateInterval(MapView view, int value) {
-
+        view.setUserLocationUpdateInterval(value);
     }
 
     @Override
     public void setZoomControlEnabled(MapView view, boolean value) {
-
+        view.setZoomControlEnabled(value);
     }
 
     @Override
     public void setZoomEnabled(MapView view, boolean value) {
-
+        view.setZoomEnabled(value);
     }
 
     @Override
     public void setZoomTapEnabled(MapView view, boolean value) {
-
+        // not supported
     }
 
     @Override
     public void setCameraZoomRange(MapView view, @Nullable ReadableMap value) {
-
+        // not supported
     }
 
     @Override
@@ -345,4 +372,4 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
     public void fitToCoordinates(MapView view, String coordinatesJSON, String edgePaddingJSON, boolean animated) {
 
     }
-}
+}

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

@@ -42,7 +42,7 @@ public class MapManager extends ViewGroupManager<MapView> {
             "none", GoogleMap.MAP_TYPE_NONE
     );
 
-    private final Map<String, Integer> MY_LOCATION_PRIORITY = MapBuilder.of(
+    public static final Map<String, Integer> MY_LOCATION_PRIORITY = MapBuilder.of(
             "balanced", Priority.PRIORITY_BALANCED_POWER_ACCURACY,
             "high", Priority.PRIORITY_HIGH_ACCURACY,
             "low", Priority.PRIORITY_LOW_POWER,
@@ -240,47 +240,47 @@ public class MapManager extends ViewGroupManager<MapView> {
 
     @ReactProp(name = "showsBuildings", defaultBoolean = false)
     public void setShowBuildings(MapView view, boolean showBuildings) {
-        view.map.setBuildingsEnabled(showBuildings);
+        view.setShowBuildings(showBuildings);
     }
 
     @ReactProp(name = "showsIndoors", defaultBoolean = false)
     public void setShowIndoors(MapView view, boolean showIndoors) {
-        view.map.setIndoorEnabled(showIndoors);
+        view.setShowIndoors(showIndoors);
     }
 
     @ReactProp(name = "showsIndoorLevelPicker", defaultBoolean = false)
     public void setShowsIndoorLevelPicker(MapView view, boolean showsIndoorLevelPicker) {
-        view.map.getUiSettings().setIndoorLevelPickerEnabled(showsIndoorLevelPicker);
+        view.setShowsIndoorLevelPicker(showsIndoorLevelPicker);
     }
 
     @ReactProp(name = "showsCompass", defaultBoolean = false)
     public void setShowsCompass(MapView view, boolean showsCompass) {
-        view.map.getUiSettings().setCompassEnabled(showsCompass);
+        view.setShowsCompass(showsCompass);
     }
 
     @ReactProp(name = "scrollEnabled", defaultBoolean = false)
     public void setScrollEnabled(MapView view, boolean scrollEnabled) {
-        view.map.getUiSettings().setScrollGesturesEnabled(scrollEnabled);
+        view.setScrollEnabled(scrollEnabled);
     }
 
     @ReactProp(name = "zoomEnabled", defaultBoolean = false)
     public void setZoomEnabled(MapView view, boolean zoomEnabled) {
-        view.map.getUiSettings().setZoomGesturesEnabled(zoomEnabled);
+        view.setZoomEnabled(zoomEnabled);
     }
 
     @ReactProp(name = "zoomControlEnabled", defaultBoolean = true)
     public void setZoomControlEnabled(MapView view, boolean zoomControlEnabled) {
-        view.map.getUiSettings().setZoomControlsEnabled(zoomControlEnabled);
+        view.setZoomControlEnabled(zoomControlEnabled);
     }
 
     @ReactProp(name = "rotateEnabled", defaultBoolean = false)
     public void setRotateEnabled(MapView view, boolean rotateEnabled) {
-        view.map.getUiSettings().setRotateGesturesEnabled(rotateEnabled);
+        view.setRotateEnabled(rotateEnabled);
     }
 
     @ReactProp(name = "scrollDuringRotateOrZoomEnabled", defaultBoolean = true)
     public void setScrollDuringRotateOrZoomEnabled(MapView view, boolean scrollDuringRotateOrZoomEnabled) {
-        view.map.getUiSettings().setScrollGesturesEnabledDuringRotateOrZoom(scrollDuringRotateOrZoomEnabled);
+        view.setScrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled);
     }
 
     @ReactProp(name = "cacheEnabled", defaultBoolean = false)
@@ -295,7 +295,7 @@ public class MapManager extends ViewGroupManager<MapView> {
 
     @ReactProp(name = "loadingEnabled", defaultBoolean = false)
     public void setLoadingEnabled(MapView view, boolean loadingEnabled) {
-        view.enableMapLoading(loadingEnabled);
+        view.setLoadingEnabled(loadingEnabled);
     }
 
     @ReactProp(name = "moveOnMarkerPress", defaultBoolean = true)
@@ -315,17 +315,17 @@ public class MapManager extends ViewGroupManager<MapView> {
 
     @ReactProp(name = "pitchEnabled", defaultBoolean = false)
     public void setPitchEnabled(MapView view, boolean pitchEnabled) {
-        view.map.getUiSettings().setTiltGesturesEnabled(pitchEnabled);
+        view.setPitchEnabled(pitchEnabled);
     }
 
     @ReactProp(name = "minZoomLevel")
     public void setMinZoomLevel(MapView view, float minZoomLevel) {
-        view.map.setMinZoomPreference(minZoomLevel);
+        view.setMinZoomLevel(minZoomLevel);
     }
 
     @ReactProp(name = "maxZoomLevel")
     public void setMaxZoomLevel(MapView view, float maxZoomLevel) {
-        view.map.setMaxZoomPreference(maxZoomLevel);
+        view.setMaxZoomLevel(maxZoomLevel);
     }
 
     @ReactProp(name = "kmlSrc")

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

@@ -37,7 +37,6 @@ import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
-import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.google.android.gms.maps.CameraUpdate;
@@ -69,7 +68,6 @@ import com.google.maps.android.collections.PolylineManager;
 import com.google.maps.android.data.kml.KmlContainer;
 import com.google.maps.android.data.kml.KmlLayer;
 import com.google.maps.android.data.kml.KmlPlacemark;
-import com.google.maps.android.data.kml.KmlStyle;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -141,6 +139,18 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
   private final ViewAttacherGroup attacherGroup;
   private LatLng tapLocation;
+  private Float maxZoomLevel;
+  private Float minZoomLevel;
+  private Boolean pitchEnabled;
+  private Boolean showsCompass;
+  private Boolean rotateEnabled;
+  private Boolean zoomEnabled;
+  private Boolean zoomControlEnabled;
+  private Boolean setShowBuildings;
+  private Boolean showsIndoorLevelPicker;
+  private Boolean showIndoors;
+  private Boolean scrollEnabled;
+  private Boolean scrollDuringRotateOrZoomEnabled;
 
   private static boolean contextHasBug(Context context) {
     return context == null ||
@@ -260,6 +270,42 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       return;
     }
     this.map = map;
+    if (maxZoomLevel != null){
+      setMaxZoomLevel(maxZoomLevel);
+    }
+    if (minZoomLevel != null){
+      setMinZoomLevel(minZoomLevel);
+    }
+    if (pitchEnabled != null){
+      setPitchEnabled(pitchEnabled);
+    }
+    if (showsCompass != null){
+      setShowsCompass(showsCompass);
+    }
+    if (rotateEnabled != null){
+      setRotateEnabled(rotateEnabled);
+    }
+    if (zoomEnabled != null){
+      setZoomEnabled(zoomEnabled);
+    }
+    if (zoomControlEnabled != null){
+      setZoomControlEnabled(zoomControlEnabled);
+    }
+    if (setShowBuildings != null){
+      setShowBuildings(setShowBuildings);
+    }
+    if (showsIndoorLevelPicker != null){
+      setShowsIndoorLevelPicker(showsIndoorLevelPicker);
+    }
+    if (showIndoors != null){
+      setShowIndoors(showIndoors);
+    }
+    if (scrollEnabled != null){
+      setScrollEnabled(scrollEnabled);
+    }
+    if (scrollDuringRotateOrZoomEnabled != null){
+      setScrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled);
+    }
 
     markerManager = new MarkerManager(map);
     markerCollection = markerManager.newCollection();
@@ -748,7 +794,7 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
     map.setOnPoiClickListener(poiClickEnabled ? this : null);
   }
 
-  public void enableMapLoading(boolean loadingEnabled) {
+  public void setLoadingEnabled(boolean loadingEnabled) {
     if (loadingEnabled && !this.isMapLoaded) {
       this.getMapLoadingLayoutView().setVisibility(View.VISIBLE);
     }
@@ -757,6 +803,79 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
   public void setMoveOnMarkerPress(boolean moveOnPress) {
     this.moveOnMarkerPress = moveOnPress;
   }
+  public void setMaxZoomLevel(float maxZoomLevel){
+    this.maxZoomLevel = maxZoomLevel;
+    if (map != null) {
+      map.setMaxZoomPreference(maxZoomLevel);
+    }
+  }
+  public void setMinZoomLevel(float minZoomLevel){
+    this.minZoomLevel = minZoomLevel;
+    if (map != null) {
+      map.setMinZoomPreference(minZoomLevel);
+    }
+  }
+  public void setPitchEnabled(boolean pitchEnabled){
+    this.pitchEnabled = pitchEnabled;
+    if (map != null) {
+      map.getUiSettings().setTiltGesturesEnabled(pitchEnabled);
+    }
+  }
+  public void setShowsCompass(boolean showsCompass){
+    this.showsCompass = showsCompass;
+    if (map != null) {
+      map.getUiSettings().setCompassEnabled(showsCompass);
+    }
+  }
+  public void setRotateEnabled(boolean rotateEnabled){
+    this.rotateEnabled = rotateEnabled;
+    if (map != null) {
+      map.getUiSettings().setRotateGesturesEnabled(rotateEnabled);
+    }
+  }
+  public void setZoomEnabled(boolean zoomEnabled){
+    this.zoomEnabled = zoomEnabled;
+    if (map != null) {
+      map.getUiSettings().setZoomGesturesEnabled(zoomEnabled);
+    }
+  }
+  public void setZoomControlEnabled(boolean zoomControlEnabled){
+    this.zoomControlEnabled = zoomControlEnabled;
+    if (map != null) {
+      map.getUiSettings().setZoomControlsEnabled(zoomControlEnabled);
+    }
+  }
+  public void setScrollDuringRotateOrZoomEnabled(boolean scrollDuringRotateOrZoomEnabled){
+    this.scrollDuringRotateOrZoomEnabled = scrollDuringRotateOrZoomEnabled;
+    if (map != null) {
+      map.getUiSettings().setScrollGesturesEnabledDuringRotateOrZoom(scrollDuringRotateOrZoomEnabled);
+    }
+  }
+  public void setScrollEnabled(boolean scrollEnabled){
+    this.scrollEnabled = scrollEnabled;
+    if (map != null) {
+      map.getUiSettings().setScrollGesturesEnabled(scrollEnabled);
+    }
+  }
+  public void setShowIndoors(boolean showIndoors){
+    this.showIndoors = showIndoors;
+    if (map != null) {
+      map.setIndoorEnabled(showIndoors);
+    }
+  }
+  public void setShowsIndoorLevelPicker(boolean showsIndoorLevelPicker) {
+    this.showsIndoorLevelPicker = showsIndoorLevelPicker;
+    if (map != null) {
+      map.getUiSettings().setIndoorLevelPickerEnabled(showsIndoorLevelPicker);
+    }
+  }
+  public void setShowBuildings(boolean showBuildings) {
+    this.setShowBuildings = showBuildings;
+    if (map != null) {
+      map.setBuildingsEnabled(showBuildings);
+    }
+  }
+
 
   public void setLoadingBackgroundColor(Integer loadingBackgroundColor) {
     this.loadingBackgroundColor = loadingBackgroundColor;

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.21.0-alpha.53",
+  "version": "1.21.0-alpha.54",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",