vector-im/element-ios/issues/5298 - Displaying a modal when tapping on a location in the timeline.

RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift

@@ -26,6 +26,8 @@ struct LocationSharingMapView: UIViewRepresentable {
     
     let tileServerMapURL: URL
     let avatarData: AvatarInputProtocol
+    let location: CLLocationCoordinate2D?
+    
     let errorSubject: PassthroughSubject<LocationSharingViewError, Never>
     @Binding var userLocation: CLLocationCoordinate2D?
         
@@ -35,8 +37,17 @@ struct LocationSharingMapView: UIViewRepresentable {
         
         mapView.logoView.isHidden = true
         mapView.attributionButton.isHidden = true
-        mapView.showsUserLocation = true
-        mapView.userTrackingMode = .follow
+        
+        if let location = location {
+            mapView.setCenter(location, zoomLevel: Constants.mapZoomLevel, animated: false)
+            
+            let pointAnnotation = MGLPointAnnotation()
+            pointAnnotation.coordinate = location
+            mapView.addAnnotation(pointAnnotation)
+        } else {
+            mapView.showsUserLocation = true
+            mapView.userTrackingMode = .follow
+        }
         
         return mapView
     }
@@ -70,10 +81,6 @@ class LocationSharingMapViewCoordinator: NSObject, MGLMapViewDelegate {
     // MARK: - MGLMapViewDelegate
     
     func mapView(_ mapView: MGLMapView, viewFor annotation: MGLAnnotation) -> MGLAnnotationView? {
-        guard let _ = annotation as? MGLUserLocation else {
-            return nil
-        }
-        
         return UserLocationAnnotatonView(avatarData: avatarData)
     }
     

RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift

@@ -34,6 +34,7 @@ struct LocationSharingView: View {
         NavigationView {
             LocationSharingMapView(tileServerMapURL: context.viewState.tileServerMapURL,
                                    avatarData: context.viewState.avatarData,
+                                   location: context.viewState.location,
                                    errorSubject: context.viewState.errorSubject,
                                    userLocation: $context.userLocation)
                 .toolbar {
@@ -48,10 +49,12 @@ struct LocationSharingView: View {
                             .foregroundColor(theme.colors.primaryContent)
                     }
                     ToolbarItem(placement: .navigationBarTrailing) {
-                        Button(VectorL10n.locationSharingShareAction, action: {
-                            context.send(viewAction: .share)
-                        })
-                        .disabled(!context.viewState.shareButtonEnabled)
+                        if context.viewState.shareButtonVisible {
+                            Button(VectorL10n.locationSharingShareAction, action: {
+                                context.send(viewAction: .share)
+                            })
+                            .disabled(!context.viewState.shareButtonEnabled)
+                        }
                     }
                 }
                 .navigationBarTitleDisplayMode(.inline)