feat: Enhanced delegate sample with multiple callbacks

googlemaps-samples · Dec 1, 2024 · 1951ed8 · 1951ed8
1 parent c5d363f
commit 1951ed8
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 22 deletions.
diff --git a/GoogleMaps-SwiftUI/GoogleMaps-SwiftUI/Samples/BasicMap.swift b/GoogleMaps-SwiftUI/GoogleMaps-SwiftUI/Samples/BasicMap.swift
@@ -18,8 +18,8 @@ struct BasicMap: View {
 
     @State private var mapOptions: GMSMapViewOptions = {
         var options = GMSMapViewOptions()
-        // Initialize map centered on San Francisco
-        options.camera = .camera(.sanFrancisco)
+        // Initialize map centered at Google HQ
+        options.camera = .camera(.googleplex)
 
         // Or with custom zoom level for closer view
         // options.camera = .camera(.sanFrancisco, zoom: 15)

diff --git a/GoogleMaps-SwiftUI/GoogleMaps-SwiftUI/Samples/MapWithDelegate.swift b/GoogleMaps-SwiftUI/GoogleMaps-SwiftUI/Samples/MapWithDelegate.swift
@@ -16,26 +16,53 @@ import GoogleMaps
 
 struct MapWithDelegate: View {
 
+    @State var response: String = ""
     @State private var mapOptions: GMSMapViewOptions = {
         var options = GMSMapViewOptions()
         // Initialize map centered on San Francisco
-        options.camera = .camera(.googleplex)
+        options.camera = .camera(.sanFrancisco)
 
         // Or with custom zoom level for closer view
         // options.camera = .camera(.sanFrancisco, zoom: 15)
         return options
     }()
 
+    // multiple marker example
+    let multipleMarkers = [
+        GMSMarker(position: .chinatownGate),
+        GMSMarker(position: .coitTower),
+        GMSMarker(position: .ferryBuilding),
+        GMSMarker(position: .fishermansWharf)
+    ]
+
    var body: some View {
-
-       /// Tap handling is implemented through a delegate pattern: GoogleMapView exposes an onMapTapped modifier
-       /// that stores a coordinate handler in GoogleMapViewDelegate. When the underlying GMSMapView detects a tap,
-       /// it calls the delegate's mapView(_:didTapAt:) method, which then executes the stored handler with the
-       /// tap coordinates.
-       GoogleMapView(options: $mapOptions)
-           .onMapTapped { coordinate in
-              print("Map tapped at: \(coordinate.latitude), \(coordinate.longitude)")
+
+       VStack(spacing: 16) {
+           GoogleMapView(options: $mapOptions)
+               .mapMarkers(multipleMarkers)
+               .onMarkerTapped { marker in
+                   response = "Marker tapped at: \(marker.position)"
+                   return true
+               }
+               .onMapTapped { coordinate in
+                   response = "Map tapped at: \(coordinate.latitude), \(coordinate.longitude)"
+               }
+               .ignoresSafeAreaExceptTop()
+               .frame(maxWidth: .infinity, minHeight: 325)
+
+           HStack {
+               VStack(alignment: .leading, spacing: 8) {
+                   Text("Tap a Map location or Marker")
+                       .font(.headline)
+
+                   Text(response)
+                       .font(.body)
+                       .foregroundColor(.secondary)
+               }
+               Spacer()
            }
-           .ignoresSafeAreaExceptTop() //optional property for samples display
+           .padding(.horizontal)
+       }
+
    }
 }
diff --git a/GoogleMaps-SwiftUI/GoogleMaps-SwiftUI/Samples/MapWithMarker.swift b/GoogleMaps-SwiftUI/GoogleMaps-SwiftUI/Samples/MapWithMarker.swift
@@ -35,14 +35,6 @@ struct MapWithMarker: View {
         GoogleMapView(options: $mapOptions)
              //Adds one or more markers to be displayed on the map
             .mapMarkers(singleMarker)
-
-            .onMarkerTapped { marker in
-                print("Marker tapped at: \(marker.position)")
-                return true
-            }
-            .onMapTapped { coordinate in
-                print("Map tapped at: \(coordinate.latitude), \(coordinate.longitude)")
-            }
     }
 
 }
diff --git a/GoogleMaps-SwiftUI/GoogleMaps-SwiftUI/Samples/MapWithMarkers.swift b/GoogleMaps-SwiftUI/GoogleMaps-SwiftUI/Samples/MapWithMarkers.swift
@@ -27,7 +27,7 @@ struct MapWithMarkers: View {
     }()
 
     // multiple marker example
-    let multipleMarker = [
+    let multipleMarkers = [
         GMSMarker(position: .chinatownGate),
         GMSMarker(position: .coitTower),
         GMSMarker(position: .ferryBuilding),
@@ -37,7 +37,7 @@ struct MapWithMarkers: View {
     var body: some View {
         GoogleMapView(options: $mapOptions)
              //Adds one or more markers to be displayed on the map
-            .mapMarkers(multipleMarker)
+            .mapMarkers(multipleMarkers)
             .ignoresSafeAreaExceptTop()   //optional property for samples display
     }
 }