Migrate to CartographyMapPin

The future of the format will store pins in a separate location instead
of as part of the manifest. This mega-commit updates the app to point to
both the new type and location, respectively.

Incidentally, this fixes #45 because the pin route under Red Window now
has a stable identity that doesn't get edited magically.

Author: alicerunsonfedora

Alidade.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -36,7 +36,7 @@ class CartographyPinViewModel {
     /// The pin that will be edited through this view model.
     ///
     /// Changes to this property will automatically propagate to the file.
-    var pin: Binding<MCMapManifestPin>
+    var pin: Binding<CartographyMapPin>
 
     /// A binding to the pin's about description.
     ///
@@ -81,35 +81,31 @@ class CartographyPinViewModel {
         self.file = file
         self.index = index
         self.pin = Binding {
-            return file.wrappedValue.manifest.pins[index]
+            return file.wrappedValue.pins[index]
         } set: { newPin in
-            file.wrappedValue.manifest.pins[index] = newPin
+            file.wrappedValue.pins[index] = newPin
         }
 
-        self.pinAboutDescription = Binding {
-            return file.wrappedValue.manifest.pins[index].aboutDescription ?? ""
-        } set: { newValue in
-            file.wrappedValue.manifest.pins[index].aboutDescription = newValue
-        }
+        self.pinAboutDescription = file.pins[index].description
 
         self.pinTags = Binding {
             guard file.wrappedValue.supportedFeatures.contains(.pinTagging) else {
                 return []
             }
-            return file.wrappedValue.manifest.pins[index].tags ?? []
+            return file.wrappedValue.pins[index].tags ?? []
         } set: { newValue in
             guard file.wrappedValue.supportedFeatures.contains(.pinTagging) else {
                 return
             }
-            file.wrappedValue.manifest.pins[index].tags = newValue
+            file.wrappedValue.pins[index].tags = newValue
         }
     }
 
     /// Retrieves data blobs for the images associated with this pin.
     ///
     /// Images consist of player-uploaded screenshots that can be displayed alongside pins.
     func images() -> [Data] {
-        let pin = file.wrappedValue.manifest.pins[index]
+        let pin = file.wrappedValue.pins[index]
         guard let images = pin.images else { return [] }
         return images.compactMap { name in
             file.wrappedValue.images[name]
@@ -126,10 +122,10 @@ class CartographyPinViewModel {
     func uploadImage(_ data: Data, completion: (() -> Void)? = nil) {
         let imageName = UUID().uuidString + ".heic"
         file.wrappedValue.images[imageName] = data
-        if file.wrappedValue.manifest.pins[index].images == nil {
-            file.wrappedValue.manifest.pins[index].images = [imageName]
+        if file.wrappedValue.pins[index].images == nil {
+            file.wrappedValue.pins[index].images = [imageName]
         } else {
-            file.wrappedValue.manifest.pins[index].images?.append(imageName)
+            file.wrappedValue.pins[index].images?.insert(imageName)
         }
         completion?()
     }

MCMaps/Legacy/View Models/CartographyPinViewModel.swift

@@ -18,7 +18,7 @@ enum CartographyRoute: Equatable, Hashable, Identifiable {
     var id: UUID { UUID() }
 
     /// A player-pinned location at a specified index in the file.
-    case pin(Int, pin: MCMapManifestPin)
+    case pin(Int, pin: CartographyMapPin)
 
     /// A location the player has visited before.
     case recent(CGPoint)

MCMaps/Legacy/View Models/CartographyRoute.swift

@@ -87,7 +87,7 @@ struct CartographyOrnamentMap: View {
                         centerCoordinate: $centerCoordinate,
                         dimension: viewModel.worldDimension
                     ) {
-                        file.manifest.pins.map { pin in
+                        file.pins.map { pin in
                             Marker(
                                 location: pin.position,
                                 title: pin.name,

MCMaps/Legacy/Views/CartographyOrnamentMap.swift

@@ -58,7 +58,7 @@ struct LegacyContentView: View {
                 case .createPin(let cgPoint):
                     NavigationStack {
                         PinCreatorForm(location: cgPoint) { pin in
-                            file.manifest.pins.append(pin)
+                            file.pins.append(pin)
                         }
                         .formStyle(.grouped)
                     }

MCMaps/Legacy/Views/LegacyContentView.swift

@@ -38,7 +38,7 @@ struct CartographyMapSplitView: View {
                     switch viewModel.currentRoute {
                     case let .pin(index, _):
                         Group {
-                            if (file.manifest.pins.indices).contains(index) {
+                            if (file.pins.indices).contains(index) {
                                 CartographyMapPinDetailView(
                                     viewModel: CartographyPinViewModel(
                                         file: $file, index: index))

MCMaps/Legacy/Views/Navigation/CartographyMapSplitView.swift

@@ -18,20 +18,26 @@ import SwiftUI
 /// back-propagate the color value to the pin.
 struct CartographyMapPinColorPicker: View {
     /// The color the picker will select.
-    @Binding var color: MCMapManifestPin.Color?
+    @Binding var color: CartographyMapPin.Color?
     @State private var swiftUIColor = Color.blue
 
     var availableColors: [Color] {
-        MCMapManifestPin.Color.allCases.map(\.swiftUIColor)
+        CartographyMapPin.Color.allCases.map(\.swiftUIColor)
     }
 
     var body: some View {
         FiniteColorPicker("", selection: $swiftUIColor, in: availableColors)
             .onChange(of: swiftUIColor) { _, newValue in
-                for suiColor in MCMapManifest.Pin.Color.allCases where suiColor.swiftUIColor == newValue {
+                for suiColor in CartographyMapPin.Color.allCases where suiColor.swiftUIColor == newValue {
                     color = suiColor
                     return
                 }
             }
     }
 }
+
+extension CartographyMapPin.Color: @retroactive CaseIterable {
+    public static var allCases: [CartographyMapPin.Color] {
+        [.red, .orange, .yellow, .green, .blue, .indigo, .gray, .pink, .brown]
+    }
+}

MCMaps/Legacy/Views/Pins/CartographyMapPinColorPicker.swift

@@ -12,14 +12,23 @@ import SwiftUI
 extension NamedLocationView {
     /// Create a named location view using a player-created pin.
     /// - Parameter pin: The pin to create a named location view from.
-    init(pin: MCMapManifestPin) {
+    init(pin: CartographyMapPin) {
+        let systemImage =
+            switch pin.icon {
+            case .default, nil, .emoji:
+                "mappin"
+            default:
+                pin.icon?.rawValue
+            }
+
         self.init(
             name: pin.name,
             location: pin.position,
-            systemImage: "mappin",
+            systemImage: systemImage ?? "mappin",
             color: pin.color?.swiftUIColor ?? .accent
         )
     }
+
 }
 
 /// A view that displays a location with a specified name.

MCMaps/Legacy/Views/Pins/CartographyNamedLocationView.swift

@@ -65,7 +65,7 @@ struct CartographyMapSidebar: View {
         }
         .frame(minWidth: 175, idealWidth: 200)
         .onAppear {
-            if file.manifest.pins.isEmpty {
+            if file.pins.isEmpty {
                 Task {
                     await PinActionOnboardingTip.libraryEmpty.donate()
                 }
@@ -82,7 +82,7 @@ struct CartographyMapSidebar: View {
             }
         }
 
-        .onChange(of: file.manifest.pins) { _, newValue in
+        .onChange(of: file.pins) { _, newValue in
             if !newValue.isEmpty {
                 LocalTips.emptyLibrary.invalidate(reason: .actionPerformed)
             }
@@ -148,8 +148,8 @@ struct CartographyMapSidebar: View {
                     viewModel.go(to: position, relativeTo: file)
                 }
             }
-            if !file.manifest.pins.isEmpty {
-                PinnedLibrarySection(pins: file.manifest.pins, viewModel: $viewModel, file: $file)
+            if !file.pins.isEmpty {
+                PinnedLibrarySection(pins: file.pins, viewModel: $viewModel, file: $file)
             }
         }
     }

MCMaps/Legacy/Views/Sidebar/CartographyMapSidebar.swift

@@ -74,7 +74,7 @@ struct CartographyMapSidebarSheet<T: ToolbarContent>: View {
                     }
             case let .createPin(location):
                 PinCreatorForm(location: location) { newPin in
-                    file.manifest.pins.append(newPin)
+                    file.pins.append(newPin)
                 }
             case .editWorld:
                 MapCreatorForm(