Allow specifying pin dimensions

alicerunsonfedora · alicerunsonfedora · commit 311b1a521c93 · 2025-08-13T17:30:43.000-04:00
Some pins might only be applicable to certain dimensions such as the
Nether. In these cases, players can set the pin's dimension to have it
only appear in that dimension. The coordinates then are relative to the
dimension they're assigned to, and the appropriate label views will
automatically convert when necessary.

By default, pins in v1 will be assumed as the Overworld.
diff --git a/Alidade.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Alidade.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/MCMaps/Legacy/Views/Pins/CartographyMapPinDetailView.swift b/MCMaps/Legacy/Views/Pins/CartographyMapPinDetailView.swift
@@ -63,28 +63,19 @@ struct CartographyMapPinDetailView: View {
                     }
                 }
 
-                HStack {
-                    Label(viewModel.pinLocationLabel, semanticIcon: .overworld)
-                        .font(.subheadline)
-                        .monospaced()
-                        .foregroundStyle(.secondary)
-                        .help("Location in Overworld: \(viewModel.pinLocationLabel)")
-                        .accessibilityLabel("Location in Overworld")
-                        .accessibilityValue(viewModel.pinLocationLabel)
-                    Label(viewModel.netherTranslatedCoordinate, semanticIcon: .nether)
-                        .font(.subheadline)
-                        .monospaced()
-                        .foregroundStyle(.secondary)
-                        .help("Location in Nether: \(viewModel.netherTranslatedCoordinate)")
-                        .accessibilityLabel("Location in Nether")
-                        .accessibilityValue(viewModel.netherTranslatedCoordinate)
-                }
-                .padding(.vertical, 2)
+                PinCoordinateStack(pin: viewModel.pin.wrappedValue)
+                    .font(.subheadline)
+                    .foregroundStyle(.secondary)
+                    .padding(.vertical, 2)
             }
 
             .listRowBackground(Color.clear)
             .listRowSeparator(.hidden)
 
+            Group {
+                WorldCodedDimensionPicker(selection: viewModel.pin.dimension)
+            }
+
             Group {
                 if !viewModel.images().isEmpty {
                     Section("Photos") {
diff --git a/MCMaps/Red Window/Views/Detail/Cells/RedWindowPinHeader.swift b/MCMaps/Red Window/Views/Detail/Cells/RedWindowPinHeader.swift
@@ -89,10 +89,9 @@ struct RedWindowPinHeader: RedWindowDetailCell {
                     .foregroundStyle(.primary)
                     .font(.largeTitle)
                     .bold()
-                    Text("(\(Int(pin.position.x)), \(Int(pin.position.y)))")
+                    PinCoordinateStack(pin: pin)
                         .font(.headline)
                         .foregroundStyle(.secondary)
-                        .fontDesign(.monospaced)
                 }
                 Spacer()
             }
@@ -111,7 +110,7 @@ struct RedWindowPinHeader: RedWindowDetailCell {
         Rectangle()
             .fill(
                 Color(pin.color?.swiftUIColor ?? .accent)
-                    .opacity(0.85)
+                    .opacity(0.75)
                     .gradient
             )
     }
diff --git a/MCMaps/Red Window/Views/Detail/RedWindowPinDetailView.swift b/MCMaps/Red Window/Views/Detail/RedWindowPinDetailView.swift
@@ -131,23 +131,24 @@ struct RedWindowPinDetailView: View {
                 }
             #endif
 
-            ToolbarItem {
-                PhotosPicker(selection: $photosPickerItem, matching: .images) {
-                    Label("Add From Photos", systemImage: "photo.badge.plus")
-                }
-            }
-            ToolbarItem {
-                Button("Add From Files", systemImage: "folder") {
-                    uploadFromFiles.toggle()
-                }
-            }
+            photoUploadToolbar
 
             #if RED_WINDOW
                 if #available(macOS 16, iOS 19, *) {
                     ToolbarSpacer(.fixed)
                 }
             #endif
 
+            ToolbarItem {
+                Menu("Pin Dimension", systemImage: "globe") {
+                    #if os(iOS)
+                        Label("Pin Dimension", systemImage: "globe")
+                            .foregroundStyle(.secondary)
+                    #endif
+                    WorldCodedDimensionPicker(selection: $pin.dimension)
+                }
+            }
+
             ToolbarItem {
                 Menu("Pin Color", systemImage: "paintpalette") {
                     #if os(iOS)
@@ -194,6 +195,21 @@ struct RedWindowPinDetailView: View {
         }
     }
 
+    private var photoUploadToolbar: some ToolbarContent {
+        Group {
+            ToolbarItem {
+                PhotosPicker(selection: $photosPickerItem, matching: .images) {
+                    Label("Add From Photos", systemImage: "photo.badge.plus")
+                }
+            }
+            ToolbarItem {
+                Button("Add From Files", systemImage: "folder") {
+                    uploadFromFiles.toggle()
+                }
+            }
+        }
+    }
+
     private func loadPickerSelection(_ item: PhotosPickerItem) async {
         do {
             if let data = try await item.loadTransferable(type: Data.self) {
diff --git a/MCMaps/Red Window/Views/Library/RedWindowLibraryGridCell.swift b/MCMaps/Red Window/Views/Library/RedWindowLibraryGridCell.swift
@@ -57,6 +57,9 @@ struct RedWindowLibraryGridCell: View {
             Text("(\(pin.position.accessibilityReadout))")
                 .font(.subheadline)
                 .foregroundStyle(.secondary)
+            Text(pin.dimension.rawValue.localizedCapitalized)
+                .font(.subheadline)
+                .foregroundStyle(.tertiary)
         }
         .animation(.default, value: horizontalSizeClass)
     }
diff --git a/MCMaps/Red Window/Views/Library/RedWindowPinLibraryListView.swift b/MCMaps/Red Window/Views/Library/RedWindowPinLibraryListView.swift
@@ -42,6 +42,8 @@ struct RedWindowPinLibraryListView: View {
                         if horizontalSizeClass == .compact {
                             Text(val.content.position.accessibilityReadout)
                                 .foregroundStyle(.secondary)
+                            Text(val.content.dimension.rawValue.localizedCapitalized)
+                                .foregroundStyle(.tertiary)
                         }
                     }
                 } icon: {
@@ -51,6 +53,7 @@ struct RedWindowPinLibraryListView: View {
                 }
             }
             TableColumn("Location", value: \.content.position.accessibilityReadout)
+            TableColumn("Dimension", value: \.content.dimension.rawValue.localizedCapitalized)
             TableColumn("Tags") { val in
                 Group {
                     if let tags = val.content.tags, !tags.isEmpty {
diff --git a/MCMaps/Resources/Localizable.xcstrings b/MCMaps/Resources/Localizable.xcstrings
@@ -306,17 +306,15 @@
     "Location" : {
 
     },
-    "Location in Nether" : {
-
-    },
-    "Location in Nether: %@" : {
-
-    },
-    "Location in Overworld" : {
-
-    },
-    "Location in Overworld: %@" : {
-
+    "Location in %@: %@" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Location in %1$@: %2$@"
+          }
+        }
+      }
     },
     "Locations You've Visited" : {
 
@@ -407,6 +405,9 @@
     },
     "Pin Color" : {
 
+    },
+    "Pin Dimension" : {
+
     },
     "Pin Here..." : {
 
diff --git a/MCMaps/Shared/Extensions/MinecraftWorldDimension+Pin.swift b/MCMaps/Shared/Extensions/MinecraftWorldDimension+Pin.swift
@@ -0,0 +1,22 @@
+//
+//  MinecraftWorldDimension+Pin.swift
+//  MCMaps
+//
+//  Created by Marquis Kurt on 13-08-2025.
+//
+
+import CubiomesKit
+import MCMap
+
+extension MinecraftWorld.Dimension {
+    init(fromPinDimension pinDimension: CartographyMapPin.Dimension) {
+        switch pinDimension {
+        case .overworld:
+            self = .overworld
+        case .nether:
+            self = .nether
+        case .end:
+            self = .end
+        }
+    }
+}
diff --git a/MCMaps/Shared/Views/Forms/PinCreatorForm.swift b/MCMaps/Shared/Views/Forms/PinCreatorForm.swift
@@ -26,6 +26,7 @@ struct PinCreatorForm: View {
     @State private var name: String = "Pin"
     @State private var color: CartographyMapPin.Color = .blue
     @State private var updatedLocation = CGPoint.zero
+    @State private var dimension: CartographyMapPin.Dimension = .overworld
 
     @State private var locationX = 0.0
     @State private var locationY = 0.0
@@ -62,6 +63,7 @@ struct PinCreatorForm: View {
                     TextField("Z Coordinate", value: $locationY, format: .number)
                     #endif
                 }
+                WorldCodedDimensionPicker(selection: $dimension)
             } header: {
                 Text("World Location")
             }
@@ -100,7 +102,14 @@ struct PinCreatorForm: View {
             ToolbarItem(placement: .confirmationAction) {
                 Button("Create", systemImage: "checkmark") {
                     dismiss()
-                    completion(CartographyMapPin(named: name, at: updatedLocation, color: color))
+                    completion(
+                        CartographyMapPin(
+                            named: name,
+                            at: updatedLocation,
+                            dimension: dimension,
+                            color: color
+                        )
+                    )
                 }
             }
             #if os(macOS)
diff --git a/MCMaps/Shared/Views/ManagedAnnotatedMap.swift b/MCMaps/Shared/Views/ManagedAnnotatedMap.swift
@@ -74,6 +74,9 @@ struct ManagedAnnotatedMap<MapContent: View>: View {
         var usedIDs = Set<String>()
 
         for pin in file.pins {
+            let dim = MinecraftWorld.Dimension(fromPinDimension: pin.dimension)
+            if dim != dimension { continue }
+
             let marker = Marker(
                 location: pin.position,
                 title: pin.name,
diff --git a/MCMaps/Shared/Views/PinCoordinateStack.swift b/MCMaps/Shared/Views/PinCoordinateStack.swift
@@ -0,0 +1,72 @@
+//
+//  PinCoordinateStack.swift
+//  MCMaps
+//
+//  Created by Marquis Kurt on 13-08-2025.
+//
+
+import MCMap
+import SwiftUI
+
+struct PinCoordinateStack: View {
+    var pin: CartographyMapPin
+
+    var body: some View {
+        ViewThatFits {
+            HStack { labels }
+            VStack(alignment: .leading) {
+                labels
+            }
+        }
+        .fontDesign(.monospaced)
+    }
+
+    private var labels: some View {
+        Group {
+            Label("(\(pin.position.accessibilityReadout))", semanticIcon: symbol(for: pin.dimension))
+                .help(
+                    "Location in \(pin.dimension.rawValue.localizedCapitalized): \(pin.position.accessibilityReadout)"
+                )
+                .accessibilityLabel("Location in " + pin.dimension.rawValue.localizedCapitalized)
+                .accessibilityValue(pin.position.accessibilityReadout)
+            Label("(\(pairing.accessibilityReadout))", semanticIcon: symbol(for: pairedDimension))
+                .help(
+                    "Location in \(pairedDimension.rawValue.localizedCapitalized): \(pairing.accessibilityReadout)"
+                )
+                .accessibilityLabel("Location in " + pairedDimension.rawValue.localizedCapitalized)
+                .accessibilityValue(pairing.accessibilityReadout)
+        }
+    }
+
+    func symbol(for dimension: CartographyMapPin.Dimension) -> SemanticIcon {
+        return switch dimension {
+        case .overworld: .overworld
+        case .nether: .nether
+        case .end: .end
+        }
+    }
+
+    var pairing: CGPoint {
+        var paired = pin.position
+        switch pin.dimension {
+        case .overworld:
+            paired = CGPoint(x: paired.x / 8, y: paired.y / 8)
+        case .nether:
+            paired = CGPoint(x: paired.x * 8, y: paired.y * 8)
+        case .end:
+            break
+        }
+        return paired
+    }
+
+    var pairedDimension: CartographyMapPin.Dimension {
+        switch pin.dimension {
+        case .overworld:
+            return .nether
+        case .nether:
+            return .overworld
+        case .end:
+            return .end
+        }
+    }
+}
diff --git a/MCMaps/Shared/Views/WorldDimensionPickerView.swift b/MCMaps/Shared/Views/WorldDimensionPickerView.swift
@@ -6,6 +6,7 @@
 //
 
 import CubiomesKit
+import MCMap
 import SwiftUI
 
 /// A picker view used to select a Minecraft world dimension.
@@ -27,3 +28,23 @@ struct WorldDimensionPickerView: View {
         }
     }
 }
+
+/// A picker view used to select a Minecraft world dimension in relation to a pin's location.
+///
+/// The picker exposes a SwiftUI `Picker` type, so any additional picker modifiers will apply. On macOS, this is
+/// displayed as an inline menu.
+struct WorldCodedDimensionPicker: View {
+    /// The selection representing the world dimension.
+    @Binding var selection: CartographyMapPin.Dimension
+
+    var body: some View {
+        Picker("Dimension", selection: $selection) {
+            Label("Overworld", semanticIcon: .overworld)
+                .tag(CartographyMapPin.Dimension.overworld)
+            Label("Nether", semanticIcon: .nether)
+                .tag(CartographyMapPin.Dimension.nether)
+            Label("End", semanticIcon: .end)
+                .tag(CartographyMapPin.Dimension.end)
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,9 @@ struct RedWindowPinHeader: RedWindowDetailCell {`
`89`	`89`	`.foregroundStyle(.primary)`
`90`	`90`	`.font(.largeTitle)`
`91`	`91`	`.bold()`
`92`		`- Text("(\(Int(pin.position.x)), \(Int(pin.position.y)))")`
	`92`	`+ PinCoordinateStack(pin: pin)`
`93`	`93`	`.font(.headline)`
`94`	`94`	`.foregroundStyle(.secondary)`
`95`		`- .fontDesign(.monospaced)`
`96`	`95`	`}`
`97`	`96`	`Spacer()`
`98`	`97`	`}`
`@@ -111,7 +110,7 @@ struct RedWindowPinHeader: RedWindowDetailCell {`
`111`	`110`	`Rectangle()`
`112`	`111`	`.fill(`
`113`	`112`	`Color(pin.color?.swiftUIColor ?? .accent)`
`114`		`- .opacity(0.85)`
	`113`	`+ .opacity(0.75)`
`115`	`114`	`.gradient`
`116`	`115`	`)`
`117`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@ struct RedWindowLibraryGridCell: View {`
`57`	`57`	`Text("(\(pin.position.accessibilityReadout))")`
`58`	`58`	`.font(.subheadline)`
`59`	`59`	`.foregroundStyle(.secondary)`
	`60`	`+ Text(pin.dimension.rawValue.localizedCapitalized)`
	`61`	`+ .font(.subheadline)`
	`62`	`+ .foregroundStyle(.tertiary)`
`60`	`63`	`}`
`61`	`64`	`.animation(.default, value: horizontalSizeClass)`
`62`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ struct RedWindowPinLibraryListView: View {`
`42`	`42`	`if horizontalSizeClass == .compact {`
`43`	`43`	`Text(val.content.position.accessibilityReadout)`
`44`	`44`	`.foregroundStyle(.secondary)`
	`45`	`+ Text(val.content.dimension.rawValue.localizedCapitalized)`
	`46`	`+ .foregroundStyle(.tertiary)`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`	`} icon: {`
`@@ -51,6 +53,7 @@ struct RedWindowPinLibraryListView: View {`
`51`	`53`	`}`
`52`	`54`	`}`
`53`	`55`	`TableColumn("Location", value: \.content.position.accessibilityReadout)`
	`56`	`+ TableColumn("Dimension", value: \.content.dimension.rawValue.localizedCapitalized)`
`54`	`57`	`TableColumn("Tags") { val in`
`55`	`58`	`Group {`
`56`	`59`	`if let tags = val.content.tags, !tags.isEmpty {`