Skip to content

Commit 2201d1e

Browse files
authored
Merge pull request #6 from sokoloff06/mapbox
Migrate to Mapbox
2 parents b818fd3 + a870300 commit 2201d1e

10 files changed

Lines changed: 366 additions & 419 deletions

File tree

.github/workflows/android_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Setup Flutter
3838
uses: subosito/flutter-action@v2
3939
with:
40-
flutter-version: '3.35.4' # Specify your Flutter version
40+
flutter-version: '3.38.1' # Specify your Flutter version
4141

4242
- name: Get packages
4343
run: flutter pub get

assets/bike.png

2.98 KB
Loading

assets/bike_icon.png

103 KB
Loading

assets/spots.geojson

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

ios/Podfile.lock

Lines changed: 124 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,145 +1,140 @@
11
PODS:
2-
- Firebase/CoreOnly (12.2.0):
3-
- FirebaseCore (~> 12.2.0)
4-
- Firebase/Crashlytics (12.2.0):
2+
- Firebase/CoreOnly (12.4.0):
3+
- FirebaseCore (~> 12.4.0)
4+
- Firebase/Crashlytics (12.4.0):
55
- Firebase/CoreOnly
6-
- FirebaseCrashlytics (~> 12.2.0)
7-
- Firebase/Performance (12.2.0):
6+
- FirebaseCrashlytics (~> 12.4.0)
7+
- Firebase/Performance (12.4.0):
88
- Firebase/CoreOnly
9-
- FirebasePerformance (~> 12.2.0)
10-
- Firebase/Storage (12.2.0):
9+
- FirebasePerformance (~> 12.4.0)
10+
- Firebase/Storage (12.4.0):
1111
- Firebase/CoreOnly
12-
- FirebaseStorage (~> 12.2.0)
13-
- firebase_analytics (12.0.2):
12+
- FirebaseStorage (~> 12.4.0)
13+
- firebase_analytics (12.0.4):
1414
- firebase_core
15-
- FirebaseAnalytics (= 12.2.0)
15+
- FirebaseAnalytics (= 12.4.0)
1616
- Flutter
17-
- firebase_core (4.1.1):
18-
- Firebase/CoreOnly (= 12.2.0)
17+
- firebase_core (4.2.1):
18+
- Firebase/CoreOnly (= 12.4.0)
1919
- Flutter
20-
- firebase_crashlytics (5.0.2):
21-
- Firebase/Crashlytics (= 12.2.0)
20+
- firebase_crashlytics (5.0.4):
21+
- Firebase/Crashlytics (= 12.4.0)
2222
- firebase_core
2323
- Flutter
24-
- firebase_performance (0.11.1):
25-
- Firebase/Performance (= 12.2.0)
24+
- firebase_performance (0.11.1-2):
25+
- Firebase/Performance (= 12.4.0)
2626
- firebase_core
2727
- Flutter
28-
- firebase_storage (13.0.2):
29-
- Firebase/Storage (= 12.2.0)
28+
- firebase_storage (13.0.4):
29+
- Firebase/Storage (= 12.4.0)
3030
- firebase_core
3131
- Flutter
32-
- FirebaseABTesting (12.2.0):
33-
- FirebaseCore (~> 12.2.0)
34-
- FirebaseAnalytics (12.2.0):
35-
- FirebaseAnalytics/Default (= 12.2.0)
36-
- FirebaseCore (~> 12.2.0)
37-
- FirebaseInstallations (~> 12.2.0)
32+
- FirebaseABTesting (12.4.0):
33+
- FirebaseCore (~> 12.4.0)
34+
- FirebaseAnalytics (12.4.0):
35+
- FirebaseAnalytics/Default (= 12.4.0)
36+
- FirebaseCore (~> 12.4.0)
37+
- FirebaseInstallations (~> 12.4.0)
3838
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
3939
- GoogleUtilities/MethodSwizzler (~> 8.1)
4040
- GoogleUtilities/Network (~> 8.1)
4141
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4242
- nanopb (~> 3.30910.0)
43-
- FirebaseAnalytics/Default (12.2.0):
44-
- FirebaseCore (~> 12.2.0)
45-
- FirebaseInstallations (~> 12.2.0)
46-
- GoogleAppMeasurement/Default (= 12.2.0)
43+
- FirebaseAnalytics/Default (12.4.0):
44+
- FirebaseCore (~> 12.4.0)
45+
- FirebaseInstallations (~> 12.4.0)
46+
- GoogleAppMeasurement/Default (= 12.4.0)
4747
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
4848
- GoogleUtilities/MethodSwizzler (~> 8.1)
4949
- GoogleUtilities/Network (~> 8.1)
5050
- "GoogleUtilities/NSData+zlib (~> 8.1)"
5151
- nanopb (~> 3.30910.0)
52-
- FirebaseAppCheckInterop (12.2.0)
53-
- FirebaseAuthInterop (12.2.0)
54-
- FirebaseCore (12.2.0):
55-
- FirebaseCoreInternal (~> 12.2.0)
52+
- FirebaseAppCheckInterop (12.4.0)
53+
- FirebaseAuthInterop (12.4.0)
54+
- FirebaseCore (12.4.0):
55+
- FirebaseCoreInternal (~> 12.4.0)
5656
- GoogleUtilities/Environment (~> 8.1)
5757
- GoogleUtilities/Logger (~> 8.1)
58-
- FirebaseCoreExtension (12.2.0):
59-
- FirebaseCore (~> 12.2.0)
60-
- FirebaseCoreInternal (12.2.0):
58+
- FirebaseCoreExtension (12.4.0):
59+
- FirebaseCore (~> 12.4.0)
60+
- FirebaseCoreInternal (12.4.0):
6161
- "GoogleUtilities/NSData+zlib (~> 8.1)"
62-
- FirebaseCrashlytics (12.2.0):
63-
- FirebaseCore (~> 12.2.0)
64-
- FirebaseInstallations (~> 12.2.0)
65-
- FirebaseRemoteConfigInterop (~> 12.2.0)
66-
- FirebaseSessions (~> 12.2.0)
62+
- FirebaseCrashlytics (12.4.0):
63+
- FirebaseCore (~> 12.4.0)
64+
- FirebaseInstallations (~> 12.4.0)
65+
- FirebaseRemoteConfigInterop (~> 12.4.0)
66+
- FirebaseSessions (~> 12.4.0)
6767
- GoogleDataTransport (~> 10.1)
6868
- GoogleUtilities/Environment (~> 8.1)
6969
- nanopb (~> 3.30910.0)
7070
- PromisesObjC (~> 2.4)
71-
- FirebaseInstallations (12.2.0):
72-
- FirebaseCore (~> 12.2.0)
71+
- FirebaseInstallations (12.4.0):
72+
- FirebaseCore (~> 12.4.0)
7373
- GoogleUtilities/Environment (~> 8.1)
7474
- GoogleUtilities/UserDefaults (~> 8.1)
7575
- PromisesObjC (~> 2.4)
76-
- FirebasePerformance (12.2.0):
77-
- FirebaseCore (~> 12.2.0)
78-
- FirebaseInstallations (~> 12.2.0)
79-
- FirebaseRemoteConfig (~> 12.2.0)
80-
- FirebaseSessions (~> 12.2.0)
76+
- FirebasePerformance (12.4.0):
77+
- FirebaseCore (~> 12.4.0)
78+
- FirebaseInstallations (~> 12.4.0)
79+
- FirebaseRemoteConfig (~> 12.4.0)
80+
- FirebaseSessions (~> 12.4.0)
8181
- GoogleDataTransport (~> 10.1)
8282
- GoogleUtilities/Environment (~> 8.1)
8383
- GoogleUtilities/MethodSwizzler (~> 8.1)
8484
- GoogleUtilities/UserDefaults (~> 8.1)
8585
- nanopb (~> 3.30910.0)
86-
- FirebaseRemoteConfig (12.2.0):
87-
- FirebaseABTesting (~> 12.2.0)
88-
- FirebaseCore (~> 12.2.0)
89-
- FirebaseInstallations (~> 12.2.0)
90-
- FirebaseRemoteConfigInterop (~> 12.2.0)
91-
- FirebaseSharedSwift (~> 12.2.0)
86+
- FirebaseRemoteConfig (12.4.0):
87+
- FirebaseABTesting (~> 12.4.0)
88+
- FirebaseCore (~> 12.4.0)
89+
- FirebaseInstallations (~> 12.4.0)
90+
- FirebaseRemoteConfigInterop (~> 12.4.0)
91+
- FirebaseSharedSwift (~> 12.4.0)
9292
- GoogleUtilities/Environment (~> 8.1)
9393
- "GoogleUtilities/NSData+zlib (~> 8.1)"
94-
- FirebaseRemoteConfigInterop (12.2.0)
95-
- FirebaseSessions (12.2.0):
96-
- FirebaseCore (~> 12.2.0)
97-
- FirebaseCoreExtension (~> 12.2.0)
98-
- FirebaseInstallations (~> 12.2.0)
94+
- FirebaseRemoteConfigInterop (12.4.0)
95+
- FirebaseSessions (12.4.0):
96+
- FirebaseCore (~> 12.4.0)
97+
- FirebaseCoreExtension (~> 12.4.0)
98+
- FirebaseInstallations (~> 12.4.0)
9999
- GoogleDataTransport (~> 10.1)
100100
- GoogleUtilities/Environment (~> 8.1)
101101
- GoogleUtilities/UserDefaults (~> 8.1)
102102
- nanopb (~> 3.30910.0)
103103
- PromisesSwift (~> 2.1)
104-
- FirebaseSharedSwift (12.2.0)
105-
- FirebaseStorage (12.2.0):
106-
- FirebaseAppCheckInterop (~> 12.2.0)
107-
- FirebaseAuthInterop (~> 12.2.0)
108-
- FirebaseCore (~> 12.2.0)
109-
- FirebaseCoreExtension (~> 12.2.0)
104+
- FirebaseSharedSwift (12.4.0)
105+
- FirebaseStorage (12.4.0):
106+
- FirebaseAppCheckInterop (~> 12.4.0)
107+
- FirebaseAuthInterop (~> 12.4.0)
108+
- FirebaseCore (~> 12.4.0)
109+
- FirebaseCoreExtension (~> 12.4.0)
110110
- GoogleUtilities/Environment (~> 8.1)
111111
- GTMSessionFetcher/Core (< 6.0, >= 3.4)
112112
- Flutter (1.0.0)
113113
- geolocator_apple (1.2.0):
114114
- Flutter
115115
- FlutterMacOS
116-
- Google-Maps-iOS-Utils (6.1.0):
117-
- GoogleMaps (~> 9.0)
118-
- google_maps_flutter_ios (0.0.1):
119-
- Flutter
120-
- Google-Maps-iOS-Utils (< 7.0, >= 5.0)
121-
- GoogleMaps (< 10.0, >= 8.4)
122-
- GoogleAdsOnDeviceConversion (2.3.0):
116+
- GoogleAdsOnDeviceConversion (3.1.0):
117+
- GoogleUtilities/Environment (~> 8.1)
123118
- GoogleUtilities/Logger (~> 8.1)
124119
- GoogleUtilities/Network (~> 8.1)
125120
- nanopb (~> 3.30910.0)
126-
- GoogleAppMeasurement/Core (12.2.0):
121+
- GoogleAppMeasurement/Core (12.4.0):
127122
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
128123
- GoogleUtilities/MethodSwizzler (~> 8.1)
129124
- GoogleUtilities/Network (~> 8.1)
130125
- "GoogleUtilities/NSData+zlib (~> 8.1)"
131126
- nanopb (~> 3.30910.0)
132-
- GoogleAppMeasurement/Default (12.2.0):
133-
- GoogleAdsOnDeviceConversion (= 2.3.0)
134-
- GoogleAppMeasurement/Core (= 12.2.0)
135-
- GoogleAppMeasurement/IdentitySupport (= 12.2.0)
127+
- GoogleAppMeasurement/Default (12.4.0):
128+
- GoogleAdsOnDeviceConversion (~> 3.1.0)
129+
- GoogleAppMeasurement/Core (= 12.4.0)
130+
- GoogleAppMeasurement/IdentitySupport (= 12.4.0)
136131
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
137132
- GoogleUtilities/MethodSwizzler (~> 8.1)
138133
- GoogleUtilities/Network (~> 8.1)
139134
- "GoogleUtilities/NSData+zlib (~> 8.1)"
140135
- nanopb (~> 3.30910.0)
141-
- GoogleAppMeasurement/IdentitySupport (12.2.0):
142-
- GoogleAppMeasurement/Core (= 12.2.0)
136+
- GoogleAppMeasurement/IdentitySupport (12.4.0):
137+
- GoogleAppMeasurement/Core (= 12.4.0)
143138
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
144139
- GoogleUtilities/MethodSwizzler (~> 8.1)
145140
- GoogleUtilities/Network (~> 8.1)
@@ -148,9 +143,6 @@ PODS:
148143
- GoogleDataTransport (10.1.0):
149144
- nanopb (~> 3.30910.0)
150145
- PromisesObjC (~> 2.4)
151-
- GoogleMaps (9.4.0):
152-
- GoogleMaps/Maps (= 9.4.0)
153-
- GoogleMaps/Maps (9.4.0)
154146
- GoogleUtilities/AppDelegateSwizzler (8.1.0):
155147
- GoogleUtilities/Environment
156148
- GoogleUtilities/Logger
@@ -181,6 +173,18 @@ PODS:
181173
- GTMSessionFetcher/Core (5.0.0)
182174
- map_launcher (0.0.1):
183175
- Flutter
176+
- mapbox_maps_flutter (2.12.0):
177+
- Flutter
178+
- MapboxMaps (= 11.16.0)
179+
- Turf (= 4.0.0)
180+
- MapboxCommon (24.16.0):
181+
- Turf (= 4.0.0)
182+
- MapboxCoreMaps (11.16.0):
183+
- MapboxCommon (= 24.16.0)
184+
- MapboxMaps (11.16.0):
185+
- MapboxCommon (= 24.16.0)
186+
- MapboxCoreMaps (= 11.16.0)
187+
- Turf (= 4.0.0)
184188
- nanopb (3.30910.0):
185189
- nanopb/decode (= 3.30910.0)
186190
- nanopb/encode (= 3.30910.0)
@@ -200,6 +204,7 @@ PODS:
200204
- sqflite_darwin (0.0.4):
201205
- Flutter
202206
- FlutterMacOS
207+
- Turf (4.0.0)
203208
- url_launcher_ios (0.0.1):
204209
- Flutter
205210

@@ -211,8 +216,8 @@ DEPENDENCIES:
211216
- firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
212217
- Flutter (from `Flutter`)
213218
- geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
214-
- google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
215219
- map_launcher (from `.symlinks/plugins/map_launcher/ios`)
220+
- mapbox_maps_flutter (from `.symlinks/plugins/mapbox_maps_flutter/ios`)
216221
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
217222
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
218223
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -237,16 +242,18 @@ SPEC REPOS:
237242
- FirebaseSessions
238243
- FirebaseSharedSwift
239244
- FirebaseStorage
240-
- Google-Maps-iOS-Utils
241245
- GoogleAdsOnDeviceConversion
242246
- GoogleAppMeasurement
243247
- GoogleDataTransport
244-
- GoogleMaps
245248
- GoogleUtilities
246249
- GTMSessionFetcher
250+
- MapboxCommon
251+
- MapboxCoreMaps
252+
- MapboxMaps
247253
- nanopb
248254
- PromisesObjC
249255
- PromisesSwift
256+
- Turf
250257

251258
EXTERNAL SOURCES:
252259
firebase_analytics:
@@ -263,10 +270,10 @@ EXTERNAL SOURCES:
263270
:path: Flutter
264271
geolocator_apple:
265272
:path: ".symlinks/plugins/geolocator_apple/darwin"
266-
google_maps_flutter_ios:
267-
:path: ".symlinks/plugins/google_maps_flutter_ios/ios"
268273
map_launcher:
269274
:path: ".symlinks/plugins/map_launcher/ios"
275+
mapbox_maps_flutter:
276+
:path: ".symlinks/plugins/mapbox_maps_flutter/ios"
270277
package_info_plus:
271278
:path: ".symlinks/plugins/package_info_plus/ios"
272279
path_provider_foundation:
@@ -279,46 +286,48 @@ EXTERNAL SOURCES:
279286
:path: ".symlinks/plugins/url_launcher_ios/ios"
280287

281288
SPEC CHECKSUMS:
282-
Firebase: 26f6f8d460603af3df970ad505b16b15f5e2e9a1
283-
firebase_analytics: 9c18d3099ede6fd5a64f01d663aea7c1912b2307
284-
firebase_core: c92b2e526c46f625784f19c07121cd533536d0e7
285-
firebase_crashlytics: 9b930dc85553e1a603bf705d97620dfe69fb3cde
286-
firebase_performance: e6e9891517343d271eceac1e4e3efe965c053043
287-
firebase_storage: 303a56d38aad6f0546e7d192c863fc03587cf910
288-
FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031
289-
FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8
290-
FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678
291-
FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16
292-
FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd
293-
FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5
294-
FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b
295-
FirebaseCrashlytics: f83cbf176d5c637ade108c0aacf1ccbd5ec499bf
296-
FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed
297-
FirebasePerformance: 9071eb99f3ed135defc1c145391a82edb98e0b93
298-
FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95
299-
FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1
300-
FirebaseSessions: f4692789e770bec66ce17d772c0e9561c4f11737
301-
FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25
302-
FirebaseStorage: f1578d57e1fd3683fc05f5d4d7b24b7490b321ac
289+
Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
290+
firebase_analytics: 2b372cc13c077de5f1ac37e232bacd5bacb41963
291+
firebase_core: e6b8bb503b7d1d9856e698d4f193f7b414e6bf1f
292+
firebase_crashlytics: 3926afbc548afa983ed7683907b0d1d03af41955
293+
firebase_performance: 9364c1dd2e6c4d545380e47a07e254eb952ac2b0
294+
firebase_storage: 0cb7ceae9496b643ffe734ba2645b8b7339b0cc4
295+
FirebaseABTesting: c05b5ec9f1d9f21a65909525de301d375032d9a4
296+
FirebaseAnalytics: 0fc2b20091f0ddd21bf73397cf8f0eb5346dc24f
297+
FirebaseAppCheckInterop: f734c802f21fe1da0837708f0f9a27218c8a4ed0
298+
FirebaseAuthInterop: 858e6b754966e70740a4370dd1503dfffe6dbb49
299+
FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
300+
FirebaseCoreExtension: 7e1f7118ee970e001a8013719fb90950ee5e0018
301+
FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6
302+
FirebaseCrashlytics: a6ece278a837c7e88de2d9b5da0a3542f2342395
303+
FirebaseInstallations: ae9f4902cb5bf1d0c5eaa31ec1f4e5495a0714e2
304+
FirebasePerformance: ab6284808a5157a4c93a50d780803b8ccc36845f
305+
FirebaseRemoteConfig: 28e071a214ec66cdb113ed9ff4ce63e9abe018db
306+
FirebaseRemoteConfigInterop: 1e31ec72b89c9924367c59bfb5ec9ab60d1d6766
307+
FirebaseSessions: ba7c7a7ca8696a8d540eb3fe3800fbe98c79786d
308+
FirebaseSharedSwift: 93426a1de92f19e1199fac5295a4f8df16458daa
309+
FirebaseStorage: 20d6b56fb8a40ebaa03d6a2889fe33dac64adb73
303310
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
304311
geolocator_apple: 66b711889fd333205763b83c9dcf0a57a28c7afd
305-
Google-Maps-iOS-Utils: 0a484b05ed21d88c9f9ebbacb007956edd508a96
306-
google_maps_flutter_ios: e31555a04d1986ab130f2b9f24b6cdc861acc6d3
307-
GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe
308-
GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af
312+
GoogleAdsOnDeviceConversion: e03a386840803ea7eef3fd22a061930142c039c1
313+
GoogleAppMeasurement: 1e718274b7e015cefd846ac1fcf7820c70dc017d
309314
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
310-
GoogleMaps: 0608099d4870cac8754bdba9b6953db543432438
311315
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
312316
GTMSessionFetcher: 02d6e866e90bc236f48a703a041dfe43e6221a29
313317
map_launcher: 8a4e484aaddff55680a7da9bc9e25f512067fb87
318+
mapbox_maps_flutter: d7bef6687c5be0e49518c4c5423276ca68e2228a
319+
MapboxCommon: 479562bceca6b10d1c3b8bca5006ef86c51d7255
320+
MapboxCoreMaps: b96038f97c62e0e72ebece2a3b909ca4eda8ab21
321+
MapboxMaps: 8c0f733a3250a03bcc4938347ca5f699b0804ce1
314322
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
315323
package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
316-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
324+
path_provider_foundation: 0b743cbb62d8e47eab856f09262bb8c1ddcfe6ba
317325
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
318326
PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
319-
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
327+
shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
320328
sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
321-
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
329+
Turf: c9eb11a65d96af58cac523460fd40fec5061b081
330+
url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa
322331

323332
PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
324333

0 commit comments

Comments
 (0)