Upgrade to Swift 6

1 files changed, 69 insertions, 319 deletions

diff --git a/Map.xcodeproj/project.pbxproj b/Map.xcodeproj/project.pbxproj
index fc3a574..aaa6948 100644
--- a/Map.xcodeproj/project.pbxproj
+++ b/Map.xcodeproj/project.pbxproj
@@ -3,53 +3,13 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 60;
+	objectVersion = 70;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		B5012E3F2C96232A00AC4D68 /* EvolutionPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E3E2C96232300AC4D68 /* EvolutionPicker.swift */; };
-		B5012E422C96235E00AC4D68 /* Stage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E412C96235B00AC4D68 /* Stage.swift */; };
-		B5012E452C9623C700AC4D68 /* Font+theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E442C9623C500AC4D68 /* Font+theme.swift */; };
-		B5012E472C96243C00AC4D68 /* MapTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E462C96243500AC4D68 /* MapTextEditor.swift */; };
-		B5012E492C96245B00AC4D68 /* Color+theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E482C96245800AC4D68 /* Color+theme.swift */; };
-		B5012E4B2C96246F00AC4D68 /* NSColor+theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E4A2C96246D00AC4D68 /* NSColor+theme.swift */; };
-		B5012E572C96249400AC4D68 /* NoteParserStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E4D2C96249400AC4D68 /* NoteParserStrategy.swift */; };
-		B5012E582C96249400AC4D68 /* BlockerParserStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E4F2C96249400AC4D68 /* BlockerParserStrategy.swift */; };
-		B5012E592C96249400AC4D68 /* VertexParserStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E4C2C96249400AC4D68 /* VertexParserStrategy.swift */; };
-		B5012E5A2C96249400AC4D68 /* MapParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E532C96249400AC4D68 /* MapParser.swift */; };
-		B5012E5B2C96249400AC4D68 /* OpportunityParserStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E502C96249400AC4D68 /* OpportunityParserStrategy.swift */; };
-		B5012E5C2C96249400AC4D68 /* EdgeParserStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E4E2C96249400AC4D68 /* EdgeParserStrategy.swift */; };
-		B5012E5D2C96249400AC4D68 /* StageParserStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E512C96249400AC4D68 /* StageParserStrategy.swift */; };
-		B5012E5E2C96249400AC4D68 /* Debouncer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E552C96249400AC4D68 /* Debouncer.swift */; };
-		B5012E622C96254700AC4D68 /* MapRenderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E5F2C96254700AC4D68 /* MapRenderView.swift */; };
-		B5012E6B2C96255A00AC4D68 /* MapAxes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E632C96255A00AC4D68 /* MapAxes.swift */; };
-		B5012E6C2C96255A00AC4D68 /* MapVertices.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E652C96255A00AC4D68 /* MapVertices.swift */; };
-		B5012E6D2C96255A00AC4D68 /* MapStages.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E642C96255A00AC4D68 /* MapStages.swift */; };
-		B5012E6E2C96255A00AC4D68 /* MapNotes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E662C96255A00AC4D68 /* MapNotes.swift */; };
-		B5012E6F2C96255A00AC4D68 /* MapEdges.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E672C96255A00AC4D68 /* MapEdges.swift */; };
-		B5012E702C96255A00AC4D68 /* MapOpportunities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E692C96255A00AC4D68 /* MapOpportunities.swift */; };
-		B5012E712C96255A00AC4D68 /* MapBlockers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E682C96255A00AC4D68 /* MapBlockers.swift */; };
 		B5012E742C9625E200AC4D68 /* Patterns in Frameworks */ = {isa = PBXBuildFile; productRef = B5012E732C9625E200AC4D68 /* Patterns */; };
-		B5012E7A2C96F02F00AC4D68 /* Dimensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E792C96F02E00AC4D68 /* Dimensions.swift */; };
-		B5012E7C2C972B6C00AC4D68 /* GroupParserStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E7B2C972B6600AC4D68 /* GroupParserStrategy.swift */; };
 		B5012E7F2C97315800AC4D68 /* ConcaveHull in Frameworks */ = {isa = PBXBuildFile; productRef = B5012E7E2C97315800AC4D68 /* ConcaveHull */; };
-		B5012E812C97318600AC4D68 /* MapGroups.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E802C97318300AC4D68 /* MapGroups.swift */; };
-		B5012E872C97874600AC4D68 /* MapGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E862C97874400AC4D68 /* MapGroup.swift */; };
-		B5012E8A2C98235500AC4D68 /* MapCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E892C98235300AC4D68 /* MapCommands.swift */; };
-		B5012E8C2C98244000AC4D68 /* ViewStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E8B2C98243E00AC4D68 /* ViewStyle.swift */; };
-		B5012E8E2C9828D000AC4D68 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5012E8D2C9828CE00AC4D68 /* Constants.swift */; };
 		B51A45F52C982FAE00870ED5 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = B51A45F42C982FAE00870ED5 /* Sparkle */; };
-		B51A45F72C982FEA00870ED5 /* UpdateCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51A45F62C982FE700870ED5 /* UpdateCommands.swift */; };
-		B54587102C961E9C0067B788 /* MapApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B545870F2C961E9C0067B788 /* MapApp.swift */; };
-		B54587122C961E9C0067B788 /* MapDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54587112C961E9C0067B788 /* MapDocument.swift */; };
-		B54587142C961E9C0067B788 /* MapEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54587132C961E9C0067B788 /* MapEditor.swift */; };
-		B54587162C961E9E0067B788 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B54587152C961E9E0067B788 /* Assets.xcassets */; };
-		B54587192C961E9E0067B788 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B54587182C961E9E0067B788 /* Preview Assets.xcassets */; };
-		B54587252C961E9E0067B788 /* MapTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54587242C961E9E0067B788 /* MapTests.swift */; };
-		B545872F2C961E9E0067B788 /* MapUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B545872E2C961E9E0067B788 /* MapUITests.swift */; };
-		B54587312C961E9E0067B788 /* MapUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54587302C961E9E0067B788 /* MapUITestsLaunchTests.swift */; };
-		B5D42DC22C984E870075473D /* FocusedValues+document.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D42DC12C984E7F0075473D /* FocusedValues+document.swift */; };
-		B5D42DC42C9851ED0075473D /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D42DC32C9851ED0075473D /* SearchBar.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -58,65 +18,39 @@
 			containerPortal = B54587042C961E9C0067B788 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = B545870B2C961E9C0067B788;
-			remoteInfo = Map2;
+			remoteInfo = Map;
 		};
 		B545872B2C961E9E0067B788 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B54587042C961E9C0067B788 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = B545870B2C961E9C0067B788;
-			remoteInfo = Map2;
+			remoteInfo = Map;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		B5012E3E2C96232300AC4D68 /* EvolutionPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvolutionPicker.swift; sourceTree = "<group>"; };
-		B5012E412C96235B00AC4D68 /* Stage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stage.swift; sourceTree = "<group>"; };
-		B5012E442C9623C500AC4D68 /* Font+theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font+theme.swift"; sourceTree = "<group>"; };
-		B5012E462C96243500AC4D68 /* MapTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTextEditor.swift; sourceTree = "<group>"; };
-		B5012E482C96245800AC4D68 /* Color+theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+theme.swift"; sourceTree = "<group>"; };
-		B5012E4A2C96246D00AC4D68 /* NSColor+theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSColor+theme.swift"; sourceTree = "<group>"; };
-		B5012E4C2C96249400AC4D68 /* VertexParserStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VertexParserStrategy.swift; sourceTree = "<group>"; };
-		B5012E4D2C96249400AC4D68 /* NoteParserStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteParserStrategy.swift; sourceTree = "<group>"; };
-		B5012E4E2C96249400AC4D68 /* EdgeParserStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgeParserStrategy.swift; sourceTree = "<group>"; };
-		B5012E4F2C96249400AC4D68 /* BlockerParserStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockerParserStrategy.swift; sourceTree = "<group>"; };
-		B5012E502C96249400AC4D68 /* OpportunityParserStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpportunityParserStrategy.swift; sourceTree = "<group>"; };
-		B5012E512C96249400AC4D68 /* StageParserStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StageParserStrategy.swift; sourceTree = "<group>"; };
-		B5012E532C96249400AC4D68 /* MapParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapParser.swift; sourceTree = "<group>"; };
-		B5012E552C96249400AC4D68 /* Debouncer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Debouncer.swift; sourceTree = "<group>"; };
-		B5012E5F2C96254700AC4D68 /* MapRenderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapRenderView.swift; sourceTree = "<group>"; };
-		B5012E632C96255A00AC4D68 /* MapAxes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapAxes.swift; sourceTree = "<group>"; };
-		B5012E642C96255A00AC4D68 /* MapStages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapStages.swift; sourceTree = "<group>"; };
-		B5012E652C96255A00AC4D68 /* MapVertices.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapVertices.swift; sourceTree = "<group>"; };
-		B5012E662C96255A00AC4D68 /* MapNotes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapNotes.swift; sourceTree = "<group>"; };
-		B5012E672C96255A00AC4D68 /* MapEdges.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapEdges.swift; sourceTree = "<group>"; };
-		B5012E682C96255A00AC4D68 /* MapBlockers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapBlockers.swift; sourceTree = "<group>"; };
-		B5012E692C96255A00AC4D68 /* MapOpportunities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapOpportunities.swift; sourceTree = "<group>"; };
-		B5012E792C96F02E00AC4D68 /* Dimensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dimensions.swift; sourceTree = "<group>"; };
-		B5012E7B2C972B6600AC4D68 /* GroupParserStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupParserStrategy.swift; sourceTree = "<group>"; };
-		B5012E802C97318300AC4D68 /* MapGroups.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapGroups.swift; sourceTree = "<group>"; };
-		B5012E862C97874400AC4D68 /* MapGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapGroup.swift; sourceTree = "<group>"; };
-		B5012E892C98235300AC4D68 /* MapCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapCommands.swift; sourceTree = "<group>"; };
-		B5012E8B2C98243E00AC4D68 /* ViewStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewStyle.swift; sourceTree = "<group>"; };
-		B5012E8D2C9828CE00AC4D68 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
-		B51A45F62C982FE700870ED5 /* UpdateCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateCommands.swift; sourceTree = "<group>"; };
 		B545870C2C961E9C0067B788 /* Map.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Map.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		B545870F2C961E9C0067B788 /* MapApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapApp.swift; sourceTree = "<group>"; };
-		B54587112C961E9C0067B788 /* MapDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapDocument.swift; sourceTree = "<group>"; };
-		B54587132C961E9C0067B788 /* MapEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapEditor.swift; sourceTree = "<group>"; };
-		B54587152C961E9E0067B788 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		B54587182C961E9E0067B788 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
-		B545871A2C961E9E0067B788 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		B545871B2C961E9E0067B788 /* Map.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Map.entitlements; sourceTree = "<group>"; };
 		B54587202C961E9E0067B788 /* MapTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MapTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		B54587242C961E9E0067B788 /* MapTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTests.swift; sourceTree = "<group>"; };
-		B545872A2C961E9E0067B788 /* Map2UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Map2UITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		B545872E2C961E9E0067B788 /* MapUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapUITests.swift; sourceTree = "<group>"; };
-		B54587302C961E9E0067B788 /* MapUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapUITestsLaunchTests.swift; sourceTree = "<group>"; };
-		B5D42DC12C984E7F0075473D /* FocusedValues+document.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FocusedValues+document.swift"; sourceTree = "<group>"; };
-		B5D42DC32C9851ED0075473D /* SearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBar.swift; sourceTree = "<group>"; };
+		B545872A2C961E9E0067B788 /* MapUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MapUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
+/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
+		B59830752E17E7C700F5FBF6 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+			membershipExceptions = (
+				Info.plist,
+			);
+			target = B545870B2C961E9C0067B788 /* Map */;
+		};
+/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
+
+/* Begin PBXFileSystemSynchronizedRootGroup section */
+		B598304E2E17E7C700F5FBF6 /* Map */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (B59830752E17E7C700F5FBF6 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Map; sourceTree = "<group>"; };
+		B59830772E17E7CC00F5FBF6 /* MapTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = MapTests; sourceTree = "<group>"; };
+		B598307C2E17E7D600F5FBF6 /* MapUITests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = MapUITests; sourceTree = "<group>"; };
+/* End PBXFileSystemSynchronizedRootGroup section */
+
 /* Begin PBXFrameworksBuildPhase section */
 		B54587092C961E9C0067B788 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
@@ -145,131 +79,12 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		B5012E3C2C96222E00AC4D68 /* Data */ = {
-			isa = PBXGroup;
-			children = (
-				B5D42DC12C984E7F0075473D /* FocusedValues+document.swift */,
-				B5012E412C96235B00AC4D68 /* Stage.swift */,
-				B54587112C961E9C0067B788 /* MapDocument.swift */,
-			);
-			path = Data;
-			sourceTree = "<group>";
-		};
-		B5012E3D2C96223800AC4D68 /* Presentation */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E8B2C98243E00AC4D68 /* ViewStyle.swift */,
-				B5012E882C98234F00AC4D68 /* Commands */,
-				B5012E612C96254700AC4D68 /* Complex Components */,
-				B5012E432C9623BC00AC4D68 /* Theme */,
-				B5012E402C96232E00AC4D68 /* Base Components */,
-				B54587132C961E9C0067B788 /* MapEditor.swift */,
-			);
-			path = Presentation;
-			sourceTree = "<group>";
-		};
-		B5012E402C96232E00AC4D68 /* Base Components */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E6A2C96255A00AC4D68 /* MapRender */,
-				B5012E462C96243500AC4D68 /* MapTextEditor.swift */,
-				B5012E3E2C96232300AC4D68 /* EvolutionPicker.swift */,
-				B5D42DC32C9851ED0075473D /* SearchBar.swift */,
-			);
-			path = "Base Components";
-			sourceTree = "<group>";
-		};
-		B5012E432C9623BC00AC4D68 /* Theme */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E792C96F02E00AC4D68 /* Dimensions.swift */,
-				B5012E4A2C96246D00AC4D68 /* NSColor+theme.swift */,
-				B5012E482C96245800AC4D68 /* Color+theme.swift */,
-				B5012E442C9623C500AC4D68 /* Font+theme.swift */,
-			);
-			path = Theme;
-			sourceTree = "<group>";
-		};
-		B5012E522C96249400AC4D68 /* Strategies */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E7B2C972B6600AC4D68 /* GroupParserStrategy.swift */,
-				B5012E4C2C96249400AC4D68 /* VertexParserStrategy.swift */,
-				B5012E4D2C96249400AC4D68 /* NoteParserStrategy.swift */,
-				B5012E4E2C96249400AC4D68 /* EdgeParserStrategy.swift */,
-				B5012E4F2C96249400AC4D68 /* BlockerParserStrategy.swift */,
-				B5012E502C96249400AC4D68 /* OpportunityParserStrategy.swift */,
-				B5012E512C96249400AC4D68 /* StageParserStrategy.swift */,
-			);
-			path = Strategies;
-			sourceTree = "<group>";
-		};
-		B5012E542C96249400AC4D68 /* MapParser */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E522C96249400AC4D68 /* Strategies */,
-				B5012E532C96249400AC4D68 /* MapParser.swift */,
-			);
-			path = MapParser;
-			sourceTree = "<group>";
-		};
-		B5012E562C96249400AC4D68 /* Logic */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E8D2C9828CE00AC4D68 /* Constants.swift */,
-				B5012E542C96249400AC4D68 /* MapParser */,
-				B5012E552C96249400AC4D68 /* Debouncer.swift */,
-			);
-			path = Logic;
-			sourceTree = "<group>";
-		};
-		B5012E602C96254700AC4D68 /* MapRender */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E5F2C96254700AC4D68 /* MapRenderView.swift */,
-			);
-			path = MapRender;
-			sourceTree = "<group>";
-		};
-		B5012E612C96254700AC4D68 /* Complex Components */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E602C96254700AC4D68 /* MapRender */,
-			);
-			path = "Complex Components";
-			sourceTree = "<group>";
-		};
-		B5012E6A2C96255A00AC4D68 /* MapRender */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E802C97318300AC4D68 /* MapGroups.swift */,
-				B5012E862C97874400AC4D68 /* MapGroup.swift */,
-				B5012E632C96255A00AC4D68 /* MapAxes.swift */,
-				B5012E642C96255A00AC4D68 /* MapStages.swift */,
-				B5012E652C96255A00AC4D68 /* MapVertices.swift */,
-				B5012E662C96255A00AC4D68 /* MapNotes.swift */,
-				B5012E672C96255A00AC4D68 /* MapEdges.swift */,
-				B5012E682C96255A00AC4D68 /* MapBlockers.swift */,
-				B5012E692C96255A00AC4D68 /* MapOpportunities.swift */,
-			);
-			path = MapRender;
-			sourceTree = "<group>";
-		};
-		B5012E882C98234F00AC4D68 /* Commands */ = {
-			isa = PBXGroup;
-			children = (
-				B51A45F62C982FE700870ED5 /* UpdateCommands.swift */,
-				B5012E892C98235300AC4D68 /* MapCommands.swift */,
-			);
-			path = Commands;
-			sourceTree = "<group>";
-		};
 		B54587032C961E9C0067B788 = {
 			isa = PBXGroup;
 			children = (
-				B545870E2C961E9C0067B788 /* Map */,
-				B54587232C961E9E0067B788 /* MapTests */,
-				B545872D2C961E9E0067B788 /* MapUITests */,
+				B598304E2E17E7C700F5FBF6 /* Map */,
+				B59830772E17E7CC00F5FBF6 /* MapTests */,
+				B598307C2E17E7D600F5FBF6 /* MapUITests */,
 				B545870D2C961E9C0067B788 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -279,51 +94,11 @@
 			children = (
 				B545870C2C961E9C0067B788 /* Map.app */,
 				B54587202C961E9E0067B788 /* MapTests.xctest */,
-				B545872A2C961E9E0067B788 /* Map2UITests.xctest */,
+				B545872A2C961E9E0067B788 /* MapUITests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		B545870E2C961E9C0067B788 /* Map */ = {
-			isa = PBXGroup;
-			children = (
-				B5012E562C96249400AC4D68 /* Logic */,
-				B5012E3C2C96222E00AC4D68 /* Data */,
-				B5012E3D2C96223800AC4D68 /* Presentation */,
-				B545870F2C961E9C0067B788 /* MapApp.swift */,
-				B54587152C961E9E0067B788 /* Assets.xcassets */,
-				B545871A2C961E9E0067B788 /* Info.plist */,
-				B545871B2C961E9E0067B788 /* Map.entitlements */,
-				B54587172C961E9E0067B788 /* Preview Content */,
-			);
-			path = Map;
-			sourceTree = "<group>";
-		};
-		B54587172C961E9E0067B788 /* Preview Content */ = {
-			isa = PBXGroup;
-			children = (
-				B54587182C961E9E0067B788 /* Preview Assets.xcassets */,
-			);
-			path = "Preview Content";
-			sourceTree = "<group>";
-		};
-		B54587232C961E9E0067B788 /* MapTests */ = {
-			isa = PBXGroup;
-			children = (
-				B54587242C961E9E0067B788 /* MapTests.swift */,
-			);
-			path = MapTests;
-			sourceTree = "<group>";
-		};
-		B545872D2C961E9E0067B788 /* MapUITests */ = {
-			isa = PBXGroup;
-			children = (
-				B545872E2C961E9E0067B788 /* MapUITests.swift */,
-				B54587302C961E9E0067B788 /* MapUITestsLaunchTests.swift */,
-			);
-			path = MapUITests;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -339,13 +114,16 @@
 			);
 			dependencies = (
 			);
+			fileSystemSynchronizedGroups = (
+				B598304E2E17E7C700F5FBF6 /* Map */,
+			);
 			name = Map;
 			packageProductDependencies = (
 				B5012E732C9625E200AC4D68 /* Patterns */,
 				B5012E7E2C97315800AC4D68 /* ConcaveHull */,
 				B51A45F42C982FAE00870ED5 /* Sparkle */,
 			);
-			productName = Map2;
+			productName = Map;
 			productReference = B545870C2C961E9C0067B788 /* Map.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -362,14 +140,17 @@
 			dependencies = (
 				B54587222C961E9E0067B788 /* PBXTargetDependency */,
 			);
+			fileSystemSynchronizedGroups = (
+				B59830772E17E7CC00F5FBF6 /* MapTests */,
+			);
 			name = MapTests;
-			productName = Map2Tests;
+			productName = MapTests;
 			productReference = B54587202C961E9E0067B788 /* MapTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		B54587292C961E9E0067B788 /* Map2UITests */ = {
+		B54587292C961E9E0067B788 /* MapUITests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = B545873A2C961E9E0067B788 /* Build configuration list for PBXNativeTarget "Map2UITests" */;
+			buildConfigurationList = B545873A2C961E9E0067B788 /* Build configuration list for PBXNativeTarget "MapUITests" */;
 			buildPhases = (
 				B54587262C961E9E0067B788 /* Sources */,
 				B54587272C961E9E0067B788 /* Frameworks */,
@@ -380,9 +161,12 @@
 			dependencies = (
 				B545872C2C961E9E0067B788 /* PBXTargetDependency */,
 			);
-			name = Map2UITests;
-			productName = Map2UITests;
-			productReference = B545872A2C961E9E0067B788 /* Map2UITests.xctest */;
+			fileSystemSynchronizedGroups = (
+				B598307C2E17E7D600F5FBF6 /* MapUITests */,
+			);
+			name = MapUITests;
+			productName = MapUITests;
+			productReference = B545872A2C961E9E0067B788 /* MapUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
 		};
 /* End PBXNativeTarget section */
@@ -393,7 +177,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1600;
-				LastUpgradeCheck = 1600;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					B545870B2C961E9C0067B788 = {
 						CreatedOnToolsVersion = 16.0;
@@ -428,7 +212,7 @@
 			targets = (
 				B545870B2C961E9C0067B788 /* Map */,
 				B545871F2C961E9E0067B788 /* MapTests */,
-				B54587292C961E9E0067B788 /* Map2UITests */,
+				B54587292C961E9E0067B788 /* MapUITests */,
 			);
 		};
 /* End PBXProject section */
@@ -438,8 +222,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B54587192C961E9E0067B788 /* Preview Assets.xcassets in Resources */,
-				B54587162C961E9E0067B788 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -464,41 +246,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5012E872C97874600AC4D68 /* MapGroup.swift in Sources */,
-				B5012E472C96243C00AC4D68 /* MapTextEditor.swift in Sources */,
-				B5012E622C96254700AC4D68 /* MapRenderView.swift in Sources */,
-				B5012E492C96245B00AC4D68 /* Color+theme.swift in Sources */,
-				B54587122C961E9C0067B788 /* MapDocument.swift in Sources */,
-				B54587102C961E9C0067B788 /* MapApp.swift in Sources */,
-				B5012E8C2C98244000AC4D68 /* ViewStyle.swift in Sources */,
-				B5D42DC42C9851ED0075473D /* SearchBar.swift in Sources */,
-				B5012E8E2C9828D000AC4D68 /* Constants.swift in Sources */,
-				B5012E7C2C972B6C00AC4D68 /* GroupParserStrategy.swift in Sources */,
-				B5012E6B2C96255A00AC4D68 /* MapAxes.swift in Sources */,
-				B5012E6C2C96255A00AC4D68 /* MapVertices.swift in Sources */,
-				B5012E6D2C96255A00AC4D68 /* MapStages.swift in Sources */,
-				B5012E7A2C96F02F00AC4D68 /* Dimensions.swift in Sources */,
-				B5012E6E2C96255A00AC4D68 /* MapNotes.swift in Sources */,
-				B5012E6F2C96255A00AC4D68 /* MapEdges.swift in Sources */,
-				B5012E702C96255A00AC4D68 /* MapOpportunities.swift in Sources */,
-				B5012E712C96255A00AC4D68 /* MapBlockers.swift in Sources */,
-				B5012E4B2C96246F00AC4D68 /* NSColor+theme.swift in Sources */,
-				B54587142C961E9C0067B788 /* MapEditor.swift in Sources */,
-				B5012E3F2C96232A00AC4D68 /* EvolutionPicker.swift in Sources */,
-				B5012E572C96249400AC4D68 /* NoteParserStrategy.swift in Sources */,
-				B51A45F72C982FEA00870ED5 /* UpdateCommands.swift in Sources */,
-				B5012E582C96249400AC4D68 /* BlockerParserStrategy.swift in Sources */,
-				B5012E592C96249400AC4D68 /* VertexParserStrategy.swift in Sources */,
-				B5012E5A2C96249400AC4D68 /* MapParser.swift in Sources */,
-				B5012E5B2C96249400AC4D68 /* OpportunityParserStrategy.swift in Sources */,
-				B5012E5C2C96249400AC4D68 /* EdgeParserStrategy.swift in Sources */,
-				B5012E5D2C96249400AC4D68 /* StageParserStrategy.swift in Sources */,
-				B5D42DC22C984E870075473D /* FocusedValues+document.swift in Sources */,
-				B5012E812C97318600AC4D68 /* MapGroups.swift in Sources */,
-				B5012E8A2C98235500AC4D68 /* MapCommands.swift in Sources */,
-				B5012E5E2C96249400AC4D68 /* Debouncer.swift in Sources */,
-				B5012E452C9623C700AC4D68 /* Font+theme.swift in Sources */,
-				B5012E422C96235E00AC4D68 /* Stage.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -506,7 +253,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B54587252C961E9E0067B788 /* MapTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -514,8 +260,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B54587312C961E9E0067B788 /* MapUITestsLaunchTests.swift in Sources */,
-				B545872F2C961E9E0067B788 /* MapUITests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -569,7 +313,9 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = S68NHQVJXW;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -632,7 +378,9 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = S68NHQVJXW;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -662,8 +410,8 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 5;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\"";
-				DEVELOPMENT_TEAM = S68NHQVJXW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -679,7 +427,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -692,8 +441,8 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 5;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\"";
-				DEVELOPMENT_TEAM = S68NHQVJXW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -709,7 +458,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Release;
 		};
@@ -719,15 +469,15 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = S68NHQVJXW;
+				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map2Tests;
+				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.MapTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Map2.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Map2";
+				SWIFT_VERSION = 6.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Map.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Map";
 			};
 			name = Debug;
 		};
@@ -737,15 +487,15 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = S68NHQVJXW;
+				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map2Tests;
+				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.MapTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Map2.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Map2";
+				SWIFT_VERSION = 6.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Map.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Map";
 			};
 			name = Release;
 		};
@@ -754,14 +504,14 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = S68NHQVJXW;
+				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map2UITests;
+				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.MapUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_VERSION = 5.0;
-				TEST_TARGET_NAME = Map2;
+				SWIFT_VERSION = 6.0;
+				TEST_TARGET_NAME = Map;
 			};
 			name = Debug;
 		};
@@ -770,14 +520,14 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = S68NHQVJXW;
+				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map2UITests;
+				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.MapUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_VERSION = 5.0;
-				TEST_TARGET_NAME = Map2;
+				SWIFT_VERSION = 6.0;
+				TEST_TARGET_NAME = Map;
 			};
 			name = Release;
 		};
@@ -811,7 +561,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B545873A2C961E9E0067B788 /* Build configuration list for PBXNativeTarget "Map2UITests" */ = {
+		B545873A2C961E9E0067B788 /* Build configuration list for PBXNativeTarget "MapUITests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				B545873B2C961E9E0067B788 /* Debug */,