react-native-maps 1.25.2 → 1.25.4

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsMapViewManagerDelegate.java

@@ -125,7 +125,7 @@ public class RNMapsMapViewManagerDelegate<T extends View, U extends BaseViewMana
         mViewManager.setShowsIndoors(view, value == null ? true : (boolean) value);
         break;
       case "showsMyLocationButton":
-        mViewManager.setShowsMyLocationButton(view, value == null ? true : (boolean) value);
+        mViewManager.setShowsMyLocationButton(view, value == null ? false : (boolean) value);
         break;
       case "showsScale":
         mViewManager.setShowsScale(view, value == null ? false : (boolean) value);

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

@@ -470,6 +470,11 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         if (scrollDuringRotateOrZoomEnabled != null) {
             setScrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled);
         }
+        if (hasPermissions()) {
+            //noinspection MissingPermission
+            map.setMyLocationEnabled(showUserLocation);
+            map.setLocationSource(fusedLocationSource);
+        }
 
         markerManager = new MarkerManager(map);
         markerCollection = markerManager.newCollection();

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/Props.cpp

@@ -57,10 +57,10 @@ RNMapsGoogleMapViewProps::RNMapsGoogleMapViewProps(
     scrollDuringRotateOrZoomEnabled(convertRawProp(context, rawProps, "scrollDuringRotateOrZoomEnabled", sourceProps.scrollDuringRotateOrZoomEnabled, {true})),
     scrollEnabled(convertRawProp(context, rawProps, "scrollEnabled", sourceProps.scrollEnabled, {true})),
     showsBuildings(convertRawProp(context, rawProps, "showsBuildings", sourceProps.showsBuildings, {true})),
-    showsCompass(convertRawProp(context, rawProps, "showsCompass", sourceProps.showsCompass, {true})),
+    showsCompass(convertRawProp(context, rawProps, "showsCompass", sourceProps.showsCompass, {false})),
     showsIndoorLevelPicker(convertRawProp(context, rawProps, "showsIndoorLevelPicker", sourceProps.showsIndoorLevelPicker, {false})),
     showsIndoors(convertRawProp(context, rawProps, "showsIndoors", sourceProps.showsIndoors, {true})),
-    showsMyLocationButton(convertRawProp(context, rawProps, "showsMyLocationButton", sourceProps.showsMyLocationButton, {true})),
+    showsMyLocationButton(convertRawProp(context, rawProps, "showsMyLocationButton", sourceProps.showsMyLocationButton, {false})),
     showsPointsOfInterest(convertRawProp(context, rawProps, "showsPointsOfInterest", sourceProps.showsPointsOfInterest, {false})),
     showsScale(convertRawProp(context, rawProps, "showsScale", sourceProps.showsScale, {false})),
     showsTraffic(convertRawProp(context, rawProps, "showsTraffic", sourceProps.showsTraffic, {false})),
@@ -126,7 +126,7 @@ RNMapsMapViewProps::RNMapsMapViewProps(
     showsCompass(convertRawProp(context, rawProps, "showsCompass", sourceProps.showsCompass, {true})),
     showsIndoorLevelPicker(convertRawProp(context, rawProps, "showsIndoorLevelPicker", sourceProps.showsIndoorLevelPicker, {false})),
     showsIndoors(convertRawProp(context, rawProps, "showsIndoors", sourceProps.showsIndoors, {true})),
-    showsMyLocationButton(convertRawProp(context, rawProps, "showsMyLocationButton", sourceProps.showsMyLocationButton, {true})),
+    showsMyLocationButton(convertRawProp(context, rawProps, "showsMyLocationButton", sourceProps.showsMyLocationButton, {false})),
     showsScale(convertRawProp(context, rawProps, "showsScale", sourceProps.showsScale, {false})),
     showsUserLocation(convertRawProp(context, rawProps, "showsUserLocation", sourceProps.showsUserLocation, {false})),
     tintColor(convertRawProp(context, rawProps, "tintColor", sourceProps.tintColor, {})),

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/Props.h

@@ -382,10 +382,10 @@ class RNMapsGoogleMapViewProps final : public ViewProps {
   bool scrollDuringRotateOrZoomEnabled{true};
   bool scrollEnabled{true};
   bool showsBuildings{true};
-  bool showsCompass{true};
+  bool showsCompass{false};
   bool showsIndoorLevelPicker{false};
   bool showsIndoors{true};
-  bool showsMyLocationButton{true};
+  bool showsMyLocationButton{false};
   bool showsPointsOfInterest{false};
   bool showsScale{false};
   bool showsTraffic{false};
@@ -913,7 +913,7 @@ class RNMapsMapViewProps final : public ViewProps {
   bool showsCompass{true};
   bool showsIndoorLevelPicker{false};
   bool showsIndoors{true};
-  bool showsMyLocationButton{true};
+  bool showsMyLocationButton{false};
   bool showsScale{false};
   bool showsUserLocation{false};
   SharedColor tintColor{};

package/package.json

@@ -5,7 +5,7 @@
   "main": "src/index.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.25.2",
+  "version": "1.25.4",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/src/specs/NativeComponentMapView.ts

@@ -872,11 +872,11 @@ export interface MapFabricNativeProps extends ViewProps {
   /**
    * If `false` hide the button to move map to the current user's location.
    *
-   * @default true
+   * @default false
    * @platform iOS: Google Maps only
    * @platform Android: Supported
    */
-  showsMyLocationButton?: WithDefault<boolean, true>;
+  showsMyLocationButton?: boolean;
 
   /**
    * A Boolean indicating whether the map shows scale information.