Allow specifying coords in search

Author: alicerunsonfedora

MCMaps/Red Window/Views/Search/RedWindowSearchTips.swift

@@ -0,0 +1,30 @@
+//
+//  RedWindowSearchTips.swift
+//  MCMaps
+//
+//  Created by Marquis Kurt on 10-08-2025.
+//
+
+import SwiftUI
+
+struct RedWindowSearchTips: View {
+    private let tips: [LocalizedStringKey] = [
+        "Use the `@{0,0} syntax to filter search results near a specific coordinate.",
+        "Type the name of a tag to filter search results by that tag."
+    ]
+
+    @State private var randomIndex: [LocalizedStringKey].Index = 0
+
+    var body: some View {
+        Label {
+            Text(tips[randomIndex])
+        } icon: {
+            Image(systemName: "lightbulb")
+                .symbolRenderingMode(.hierarchical)
+                .foregroundStyle(.teal)
+        }
+        .task {
+            randomIndex = tips.indices.randomElement() ?? 0
+        }
+    }
+}

MCMaps/Red Window/Views/Search/RedWindowSearchView.swift

@@ -97,13 +97,16 @@ struct RedWindowSearchView: View {
                 }
             } else {
                 // swiftlint:disable line_length
-                ContentUnavailableView(
-                    "Search Everything",
-                    image: "map.badge.magnifyingglass",
-                    description: Text(
+                ContentUnavailableView {
+                    Label("Search Everything", image: "map.badge.magnifyingglass")
+                } description: {
+                    Text(
                         "Search for nearby biomes and structures, pinned places, and any marked locations from integrations like Bluemap."
                     )
-                )
+                } actions: {
+                    RedWindowSearchTips()
+                }
+
                 // swiftlint:enable line_length
             }
         }
@@ -168,10 +171,6 @@ struct RedWindowSearchView: View {
             }
         } header: {
             Text("Biomes and Structures")
-        } footer: {
-            Text(
-                "Relative where you are on the map (\(currentLoc.accessibilityReadout))."
-            )
         }
     }
 }

MCMaps/Resources/Localizable.xcstrings

@@ -113,6 +113,9 @@
     },
     "Are you sure you want to remove %lld pins?" : {
 
+    },
+    "At: (%@)" : {
+
     },
     "Bastion" : {
 
@@ -437,9 +440,6 @@
     },
     "Refresh every: ^[%lld second](inflect: true)" : {
 
-    },
-    "Relative where you are on the map (%@)." : {
-
     },
     "Remove" : {
 
@@ -560,12 +560,18 @@
     },
     "Type a tag above to create it." : {
 
+    },
+    "Type the name of a tag to filter search results by that tag." : {
+
     },
     "Update player locations more frequently with Realtime Sync. [Learn more…](https://example.com)" : {
 
     },
     "Update World" : {
 
+    },
+    "Use the `@{0,0} syntax to filter search results near a specific coordinate." : {
+
     },
     "Use the search bar to look through your pins, or to locate nearby structures and biomes." : {
 

MCMaps/Shared/Services/CartographySearchService+SearchFilterGroup.swift

@@ -5,6 +5,7 @@
 //  Created by Marquis Kurt on 01-06-2025.
 //
 
+import Foundation
 import MCMap
 
 extension CartographySearchService {
@@ -14,6 +15,9 @@ extension CartographySearchService {
 
         /// Filter by a specific tag.
         case tag(String)
+
+        /// Filter results relative to a specific origin.
+        case origin(CGPoint)
     }
 
     /// A collection of search filters.
@@ -44,6 +48,19 @@ extension CartographySearchService.SearchFilterGroup {
 
         return matches
     }
+
+    func getFilteredOrigin() -> CGPoint? {
+        var point: CGPoint?
+        for filter in filters {
+            switch filter {
+            case .tag:
+                continue
+            case let .origin(position):
+                point = position
+            }
+        }
+        return point
+    }
 }
 
 extension CartographySearchService.SearchFilterGroup: Collection {

MCMaps/Shared/Services/CartographySearchService.swift

@@ -85,6 +85,11 @@ class CartographySearchService {
     func search(for query: Query, in context: SearchContext, filters: SearchFilterGroup? = nil) async -> SearchResult {
         var results = SearchResult()
         var integratedMarkers = [CartographyMapPin]()
+        var position = context.position
+
+        if let point = filters?.getFilteredOrigin() {
+            position = MinecraftPoint(cgPoint: point)
+        }
 
         if context.file.supportedFeatures.contains(.integrations), context.file.integrations.bluemap.enabled {
             integratedMarkers.append(contentsOf: await getBluemapMarkers(in: context))
@@ -102,14 +107,14 @@ class CartographySearchService {
         results.integratedData = filteredMarkers
 
         if let structure = MinecraftStructure(string: query) {
-            searchStructures(context, structure, &results)
+            searchStructures(at: position, context, structure, &results)
         }
 
         results.biomes = searchBiomes(
             query: query,
             mcVersion: context.file.manifest.worldSettings.version,
             world: context.world,
-            pos: context.position,
+            pos: position,
             dimension: context.dimension
         )
 
@@ -191,13 +196,14 @@ class CartographySearchService {
     }
 
     private func searchStructures(
+        at position: MinecraftPoint,
         _ context: SearchContext,
         _ structure: MinecraftStructure,
         _ results: inout SearchResult
     ) {
         let foundStructures = context.world.findStructures(
             ofType: structure,
-            at: context.position,
+            at: position,
             inRadius: searchRadius,
             dimension: context.dimension
         )

MCMaps/Shared/Views/Search/CartographySearchView.swift

@@ -141,17 +141,22 @@ struct CartographySearchView<InitialView: View, ResultsView: View>: View {
             prompt: useRedWindowDesign ? "Search" : "Go To..."
         ) { token in
             switch token {
-            case let .tag(tagName):
+            case .tag(let tagName):
                 Text(tagName)
+            case .origin(let point):
+                Text("At: (\(point.accessibilityReadout))")
             }
         }
         .searchFocused($searchFocused)
         .searchSuggestions {
             ForEach(getSuggestions()) { searchToken in
                 switch searchToken {
-                case let .tag(tagName):
+                case .tag(let tagName):
                     Label(tagName, systemImage: "tag")
                         .searchCompletion(searchToken)
+                case .origin(let pos):
+                    Label(pos.accessibilityReadout, systemImage: "location")
+                        .searchCompletion(searchToken)
                 }
             }
         }
@@ -193,9 +198,19 @@ struct CartographySearchView<InitialView: View, ResultsView: View>: View {
     }
 
     private func getSuggestions() -> [SearchToken] {
+        var searchTokens = [SearchToken]()
+
+        let positionSyntax = /\@\{(-?\d+),\s*(-?\d+)\}/
+        if let match = rawQuery.wholeMatch(of: positionSyntax) {
+            let (_, xCoord, zCoord) = match.output
+            let coordinate = CGPoint(x: Int(xCoord) ?? 0, y: Int(zCoord) ?? 0)
+            searchTokens.append(.origin(coordinate))
+        }
+
         let fileTags = file.tags
         let matchingTags = fileTags.filter { tag in rawQuery.lowercased().contains(tag.lowercased()) }
-        return matchingTags.map { SearchToken.tag($0) }
+        searchTokens.append(contentsOf: matchingTags.map { SearchToken.tag($0) })
+        return searchTokens
     }
 }
 

MCMapsTests/Services/CartographySearchServiceTests.swift

@@ -99,4 +99,23 @@ struct CartographySearchServiceTests {
             in: SearchContext(world: world, file: file, position: .zero))
         #expect(!results.biomes.isEmpty)
     }
+
+    @Test func searchReturnsNearbyBiomesRelativeToFilteredOrigin() async throws {
+        let world = try MinecraftWorld(version: "1.21.3", seed: 123)
+        let file = CartographyMapFile(withManifest: .sampleFile)
+        let service = CartographySearchService()
+        let context = SearchContext(world: world, file: file, position: .zero)
+
+        let originResults = await service.search(for: "Frozen River", in: context)
+        
+        let results = await service.search(
+            for: "Frozen River",
+            in: context,
+            filters: SearchFilterGroup(
+                filters: [.origin(CGPoint(x: 1000, y: 1000))]
+            )
+        )
+
+        #expect(originResults.biomes.map(\.position) != results.biomes.map(\.position))
+    }
 }