From c09291e1b2f0c2b548c8bdc3ce2fca25d41abec3 Mon Sep 17 00:00:00 2001
From: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com>
Date: Wed, 4 Jun 2025 09:25:30 -0700
Subject: [PATCH] Added a button to change waypoint to your location

---
 .../CoreData/WaypointEntityExtension.swift    | 28 ++++++++++++-------
 .../Nodes/Helpers/Map/WaypointForm.swift      |  8 ++++++
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Meshtastic/Extensions/CoreData/WaypointEntityExtension.swift b/Meshtastic/Extensions/CoreData/WaypointEntityExtension.swift
index 2f538b62..240e6d76 100644
--- a/Meshtastic/Extensions/CoreData/WaypointEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/WaypointEntityExtension.swift
@@ -14,9 +14,6 @@ extension WaypointEntity {
 	static func allWaypointssFetchRequest() -> NSFetchRequest<WaypointEntity> {
 		let request: NSFetchRequest<WaypointEntity> = WaypointEntity.fetchRequest()
 		request.fetchLimit = 50
-		// request.fetchBatchSize = 1
-		// request.returnsObjectsAsFaults = false
-		// request.includesSubentities = true
 		request.returnsDistinctResults = true
 		request.sortDescriptors = [NSSortDescriptor(key: "name", ascending: false)]
 		request.predicate = NSPredicate(format: "expire == nil || expire >= %@", Date() as NSDate)
@@ -24,7 +21,6 @@ extension WaypointEntity {
 	}
 
 	var latitude: Double? {
-
 		let d = Double(latitudeI)
 		if d == 0 {
 			return 0
@@ -33,7 +29,6 @@ extension WaypointEntity {
 	}
 
 	var longitude: Double? {
-
 		let d = Double(longitudeI)
 		if d == 0 {
 			return 0
@@ -46,7 +41,7 @@ extension WaypointEntity {
 			let coord = CLLocationCoordinate2D(latitude: latitude!, longitude: longitude!)
 			return coord
 		} else {
-		   return nil
+			return nil
 		}
 	}
 
@@ -60,16 +55,29 @@ extension WaypointEntity {
 }
 
 extension WaypointEntity: MKAnnotation {
-	public var coordinate: CLLocationCoordinate2D { waypointCoordinate ?? LocationsHandler.DefaultLocation }
-	public var title: String? { name ?? "Dropped Pin" }
+	@MainActor
+	public var coordinate: CLLocationCoordinate2D {
+		get {
+			waypointCoordinate ?? LocationsHandler.currentLocation
+		}
+		set {
+			latitudeI = Int32(newValue.latitude * 1e7)
+			longitudeI = Int32(newValue.longitude * 1e7)
+		}
+	}
+
+	public var title: String? {
+		name ?? "Dropped Pin"
+	}
+
 	public var subtitle: String? {
 		(longDescription ?? "") +
 		String(expire != nil ? "\n⌛ Expires \(String(describing: expire?.formatted()))" : "") +
-		String(locked > 0 ? "\n🔒 Locked" : "") }
+		String(locked > 0 ? "\n🔒 Locked" : "")
+	}
 }
 
 struct WaypointCoordinate: Identifiable {
-
 	let id: UUID
 	let coordinate: CLLocationCoordinate2D?
 	let waypointId: Int64
diff --git a/Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift b/Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift
index ad342cbc..57320259 100644
--- a/Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift
+++ b/Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift
@@ -47,6 +47,14 @@ struct WaypointForm: View {
 								.textSelection(.enabled)
 								.foregroundColor(.secondary)
 								.font(.caption)
+							
+							Button {
+								let currentLoc = LocationsHandler.currentLocation
+								waypoint.coordinate.longitude = currentLoc.longitude
+								waypoint.coordinate.latitude = currentLoc.latitude
+							} label: {
+								Image(systemName: "location")
+							}
 						}
 						HStack {
 							if waypoint.coordinate.latitude != 0 && waypoint.coordinate.longitude != 0 {