expo-maps 0.11.0 → 0.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/CHANGELOG.md +18 -1
  2. package/android/build.gradle +2 -2
  3. package/android/src/main/java/expo/modules/maps/GoogleMapsView.kt +113 -97
  4. package/android/src/main/java/expo/modules/maps/GoogleStreetView.kt +19 -18
  5. package/android/src/main/java/expo/modules/maps/Records.kt +58 -8
  6. package/build/apple/AppleMaps.types.d.ts +136 -0
  7. package/build/apple/AppleMaps.types.d.ts.map +1 -1
  8. package/build/apple/AppleMaps.types.js +123 -0
  9. package/build/apple/AppleMaps.types.js.map +1 -1
  10. package/build/google/GoogleMaps.types.d.ts +78 -1
  11. package/build/google/GoogleMaps.types.d.ts.map +1 -1
  12. package/build/google/GoogleMaps.types.js.map +1 -1
  13. package/expo-module.config.json +1 -1
  14. package/ios/AppleMapsViewiOS17.swift +5 -5
  15. package/ios/AppleMapsViewiOS18.swift +5 -5
  16. package/ios/MapRecords.swift +266 -6
  17. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0-sources.jar +0 -0
  18. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0-sources.jar.md5 +1 -0
  19. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0-sources.jar.sha1 +1 -0
  20. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0-sources.jar.sha256 +1 -0
  21. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0-sources.jar.sha512 +1 -0
  22. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.aar +0 -0
  23. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.aar.md5 +1 -0
  24. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.aar.sha1 +1 -0
  25. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.aar.sha256 +1 -0
  26. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.aar.sha512 +1 -0
  27. package/local-maven-repo/host/exp/exponent/expo.modules.maps/{0.11.0/expo.modules.maps-0.11.0.module → 0.12.0/expo.modules.maps-0.12.0.module} +24 -24
  28. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.module.md5 +1 -0
  29. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.module.sha1 +1 -0
  30. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.module.sha256 +1 -0
  31. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.module.sha512 +1 -0
  32. package/local-maven-repo/host/exp/exponent/expo.modules.maps/{0.11.0/expo.modules.maps-0.11.0.pom → 0.12.0/expo.modules.maps-0.12.0.pom} +2 -2
  33. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.pom.md5 +1 -0
  34. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.pom.sha1 +1 -0
  35. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.pom.sha256 +1 -0
  36. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.12.0/expo.modules.maps-0.12.0.pom.sha512 +1 -0
  37. package/local-maven-repo/host/exp/exponent/expo.modules.maps/maven-metadata.xml +4 -4
  38. package/local-maven-repo/host/exp/exponent/expo.modules.maps/maven-metadata.xml.md5 +1 -1
  39. package/local-maven-repo/host/exp/exponent/expo.modules.maps/maven-metadata.xml.sha1 +1 -1
  40. package/local-maven-repo/host/exp/exponent/expo.modules.maps/maven-metadata.xml.sha256 +1 -1
  41. package/local-maven-repo/host/exp/exponent/expo.modules.maps/maven-metadata.xml.sha512 +1 -1
  42. package/package.json +4 -4
  43. package/src/apple/AppleMaps.types.ts +165 -0
  44. package/src/google/GoogleMaps.types.ts +91 -1
  45. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0-sources.jar +0 -0
  46. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0-sources.jar.md5 +0 -1
  47. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0-sources.jar.sha1 +0 -1
  48. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0-sources.jar.sha256 +0 -1
  49. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0-sources.jar.sha512 +0 -1
  50. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.aar +0 -0
  51. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.aar.md5 +0 -1
  52. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.aar.sha1 +0 -1
  53. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.aar.sha256 +0 -1
  54. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.aar.sha512 +0 -1
  55. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.module.md5 +0 -1
  56. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.module.sha1 +0 -1
  57. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.module.sha256 +0 -1
  58. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.module.sha512 +0 -1
  59. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.pom.md5 +0 -1
  60. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.pom.sha1 +0 -1
  61. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.pom.sha256 +0 -1
  62. package/local-maven-repo/host/exp/exponent/expo.modules.maps/0.11.0/expo.modules.maps-0.11.0.pom.sha512 +0 -1
package/CHANGELOG.md CHANGED
@@ -10,7 +10,24 @@
10
10
 
11
11
  ### 💡 Others
12
12
 
13
- ## 0.11.0 — 2025-06-18
13
+ ## 0.12.0 — 2025-08-13
14
+
15
+ ### 🎉 New features
16
+
17
+ - Add `contentPadding` property to the `GoogleMaps.View` component on Android. ([#38382](https://github.com/expo/expo/pull/38382) by [@nishan](https://github.com/intergalacticspacehighway))
18
+ - Add anchor and zIndex support to GoogleMapsView markers. ([#38357](https://github.com/expo/expo/pull/38357) by [@shollington-rbi](https://github.com/shollington-rbi))
19
+ - Add support for Google Maps styling with JSON configuration and `mapId` property. ([#38493](https://github.com/expo/expo/pull/38493) by [@nishan](https://github.com/intergalacticspacehighway))
20
+ - Add points of interest filter, elevation and emphasis styling to Apple maps. ([#38514](https://github.com/expo/expo/pull/38514) by [@nishan](https://github.com/intergalacticspacehighway))
21
+
22
+ ### 🐛 Bug fixes
23
+
24
+ - Fix onMapClick and onMapLongClick nesting. ([#37059](https://github.com/expo/expo/pull/37059) by [@jakex7](https://github.com/jakex7))
25
+
26
+ ### 💡 Others
27
+
28
+ - Fixed `ExpoComposeView` breaking change errors. ([#36256](https://github.com/expo/expo/pull/36256) by [@kudo](https://github.com/kudo))
29
+
30
+ ## 0.11.0 - 2025-06-18
14
31
 
15
32
  ### 🎉 New features
16
33
 
@@ -14,13 +14,13 @@ apply plugin: 'expo-module-gradle-plugin'
14
14
  apply plugin: 'org.jetbrains.kotlin.plugin.compose'
15
15
 
16
16
  group = 'host.exp.exponent'
17
- version = '0.11.0'
17
+ version = '0.12.0'
18
18
 
19
19
  android {
20
20
  namespace "expo.modules.maps"
21
21
  defaultConfig {
22
22
  versionCode 1
23
- versionName "0.11.0"
23
+ versionName "0.12.0"
24
24
  }
25
25
  buildFeatures {
26
26
  compose true
@@ -40,6 +40,9 @@ import expo.modules.kotlin.viewevent.ViewEventCallback
40
40
  import expo.modules.kotlin.views.ComposeProps
41
41
  import expo.modules.kotlin.views.ExpoComposeView
42
42
  import kotlinx.coroutines.launch
43
+ import androidx.compose.foundation.layout.PaddingValues
44
+ import androidx.compose.ui.unit.dp
45
+ import com.google.android.gms.maps.GoogleMapOptions
43
46
 
44
47
  data class GoogleMapsViewProps(
45
48
  val userLocation: MutableState<UserLocationRecord> = mutableStateOf(UserLocationRecord()),
@@ -50,17 +53,20 @@ data class GoogleMapsViewProps(
50
53
  val circles: MutableState<List<CircleRecord>> = mutableStateOf(listOf()),
51
54
  val uiSettings: MutableState<MapUiSettingsRecord> = mutableStateOf(MapUiSettingsRecord()),
52
55
  val properties: MutableState<MapPropertiesRecord> = mutableStateOf(MapPropertiesRecord()),
53
- val colorScheme: MutableState<MapColorSchemeEnum> = mutableStateOf(MapColorSchemeEnum.FOLLOW_SYSTEM)
56
+ val colorScheme: MutableState<MapColorSchemeEnum> = mutableStateOf(MapColorSchemeEnum.FOLLOW_SYSTEM),
57
+ val contentPadding: MutableState<MapContentPaddingRecord> = mutableStateOf(MapContentPaddingRecord()),
58
+ val mapOptions: MutableState<MapOptionsRecord> = mutableStateOf(MapOptionsRecord())
54
59
  ) : ComposeProps
55
60
 
56
61
  @SuppressLint("ViewConstructor")
57
- class GoogleMapsView(context: Context, appContext: AppContext) : ExpoComposeView<GoogleMapsViewProps>(context, appContext) {
62
+ class GoogleMapsView(context: Context, appContext: AppContext) :
63
+ ExpoComposeView<GoogleMapsViewProps>(context, appContext, withHostingView = true) {
58
64
  override val props = GoogleMapsViewProps()
59
65
 
60
66
  private val onMapLoaded by EventDispatcher<Unit>()
61
67
 
62
- private val onMapClick by EventDispatcher<Coordinates>()
63
- private val onMapLongClick by EventDispatcher<Coordinates>()
68
+ private val onMapClick by EventDispatcher<MapClickEvent>()
69
+ private val onMapLongClick by EventDispatcher<MapClickEvent>()
64
70
  private val onPOIClick by EventDispatcher<POIRecord>()
65
71
  private val onMarkerClick by EventDispatcher<MarkerRecord>()
66
72
  private val onPolylineClick by EventDispatcher<PolylineRecord>()
@@ -74,110 +80,120 @@ class GoogleMapsView(context: Context, appContext: AppContext) : ExpoComposeView
74
80
  private lateinit var cameraState: CameraPositionState
75
81
  private var manualCameraControl = false
76
82
 
77
- init {
78
- setContent {
79
- cameraState = updateCameraState()
80
- val markerState = markerStateFromProps()
81
- val locationSource = locationSourceFromProps()
82
- val polylineState by polylineStateFromProps()
83
- val polygonState by polygonStateFromProps()
84
- val circleState by circleStateFromProps()
85
-
86
- GoogleMap(
87
- modifier = Modifier.fillMaxSize(),
88
- cameraPositionState = cameraState,
89
- uiSettings = props.uiSettings.value.toMapUiSettings(),
90
- properties = props.properties.value.toMapProperties(),
91
- onMapLoaded = {
92
- onMapLoaded(Unit)
93
- wasLoaded.value = true
94
- },
95
- onMapClick = { latLng ->
96
- onMapClick(
83
+ @Composable
84
+ override fun Content(modifier: Modifier) {
85
+ cameraState = updateCameraState()
86
+ val markerState = markerStateFromProps()
87
+ val locationSource = locationSourceFromProps()
88
+ val polylineState by polylineStateFromProps()
89
+ val polygonState by polygonStateFromProps()
90
+ val circleState by circleStateFromProps()
91
+ val mapOptions = props.mapOptions.value.mapId?.let { GoogleMapOptions().mapId(it) } ?: GoogleMapOptions()
92
+
93
+ GoogleMap(
94
+ googleMapOptionsFactory = { mapOptions },
95
+ modifier = Modifier.fillMaxSize(),
96
+ cameraPositionState = cameraState,
97
+ uiSettings = props.uiSettings.value.toMapUiSettings(),
98
+ properties = props.properties.value.toMapProperties(),
99
+ contentPadding = props.contentPadding.value.let {
100
+ PaddingValues(start = it.start.dp, end = it.end.dp, top = it.top.dp, bottom = it.bottom.dp)
101
+ },
102
+ onMapLoaded = {
103
+ onMapLoaded(Unit)
104
+ wasLoaded.value = true
105
+ },
106
+ onMapClick = { latLng ->
107
+ onMapClick(
108
+ MapClickEvent(
97
109
  Coordinates(latLng.latitude, latLng.longitude)
98
110
  )
99
- },
100
- onMapLongClick = { latLng ->
101
- onMapLongClick(
111
+ )
112
+ },
113
+ onMapLongClick = { latLng ->
114
+ onMapLongClick(
115
+ MapClickEvent(
102
116
  Coordinates(latLng.latitude, latLng.longitude)
103
117
  )
104
- },
105
- onPOIClick = { poi ->
106
- onPOIClick(
107
- POIRecord(
108
- poi.name,
109
- Coordinates(poi.latLng.latitude, poi.latLng.longitude)
110
- )
118
+ )
119
+ },
120
+ onPOIClick = { poi ->
121
+ onPOIClick(
122
+ POIRecord(
123
+ poi.name,
124
+ Coordinates(poi.latLng.latitude, poi.latLng.longitude)
111
125
  )
112
- },
113
- onMyLocationButtonClick = props.userLocation.value.coordinates?.let { coordinates ->
114
- {
115
- // Override onMyLocationButtonClick with default behavior to update manualCameraControl
116
- appContext.mainQueue.launch {
117
- cameraState.animate(CameraUpdateFactory.newLatLng(coordinates.toLatLng()))
118
- manualCameraControl = false
119
- }
120
- true
126
+ )
127
+ },
128
+ onMyLocationButtonClick = props.userLocation.value.coordinates?.let { coordinates ->
129
+ {
130
+ // Override onMyLocationButtonClick with default behavior to update manualCameraControl
131
+ appContext.mainQueue.launch {
132
+ cameraState.animate(CameraUpdateFactory.newLatLng(coordinates.toLatLng()))
133
+ manualCameraControl = false
121
134
  }
122
- },
123
- mapColorScheme = props.colorScheme.value.toComposeMapColorScheme(),
124
- locationSource = locationSource
125
- ) {
126
- polylineState.forEach { (polyline, coordinates) ->
127
- Polyline(
128
- points = coordinates,
129
- color = Color(polyline.color),
130
- geodesic = polyline.geodesic,
131
- width = polyline.width,
132
- clickable = true,
133
- onClick = {
134
- onPolylineClick(
135
- PolylineRecord(
136
- id = polyline.id,
137
- coordinates.map { Coordinates(it.latitude, it.longitude) },
138
- polyline.geodesic,
139
- polyline.color,
140
- polyline.width
141
- )
142
- )
143
- }
144
- )
135
+ true
145
136
  }
146
-
147
- MapPolygons(
148
- polygonState = polygonState,
149
- onPolygonClick = onPolygonClick
137
+ },
138
+ mapColorScheme = props.colorScheme.value.toComposeMapColorScheme(),
139
+ locationSource = locationSource
140
+ ) {
141
+ polylineState.forEach { (polyline, coordinates) ->
142
+ Polyline(
143
+ points = coordinates,
144
+ color = Color(polyline.color),
145
+ geodesic = polyline.geodesic,
146
+ width = polyline.width,
147
+ clickable = true,
148
+ onClick = {
149
+ onPolylineClick(
150
+ PolylineRecord(
151
+ id = polyline.id,
152
+ coordinates.map { Coordinates(it.latitude, it.longitude) },
153
+ polyline.geodesic,
154
+ polyline.color,
155
+ polyline.width
156
+ )
157
+ )
158
+ }
150
159
  )
160
+ }
151
161
 
152
- MapCircles(
153
- circleState = circleState,
154
- onCircleClick = onCircleClick
155
- )
162
+ MapPolygons(
163
+ polygonState = polygonState,
164
+ onPolygonClick = onPolygonClick
165
+ )
166
+
167
+ MapCircles(
168
+ circleState = circleState,
169
+ onCircleClick = onCircleClick
170
+ )
156
171
 
157
- for ((marker, state) in markerState.value) {
158
- val icon = getIconDescriptor(marker)
159
-
160
- Marker(
161
- state = state,
162
- title = marker.title,
163
- snippet = marker.snippet,
164
- draggable = marker.draggable,
165
- icon = icon,
166
- onClick = {
167
- onMarkerClick(
168
- // We can't send icon to js, because it's not serializable
169
- // So we need to remove it from the marker record
170
- MarkerRecord(
171
- id = marker.id,
172
- title = marker.title,
173
- snippet = marker.snippet,
174
- coordinates = marker.coordinates
175
- )
172
+ for ((marker, state) in markerState.value) {
173
+ val icon = getIconDescriptor(marker)
174
+
175
+ Marker(
176
+ state = state,
177
+ title = marker.title,
178
+ snippet = marker.snippet,
179
+ draggable = marker.draggable,
180
+ anchor = marker.anchor.toOffset(),
181
+ zIndex = marker.zIndex,
182
+ icon = icon,
183
+ onClick = {
184
+ onMarkerClick(
185
+ // We can't send icon to js, because it's not serializable
186
+ // So we need to remove it from the marker record
187
+ MarkerRecord(
188
+ id = marker.id,
189
+ title = marker.title,
190
+ snippet = marker.snippet,
191
+ coordinates = marker.coordinates
176
192
  )
177
- !marker.showCallout
178
- }
179
- )
180
- }
193
+ )
194
+ !marker.showCallout
195
+ }
196
+ )
181
197
  }
182
198
  }
183
199
  }
@@ -1,9 +1,11 @@
1
1
  package expo.modules.maps
2
2
 
3
3
  import android.content.Context
4
+ import androidx.compose.runtime.Composable
4
5
  import androidx.compose.runtime.MutableState
5
6
  import androidx.compose.runtime.key
6
7
  import androidx.compose.runtime.mutableStateOf
8
+ import androidx.compose.ui.Modifier
7
9
  import com.google.android.gms.maps.StreetViewPanoramaOptions
8
10
  import com.google.android.gms.maps.model.StreetViewPanoramaCamera
9
11
  import com.google.maps.android.compose.streetview.StreetView
@@ -24,26 +26,25 @@ data class GoogleStreetViewProps(
24
26
  class GoogleStreetView(
25
27
  context: Context,
26
28
  appContext: AppContext
27
- ) : ExpoComposeView<GoogleStreetViewProps>(context, appContext) {
29
+ ) : ExpoComposeView<GoogleStreetViewProps>(context, appContext, withHostingView = true) {
28
30
  override val props = GoogleStreetViewProps()
29
31
 
30
- init {
31
- setContent {
32
- key(props.position.value.coordinates.toString()) {
33
- StreetView(
34
- streetViewPanoramaOptionsFactory = {
35
- props.position.value.let { camera ->
36
- StreetViewPanoramaOptions()
37
- .position(camera.coordinates.toLatLng())
38
- .panoramaCamera(StreetViewPanoramaCamera(camera.zoom, camera.tilt, camera.bearing))
39
- }
40
- },
41
- isPanningGesturesEnabled = props.isPanningGesturesEnabled.value,
42
- isStreetNamesEnabled = props.isStreetNamesEnabled.value,
43
- isUserNavigationEnabled = props.isUserNavigationEnabled.value,
44
- isZoomGesturesEnabled = props.isZoomGesturesEnabled.value
45
- )
46
- }
32
+ @Composable
33
+ override fun Content(modifier: Modifier) {
34
+ key(props.position.value.coordinates.toString()) {
35
+ StreetView(
36
+ streetViewPanoramaOptionsFactory = {
37
+ props.position.value.let { camera ->
38
+ StreetViewPanoramaOptions()
39
+ .position(camera.coordinates.toLatLng())
40
+ .panoramaCamera(StreetViewPanoramaCamera(camera.zoom, camera.tilt, camera.bearing))
41
+ }
42
+ },
43
+ isPanningGesturesEnabled = props.isPanningGesturesEnabled.value,
44
+ isStreetNamesEnabled = props.isStreetNamesEnabled.value,
45
+ isUserNavigationEnabled = props.isUserNavigationEnabled.value,
46
+ isZoomGesturesEnabled = props.isZoomGesturesEnabled.value
47
+ )
47
48
  }
48
49
  }
49
50
  }
@@ -5,7 +5,9 @@ package expo.modules.maps
5
5
  import android.graphics.Bitmap
6
6
  import android.graphics.drawable.Drawable
7
7
  import android.location.Location
8
+ import androidx.compose.ui.geometry.Offset
8
9
  import com.google.android.gms.maps.model.LatLng
10
+ import com.google.android.gms.maps.model.MapStyleOptions
9
11
  import com.google.maps.android.compose.ComposeMapColorScheme
10
12
  import com.google.maps.android.compose.MapProperties
11
13
  import com.google.maps.android.compose.MapType
@@ -45,6 +47,16 @@ data class Coordinates(
45
47
  }
46
48
  }
47
49
 
50
+ data class AnchorRecord(
51
+ @Field
52
+ val x: Float = 0.5f,
53
+
54
+ @Field
55
+ val y: Float = 1.0f
56
+ ) : Record {
57
+ fun toOffset() = Offset(x = x, y = y)
58
+ }
59
+
48
60
  data class MarkerRecord(
49
61
  @Field
50
62
  val id: String = UUID.randomUUID().toString(),
@@ -65,13 +77,19 @@ data class MarkerRecord(
65
77
  val icon: Either<SharedRef<Drawable>, SharedRef<Bitmap>>? = null,
66
78
 
67
79
  @Field
68
- val showCallout: Boolean = true
80
+ val showCallout: Boolean = true,
81
+
82
+ @Field
83
+ val anchor: AnchorRecord = AnchorRecord(),
84
+
85
+ @Field
86
+ val zIndex: Float = 0.0f
69
87
  ) : Record
70
88
 
71
89
  data class PolylineRecord(
72
90
  @Field
73
91
  val id: String = UUID.randomUUID().toString(),
74
-
92
+
75
93
  @Field
76
94
  val coordinates: List<Coordinates> = emptyList(),
77
95
 
@@ -82,8 +100,8 @@ data class PolylineRecord(
82
100
  val color: Int = 0xFF0000FF.toInt(),
83
101
 
84
102
  @Field
85
- val width: Float = 10f,
86
- ): Record
103
+ val width: Float = 10f
104
+ ) : Record
87
105
 
88
106
  data class PolygonRecord(
89
107
  @Field
@@ -100,7 +118,7 @@ data class PolygonRecord(
100
118
 
101
119
  @Field
102
120
  val color: Int = 0xFF0000FF.toInt()
103
- ): Record
121
+ ) : Record
104
122
 
105
123
  data class CameraPositionRecord(
106
124
  @Field
@@ -127,7 +145,7 @@ data class CircleRecord(
127
145
  val lineColor: Int? = null,
128
146
 
129
147
  @Field
130
- val lineWidth: Float? = null,
148
+ val lineWidth: Float? = null
131
149
  ) : Record
132
150
 
133
151
  data class UserLocationRecord(
@@ -192,6 +210,11 @@ enum class MapTypeEnum : Enumerable {
192
210
  }
193
211
  }
194
212
 
213
+ data class MapStyleOptionsRecord(
214
+ @Field
215
+ val json: String
216
+ ) : Record
217
+
195
218
  data class MapPropertiesRecord(
196
219
  @Field
197
220
  val isBuildingEnabled: Boolean = false,
@@ -202,8 +225,9 @@ data class MapPropertiesRecord(
202
225
  @Field
203
226
  val isTrafficEnabled: Boolean = false,
204
227
  // TODO(@lukmccall): supports these properties
205
- // val latLngBoundsForCameraTarget: LatLngBounds? = null,
206
- // val mapStyleOptions: MapStyleOptions? = null,
228
+ // val latLngBoundsForCameraTarget: LatLngBounds? = null,
229
+ @Field
230
+ val mapStyleOptions: MapStyleOptionsRecord? = null,
207
231
  @Field
208
232
  val mapType: MapTypeEnum = MapTypeEnum.NORMAL,
209
233
  @Field
@@ -212,11 +236,13 @@ data class MapPropertiesRecord(
212
236
  val minZoomPreference: Float = 3.0f
213
237
  ) : Record {
214
238
  fun toMapProperties(): MapProperties {
239
+ val mapStyleOptionsParsed = mapStyleOptions?.json?.let { MapStyleOptions(it) }
215
240
  return MapProperties(
216
241
  isBuildingEnabled = isBuildingEnabled,
217
242
  isIndoorEnabled = isIndoorEnabled,
218
243
  isMyLocationEnabled = isMyLocationEnabled,
219
244
  isTrafficEnabled = isTrafficEnabled,
245
+ mapStyleOptions = mapStyleOptionsParsed,
220
246
  mapType = mapType.toMapType(),
221
247
  maxZoomPreference = maxZoomPreference,
222
248
  minZoomPreference = minZoomPreference
@@ -260,6 +286,11 @@ data class CameraMoveEvent(
260
286
  val bearing: Float
261
287
  ) : Record
262
288
 
289
+ data class MapClickEvent(
290
+ @Field
291
+ val coordinates: Coordinates
292
+ ) : Record
293
+
263
294
  data class CameraPositionStreetViewRecord(
264
295
  @Field
265
296
  val coordinates: Coordinates = Coordinates(),
@@ -273,3 +304,22 @@ data class CameraPositionStreetViewRecord(
273
304
  @Field
274
305
  val bearing: Float = 0f
275
306
  ) : Record
307
+
308
+ data class MapContentPaddingRecord(
309
+ @Field
310
+ val start: Float = 0f,
311
+
312
+ @Field
313
+ val end: Float = 0f,
314
+
315
+ @Field
316
+ val top: Float = 0f,
317
+
318
+ @Field
319
+ val bottom: Float = 0f
320
+ ) : Record
321
+
322
+ data class MapOptionsRecord(
323
+ @Field
324
+ val mapId: String? = null
325
+ ) : Record
@@ -81,6 +81,130 @@ export declare enum AppleMapsContourStyle {
81
81
  */
82
82
  GEODESIC = "GEODESIC"
83
83
  }
84
+ /**
85
+ * @platform ios
86
+ */
87
+ export declare enum AppleMapsMapStyleElevation {
88
+ /**
89
+ * The default elevation style, that renders a flat, 2D map.
90
+ */
91
+ AUTOMATIC = "AUTOMATIC",
92
+ /**
93
+ * A flat elevation style.
94
+ */
95
+ FLAT = "FLAT",
96
+ /**
97
+ * A value that renders a realistic, 3D map.
98
+ */
99
+ REALISTIC = "REALISTIC"
100
+ }
101
+ /**
102
+ * @platform ios
103
+ */
104
+ export declare enum AppleMapsMapStyleEmphasis {
105
+ /**
106
+ * The default level of emphasis.
107
+ */
108
+ AUTOMATIC = "AUTOMATIC",
109
+ /**
110
+ * A muted emphasis style, that deemphasizes the map’s imagery.
111
+ */
112
+ MUTED = "MUTED"
113
+ }
114
+ /**
115
+ * @platform ios
116
+ * @see https://developer.apple.com/documentation/mapkit/AppleMapPointOfInterestCategory
117
+ */
118
+ export declare enum AppleMapPointOfInterestCategory {
119
+ MUSEUM = "MUSEUM",
120
+ MUSIC_VENUE = "MUSIC_VENUE",
121
+ THEATER = "THEATER",
122
+ LIBRARY = "LIBRARY",
123
+ PLANETARIUM = "PLANETARIUM",
124
+ SCHOOL = "SCHOOL",
125
+ UNIVERSITY = "UNIVERSITY",
126
+ MOVIE_THEATER = "MOVIE_THEATER",
127
+ NIGHTLIFE = "NIGHTLIFE",
128
+ FIRE_STATION = "FIRE_STATION",
129
+ HOSPITAL = "HOSPITAL",
130
+ PHARMACY = "PHARMACY",
131
+ POLICE = "POLICE",
132
+ CASTLE = "CASTLE",
133
+ FORTRESS = "FORTRESS",
134
+ LANDMARK = "LANDMARK",
135
+ NATIONAL_MONUMENT = "NATIONAL_MONUMENT",
136
+ BAKERY = "BAKERY",
137
+ BREWERY = "BREWERY",
138
+ CAFE = "CAFE",
139
+ DISTILLERY = "DISTILLERY",
140
+ FOOD_MARKET = "FOOD_MARKET",
141
+ RESTAURANT = "RESTAURANT",
142
+ WINERY = "WINERY",
143
+ ANIMAL_SERVICE = "ANIMAL_SERVICE",
144
+ ATM = "ATM",
145
+ AUTOMOTIVE_REPAIR = "AUTOMOTIVE_REPAIR",
146
+ BANK = "BANK",
147
+ BEAUTY = "BEAUTY",
148
+ EV_CHARGER = "EV_CHARGER",
149
+ FITNESS_CENTER = "FITNESS_CENTER",
150
+ LAUNDRY = "LAUNDRY",
151
+ MAILBOX = "MAILBOX",
152
+ POST_OFFICE = "POST_OFFICE",
153
+ RESTROOM = "RESTROOM",
154
+ SPA = "SPA",
155
+ STORE = "STORE",
156
+ AMUSEMENT_PARK = "AMUSEMENT_PARK",
157
+ AQUARIUM = "AQUARIUM",
158
+ BEACH = "BEACH",
159
+ CAMPGROUND = "CAMPGROUND",
160
+ FAIRGROUND = "FAIRGROUND",
161
+ MARINA = "MARINA",
162
+ NATIONAL_PARK = "NATIONAL_PARK",
163
+ PARK = "PARK",
164
+ RV_PARK = "RV_PARK",
165
+ ZOO = "ZOO",
166
+ BASEBALL = "BASEBALL",
167
+ BASKETBALL = "BASKETBALL",
168
+ BOWLING = "BOWLING",
169
+ GO_KART = "GO_KART",
170
+ GOLF = "GOLF",
171
+ HIKING = "HIKING",
172
+ MINI_GOLF = "MINI_GOLF",
173
+ ROCK_CLIMBING = "ROCK_CLIMBING",
174
+ SKATE_PARK = "SKATE_PARK",
175
+ SKATING = "SKATING",
176
+ SKIING = "SKIING",
177
+ SOCCER = "SOCCER",
178
+ STADIUM = "STADIUM",
179
+ TENNIS = "TENNIS",
180
+ VOLLEYBALL = "VOLLEYBALL",
181
+ AIRPORT = "AIRPORT",
182
+ CAR_RENTAL = "CAR_RENTAL",
183
+ CONVENTION_CENTER = "CONVENTION_CENTER",
184
+ GAS_STATION = "GAS_STATION",
185
+ HOTEL = "HOTEL",
186
+ PARKING = "PARKING",
187
+ PUBLIC_TRANSPORT = "PUBLIC_TRANSPORT",
188
+ FISHING = "FISHING",
189
+ KAYAKING = "KAYAKING",
190
+ SURFING = "SURFING",
191
+ SWIMMING = "SWIMMING"
192
+ }
193
+ /**
194
+ * @platform ios
195
+ */
196
+ export type AppleMapsPointOfInterestCategories = {
197
+ /**
198
+ * The POI categories to include.
199
+ * To hide all POIs, set this to an empty array.
200
+ */
201
+ including?: AppleMapPointOfInterestCategory[];
202
+ /**
203
+ * The POI categories to exclude.
204
+ * To show all POIs, set this to an empty array.
205
+ */
206
+ excluding?: AppleMapPointOfInterestCategory[];
207
+ };
84
208
  /**
85
209
  * @platform ios
86
210
  */
@@ -98,6 +222,18 @@ export type AppleMapsProperties = {
98
222
  * Defines which map type should be used.
99
223
  */
100
224
  mapType?: AppleMapsMapType;
225
+ /**
226
+ * A structure you use to define points of interest to include or exclude on a map.
227
+ */
228
+ pointsOfInterest?: AppleMapsPointOfInterestCategories;
229
+ /**
230
+ * Values you use to determine whether a map renders elevation.
231
+ */
232
+ elevation?: AppleMapsMapStyleElevation;
233
+ /**
234
+ * Values that control how the framework emphasizes map features.
235
+ */
236
+ emphasis?: AppleMapsMapStyleEmphasis;
101
237
  /**
102
238
  * If true, the user can select a location on the map to get more information.
103
239
  */
@@ -1 +1 @@
1
- {"version":3,"file":"AppleMaps.types.d.ts","sourceRoot":"","sources":["../../src/apple/AppleMaps.types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AppleMaps.types.d.ts","sourceRoot":"","sources":["../../src/apple/AppleMaps.types.ts"],"names":[],"mappings":"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"}