Remove gmaps dependency (#840)

* add gmaps version to podfile * Remove Google maps from podfile and conditions using google MAP_PROVIDER
Autofleet · Aug 21, 2024 · 6df0965 · 6df0965
1 parent d8dbe18
commit 6df0965
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 64 deletions.
diff --git a/examples/client/Locomotion/ios/Podfile b/examples/client/Locomotion/ios/Podfile
@@ -7,8 +7,6 @@ install! 'cocoapods', :deterministic_uuids => false
 
 target 'Locomotion' do
   config = use_native_modules!
-  rn_maps_path = '../node_modules/react-native-maps'
-  pod 'react-native-google-maps', :path => rn_maps_path
 
   # Flags change depending on the env values.
   flags = get_default_flags()

diff --git a/examples/client/Locomotion/ios/Podfile.lock b/examples/client/Locomotion/ios/Podfile.lock
@@ -42,51 +42,31 @@ PODS:
     - PromisesObjC (< 3.0, >= 1.2)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - Google-Maps-iOS-Utils (4.1.0):
-    - Google-Maps-iOS-Utils/Clustering (= 4.1.0)
-    - Google-Maps-iOS-Utils/Geometry (= 4.1.0)
-    - Google-Maps-iOS-Utils/GeometryUtils (= 4.1.0)
-    - Google-Maps-iOS-Utils/Heatmap (= 4.1.0)
-    - Google-Maps-iOS-Utils/QuadTree (= 4.1.0)
-    - GoogleMaps
-  - Google-Maps-iOS-Utils/Clustering (4.1.0):
-    - Google-Maps-iOS-Utils/QuadTree
-    - GoogleMaps
-  - Google-Maps-iOS-Utils/Geometry (4.1.0):
-    - GoogleMaps
-  - Google-Maps-iOS-Utils/GeometryUtils (4.1.0):
-    - GoogleMaps
-  - Google-Maps-iOS-Utils/Heatmap (4.1.0):
-    - Google-Maps-iOS-Utils/QuadTree
-    - GoogleMaps
-  - Google-Maps-iOS-Utils/QuadTree (4.1.0):
-    - GoogleMaps
-  - GoogleDataTransport (9.2.5):
+  - GoogleDataTransport (9.4.1):
     - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleMaps (7.3.0):
-    - GoogleMaps/Maps (= 7.3.0)
-  - GoogleMaps/Base (7.3.0)
-  - GoogleMaps/Maps (7.3.0):
-    - GoogleMaps/Base
-  - GoogleUtilities/Environment (7.11.5):
+  - GoogleUtilities/Environment (7.13.3):
+    - GoogleUtilities/Privacy
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.11.5):
+  - GoogleUtilities/Logger (7.13.3):
     - GoogleUtilities/Environment
-  - GoogleUtilities/UserDefaults (7.11.5):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (7.13.3)
+  - GoogleUtilities/UserDefaults (7.13.3):
     - GoogleUtilities/Logger
-  - libwebp (1.3.1):
-    - libwebp/demux (= 1.3.1)
-    - libwebp/mux (= 1.3.1)
-    - libwebp/sharpyuv (= 1.3.1)
-    - libwebp/webp (= 1.3.1)
-  - libwebp/demux (1.3.1):
+    - GoogleUtilities/Privacy
+  - libwebp (1.3.2):
+    - libwebp/demux (= 1.3.2)
+    - libwebp/mux (= 1.3.2)
+    - libwebp/sharpyuv (= 1.3.2)
+    - libwebp/webp (= 1.3.2)
+  - libwebp/demux (1.3.2):
     - libwebp/webp
-  - libwebp/mux (1.3.1):
+  - libwebp/mux (1.3.2):
     - libwebp/demux
-  - libwebp/sharpyuv (1.3.1)
-  - libwebp/webp (1.3.1):
+  - libwebp/sharpyuv (1.3.2)
+  - libwebp/webp (1.3.2):
     - libwebp/sharpyuv
   - lottie-ios (3.4.0)
   - lottie-react-native (5.1.4):
@@ -113,7 +93,7 @@ PODS:
     - OneSignalXCFramework/OneSignalOutcomes
   - OneSignalXCFramework/OneSignalOutcomes (3.11.2):
     - OneSignalXCFramework/OneSignalCore
-  - PromisesObjC (2.3.1)
+  - PromisesObjC (2.4.0)
   - RCT-Folly (2021.06.28.00-v2):
     - boost
     - DoubleConversion
@@ -338,10 +318,6 @@ PODS:
     - React-Core
   - react-native-geolocation-service (5.3.1):
     - React
-  - react-native-google-maps (1.4.0):
-    - Google-Maps-iOS-Utils (= 4.1.0)
-    - GoogleMaps (= 7.3.0)
-    - React-Core
   - react-native-image-picker (4.10.0):
     - React-Core
   - react-native-image-resizer (1.4.5):
@@ -550,7 +526,6 @@ DEPENDENCIES:
   - react-native-date-picker (from `../node_modules/react-native-date-picker`)
   - "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
   - react-native-geolocation-service (from `../node_modules/react-native-geolocation-service`)
-  - react-native-google-maps (from `../node_modules/react-native-maps`)
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
   - react-native-location (from `../node_modules/react-native-location`)
@@ -598,9 +573,7 @@ SPEC REPOS:
     - FirebaseCrashlytics
     - FirebaseInstallations
     - fmt
-    - Google-Maps-iOS-Utils
     - GoogleDataTransport
-    - GoogleMaps
     - GoogleUtilities
     - libwebp
     - Mixpanel-swift
@@ -674,8 +647,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/geolocation"
   react-native-geolocation-service:
     :path: "../node_modules/react-native-geolocation-service"
-  react-native-google-maps:
-    :path: "../node_modules/react-native-maps"
   react-native-image-picker:
     :path: "../node_modules/react-native-image-picker"
   react-native-image-resizer:
@@ -765,18 +736,16 @@ SPEC CHECKSUMS:
   FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 476ee3e89abb49e07f822b48323c51c57124b572
-  Google-Maps-iOS-Utils: 3343332b18dfd5be8f1f44edd7d481ace3da4d9a
-  GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
-  GoogleMaps: a146f275ee429d14822178c7a841c03366ec92a1
-  GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
-  libwebp: 33dc822fbbf4503668d09f7885bbfedc76c45e96
+  GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
+  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
+  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
   lottie-ios: 69495122151a378fdc7d1bb4c5930347e37baf1f
   lottie-react-native: b702fab740cdb952a8e2354713d3beda63ff97b0
   Mixpanel-swift: 7b46c63259dec8398a7df9f8a1298fd00b6b3cb3
   MixpanelReactNative: 52edfa25071042f12fca18c9854e01b2c917396a
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   OneSignalXCFramework: 81ceac017a290f23793443323090cfbe888f74ea
-  PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
   RCTRequired: 0f06b6068f530932d10e1a01a5352fad4eaacb74
   RCTTypeSafety: b0ee81f10ef1b7d977605a2b266823dabd565e65
@@ -797,7 +766,6 @@ SPEC CHECKSUMS:
   react-native-date-picker: 93e43b3084cea595b4d68b1405d6d99849663bd6
   react-native-geolocation: 205c5f619aea7bd54067b7b51e0781cae2f37151
   react-native-geolocation-service: 608e1da71a1ac31b4de64d9ef2815f697978c55b
-  react-native-google-maps: 247de10063a5b102523d3b883ea2f5bd1830f0ff
   react-native-image-picker: 35834940bc572ba914707c39b60e043a06f88178
   react-native-image-resizer: 506412a2bdd70dde64a61e13505ce10f61a04369
   react-native-location: 9c53c0957756f7d70e8fdc76b1c7ed85867c8d0b
@@ -843,6 +811,6 @@ SPEC CHECKSUMS:
   StripeUICore: 08c1efbd7e3c54ee7fa74334a37a1d4c08ba944d
   Yoga: c4d61225a466f250c35c1ee78d2d0b3d41fe661c
 
-PODFILE CHECKSUM: 3d1a03e0b2517741427327a9545b9919923582eb
+PODFILE CHECKSUM: 01c235ac2a89f1dcb8f1140f46552a0bf844f81f
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.15.2
diff --git a/examples/client/Locomotion/src/Components/Marker/index.js b/examples/client/Locomotion/src/Components/Marker/index.js
@@ -94,7 +94,7 @@ const StopPointMarker = ({
       key={key}
       coordinate={{ latitude: parseFloat(lat), longitude: parseFloat(lng) }}
       zIndex={999}
-      tracksViewChanges={Platform.OS === 'ios' && Config.MAP_PROVIDER === 'google'}
+      tracksViewChanges={false}
     >
       <InfoBox>
         <Type>

diff --git a/examples/client/Locomotion/src/Components/PrecedingStopPointMarker/index.tsx b/examples/client/Locomotion/src/Components/PrecedingStopPointMarker/index.tsx
@@ -13,7 +13,7 @@ const PrecedingStopPointMarker = ({ stopPoint }: PrecedingStopPointMarkerProps)
   <Marker
     coordinate={{ latitude: parseFloat(stopPoint.lat), longitude: parseFloat(stopPoint.lng) }}
     zIndex={10}
-    tracksViewChanges={Platform.OS === 'ios' && Config.MAP_PROVIDER === 'google'}
+    tracksViewChanges={false}
   >
     <SvgIcon Svg={pickupIcon} width={10} height={10} />
   </Marker>

diff --git a/examples/client/Locomotion/src/Components/VirtualStationMarker/index.tsx b/examples/client/Locomotion/src/Components/VirtualStationMarker/index.tsx
@@ -8,7 +8,6 @@ import Config from 'react-native-config';
 import VirtualStationComponent from '../VirtualStationComponent';
 import VirtualStationTooltip from '../VirtualStationTooltipComponent';
 
-const trackViewChanges = Platform.OS === 'ios' && Config.MAP_PROVIDER === 'google';
 const VirtualStationMarker = forwardRef(({
   station, onCalloutPress, type,
 }, ref) => {
@@ -17,7 +16,7 @@ const VirtualStationMarker = forwardRef(({
     <Marker
       coordinate={{ latitude: parseFloat(station.coordinates.lat), longitude: parseFloat(station.coordinates.lng) }}
       zIndex={10}
-      tracksViewChanges={trackViewChanges}
+      tracksViewChanges={false}
       key={station.externalId}
       ref={ref}
     >

diff --git a/examples/client/Locomotion/src/pages/ActiveRide/newMap.js b/examples/client/Locomotion/src/pages/ActiveRide/newMap.js
@@ -313,7 +313,6 @@ export default React.forwardRef(({
   return (
     <>
       <MapView
-        provider={Config.MAP_PROVIDER}
         showsUserLocation={PAGES_TO_SHOW_MY_LOCATION.includes(currentBsPage)}
         style={mapPositionStyles}
         onRegionChangeComplete={onRegionChangeComplete}