Skip to content

Commit 535c720

Browse files
srikanth-vgsrikanth-vg
committed
resolved conflict issues
1 parent a752aa4 commit 535c720

File tree

2 files changed

+68
-42
lines changed

2 files changed

+68
-42
lines changed

‎GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -142,22 +142,22 @@
142142
A4E711A82B57CA4300C9DE08 /* QuestsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4E711A72B57CA4300C9DE08 /* QuestsRepository.swift */; };
143143
B0CCB98C2B8626AE00AA73DE /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0CCB98B2B8626AE00AA73DE /* ProfileView.swift */; };
144144
B0CCB98E2B8626C600AA73DE /* ProfileViewVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0CCB98D2B8626C600AA73DE /* ProfileViewVM.swift */; };
145+
C71EB5AC2E2100510009E610 /* WMTSServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71EB5AA2E2100510009E610 /* WMTSServer.swift */; };
146+
C71EB5AD2E2100510009E610 /* SatellitePickerSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71EB5A82E2100510009E610 /* SatellitePickerSheet.swift */; };
147+
C71EB5AE2E2100510009E610 /* SatelliteServerResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71EB5A92E2100510009E610 /* SatelliteServerResponse.swift */; };
148+
C71EB5B02E2100B80009E610 /* MapRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71EB5AF2E2100B80009E610 /* MapRepository.swift */; };
149+
C71EB5B62E2100E30009E610 /* ResponseHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71EB5B42E2100E30009E610 /* ResponseHandler.swift */; };
150+
C71EB5B72E2100E30009E610 /* NetworkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71EB5B22E2100E30009E610 /* NetworkManager.swift */; };
151+
C71EB5B82E2100E30009E610 /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71EB5B32E2100E30009E610 /* NetworkMonitor.swift */; };
152+
C71EB5B92E2100E30009E610 /* APIManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71EB5B12E2100E30009E610 /* APIManager.swift */; };
145153
C75666D02E0D068900D36C41 /* OHHTTPStubs in Frameworks */ = {isa = PBXBuildFile; productRef = C75666CF2E0D068900D36C41 /* OHHTTPStubs */; };
146154
C75666D22E0D068900D36C41 /* OHHTTPStubsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = C75666D12E0D068900D36C41 /* OHHTTPStubsSwift */; };
147155
C75CC5D92E0D22F4008A94A0 /* LongQuestsResponse.json in Resources */ = {isa = PBXBuildFile; fileRef = C75CC5D82E0D22F4008A94A0 /* LongQuestsResponse.json */; };
148156
C75CC5DA2E0D22F4008A94A0 /* Workspaces response.json in Resources */ = {isa = PBXBuildFile; fileRef = C75CC5D62E0D22F4008A94A0 /* Workspaces response.json */; };
149157
C75CC5DB2E0D22F4008A94A0 /* SCLIO Seattle pins response.json in Resources */ = {isa = PBXBuildFile; fileRef = C75CC5D72E0D22F4008A94A0 /* SCLIO Seattle pins response.json */; };
150-
C755C00E2E12BF7D002F1B30 /* SatellitePickerSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C755C00D2E12BF79002F1B30 /* SatellitePickerSheet.swift */; };
151158
C75EAD362E042D4500F75969 /* SideWalkWidth.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4E711A12B57A3B400C9DE08 /* SideWalkWidth.swift */; };
152159
C75EAD372E042D4500F75969 /* SideWalkWidthForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973FC0132B4D353800878269 /* SideWalkWidthForm.swift */; };
153160
C76187DC2E0153D800150201 /* ClusterMap in Frameworks */ = {isa = PBXBuildFile; productRef = C76187DB2E0153D800150201 /* ClusterMap */; };
154-
C7672F992E123C720084A610 /* MapRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7672F982E123A3F0084A610 /* MapRepository.swift */; };
155-
C76CAF712E1118910095E48E /* APIManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C76CAF702E11188E0095E48E /* APIManager.swift */; };
156-
C76CAF732E111A940095E48E /* NetworkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C76CAF722E111A8E0095E48E /* NetworkManager.swift */; };
157-
C76CAF752E112FDF0095E48E /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C76CAF742E112FDE0095E48E /* NetworkMonitor.swift */; };
158-
C76CAF772E112FF70095E48E /* ResponseHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C76CAF762E112FF30095E48E /* ResponseHandler.swift */; };
159-
C76CAF7A2E1133060095E48E /* SatelliteServerResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = C76CAF792E1132EA0095E48E /* SatelliteServerResponse.swift */; };
160-
C76CAF7C2E11335A0095E48E /* WMTSServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C76CAF7B2E1133530095E48E /* WMTSServer.swift */; };
161161
C76DA1A12DF0679F00451E63 /* LongFormModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8C74C32C4FDE1000D28220 /* LongFormModel.swift */; };
162162
C77A4A262DF2AF3100DED8B0 /* SecureInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C77A4A252DF2AF3100DED8B0 /* SecureInputView.swift */; };
163163
C77EEBCF2DE59D3200494CB4 /* UndoMerge.swift in Sources */ = {isa = PBXBuildFile; fileRef = C77EEBCE2DE59D3200494CB4 /* UndoMerge.swift */; };
@@ -485,18 +485,18 @@
485485
B0CCB98B2B8626AE00AA73DE /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
486486
B0CCB98D2B8626C600AA73DE /* ProfileViewVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewVM.swift; sourceTree = "<group>"; };
487487
C4F37DA661B22FA87DF8282F /* Pods_osmapi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_osmapi.framework; sourceTree = BUILT_PRODUCTS_DIR; };
488+
C71EB5A82E2100510009E610 /* SatellitePickerSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SatellitePickerSheet.swift; sourceTree = "<group>"; };
489+
C71EB5A92E2100510009E610 /* SatelliteServerResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SatelliteServerResponse.swift; sourceTree = "<group>"; };
490+
C71EB5AA2E2100510009E610 /* WMTSServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTSServer.swift; sourceTree = "<group>"; };
491+
C71EB5AF2E2100B80009E610 /* MapRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapRepository.swift; sourceTree = "<group>"; };
492+
C71EB5B12E2100E30009E610 /* APIManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIManager.swift; sourceTree = "<group>"; };
493+
C71EB5B22E2100E30009E610 /* NetworkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkManager.swift; sourceTree = "<group>"; };
494+
C71EB5B32E2100E30009E610 /* NetworkMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkMonitor.swift; sourceTree = "<group>"; };
495+
C71EB5B42E2100E30009E610 /* ResponseHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseHandler.swift; sourceTree = "<group>"; };
488496
C75CC5D62E0D22F4008A94A0 /* Workspaces response.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "Workspaces response.json"; sourceTree = "<group>"; };
489497
C75CC5D72E0D22F4008A94A0 /* SCLIO Seattle pins response.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "SCLIO Seattle pins response.json"; sourceTree = "<group>"; };
490498
C75CC5D82E0D22F4008A94A0 /* LongQuestsResponse.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = LongQuestsResponse.json; sourceTree = "<group>"; };
491499
C75E47732E151058006D903A /* Kondapur.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Kondapur.gpx; sourceTree = "<group>"; };
492-
C755C00D2E12BF79002F1B30 /* SatellitePickerSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SatellitePickerSheet.swift; sourceTree = "<group>"; };
493-
C7672F982E123A3F0084A610 /* MapRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapRepository.swift; sourceTree = "<group>"; };
494-
C76CAF702E11188E0095E48E /* APIManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIManager.swift; sourceTree = "<group>"; };
495-
C76CAF722E111A8E0095E48E /* NetworkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkManager.swift; sourceTree = "<group>"; };
496-
C76CAF742E112FDE0095E48E /* NetworkMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkMonitor.swift; sourceTree = "<group>"; };
497-
C76CAF762E112FF30095E48E /* ResponseHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseHandler.swift; sourceTree = "<group>"; };
498-
C76CAF792E1132EA0095E48E /* SatelliteServerResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SatelliteServerResponse.swift; sourceTree = "<group>"; };
499-
C76CAF7B2E1133530095E48E /* WMTSServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTSServer.swift; sourceTree = "<group>"; };
500500
C77A4A252DF2AF3100DED8B0 /* SecureInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureInputView.swift; sourceTree = "<group>"; };
501501
C77EEBCE2DE59D3200494CB4 /* UndoMerge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UndoMerge.swift; sourceTree = "<group>"; };
502502
C7ED070E2D70E2EC001FFFE2 /* TokenRefresher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenRefresher.swift; sourceTree = "<group>"; };
@@ -679,7 +679,7 @@
679679
0536DD952B0BD91F00B04C4B /* Network */ = {
680680
isa = PBXGroup;
681681
children = (
682-
C76CAF6F2E1118610095E48E /* APIHandler */,
682+
C71EB5B52E2100E30009E610 /* APIHandler */,
683683
A48037342BBA8DCB007EE7E4 /* models */,
684684
0536DD962B0BD95100B04C4B /* URLSession+Extension.swift */,
685685
A48037302BBA8C25007EE7E4 /* ApiManager.swift */,
@@ -824,8 +824,8 @@
824824
971575152B5FFD5F0044797C /* Map */ = {
825825
isa = PBXGroup;
826826
children = (
827-
C7672F982E123A3F0084A610 /* MapRepository.swift */,
828-
C76CAF782E1132380095E48E /* Satellite Server */,
827+
C71EB5AF2E2100B80009E610 /* MapRepository.swift */,
828+
C71EB5AB2E2100510009E610 /* Satellite Server */,
829829
971575182B5FFE910044797C /* LocationManagerCoordinator.swift */,
830830
FA50718D2D54E1D200CE9798 /* BingTileOverlay.swift */,
831831
971575162B5FFD6F0044797C /* MapView.swift */,
@@ -1283,33 +1283,35 @@
12831283
path = Profile;
12841284
sourceTree = "<group>";
12851285
};
1286-
C75CC5D52E0D22E0008A94A0 /* SampleResponses */ = {
1286+
C71EB5AB2E2100510009E610 /* Satellite Server */ = {
12871287
isa = PBXGroup;
12881288
children = (
1289-
C75CC5D62E0D22F4008A94A0 /* Workspaces response.json */,
1290-
C75CC5D72E0D22F4008A94A0 /* SCLIO Seattle pins response.json */,
1291-
C75CC5D82E0D22F4008A94A0 /* LongQuestsResponse.json */,
1289+
C71EB5A82E2100510009E610 /* SatellitePickerSheet.swift */,
1290+
C71EB5A92E2100510009E610 /* SatelliteServerResponse.swift */,
1291+
C71EB5AA2E2100510009E610 /* WMTSServer.swift */,
12921292
);
1293-
path = SampleResponses;
1294-
C76CAF6F2E1118610095E48E /* APIHandler */ = {
1293+
path = "Satellite Server";
1294+
sourceTree = "<group>";
1295+
};
1296+
C71EB5B52E2100E30009E610 /* APIHandler */ = {
12951297
isa = PBXGroup;
12961298
children = (
1297-
C76CAF762E112FF30095E48E /* ResponseHandler.swift */,
1298-
C76CAF742E112FDE0095E48E /* NetworkMonitor.swift */,
1299-
C76CAF722E111A8E0095E48E /* NetworkManager.swift */,
1300-
C76CAF702E11188E0095E48E /* APIManager.swift */,
1299+
C71EB5B12E2100E30009E610 /* APIManager.swift */,
1300+
C71EB5B22E2100E30009E610 /* NetworkManager.swift */,
1301+
C71EB5B32E2100E30009E610 /* NetworkMonitor.swift */,
1302+
C71EB5B42E2100E30009E610 /* ResponseHandler.swift */,
13011303
);
13021304
path = APIHandler;
13031305
sourceTree = "<group>";
13041306
};
1305-
C76CAF782E1132380095E48E /* Satellite Server */ = {
1307+
C75CC5D52E0D22E0008A94A0 /* SampleResponses */ = {
13061308
isa = PBXGroup;
13071309
children = (
1308-
C755C00D2E12BF79002F1B30 /* SatellitePickerSheet.swift */,
1309-
C76CAF7B2E1133530095E48E /* WMTSServer.swift */,
1310-
C76CAF792E1132EA0095E48E /* SatelliteServerResponse.swift */,
1310+
C75CC5D62E0D22F4008A94A0 /* Workspaces response.json */,
1311+
C75CC5D72E0D22F4008A94A0 /* SCLIO Seattle pins response.json */,
1312+
C75CC5D82E0D22F4008A94A0 /* LongQuestsResponse.json */,
13111313
);
1312-
path = "Satellite Server";
1314+
path = SampleResponses;
13131315
sourceTree = "<group>";
13141316
};
13151317
FA18CADE2CC7CD46008247F2 /* Kartaview */ = {
@@ -2167,16 +2169,13 @@
21672169
FAEE21DB2DCA1963002F9BEC /* UndoButton.swift in Sources */,
21682170
A4834A3F2B67737500D4F0AA /* StoredChangeset.swift in Sources */,
21692171
FAFDA2082C6E8F2500ECEAE9 /* APIConfiguration.swift in Sources */,
2170-
C76CAF732E111A940095E48E /* NetworkManager.swift in Sources */,
21712172
971342752BBD254200174EBF /* InitialViewModel.swift in Sources */,
21722173
FA5071902D5B31CC00CE9798 /* CreateNoteView.swift in Sources */,
21732174
FA6DB8B32D8853DD0070CCD3 /* UserSettingsView.swift in Sources */,
21742175
FA633CB62DD48C4400324404 /* SessionManager.swift in Sources */,
21752176
059D47312B2C81A9000987FA /* Style.swift in Sources */,
21762177
A4E711A82B57CA4300C9DE08 /* QuestsRepository.swift in Sources */,
21772178
FAFDA2022C6D33C300ECEAE9 /* PosmLoginViewModel.swift in Sources */,
2178-
C755C00E2E12BF7D002F1B30 /* SatellitePickerSheet.swift in Sources */,
2179-
C7672F992E123C720084A610 /* MapRepository.swift in Sources */,
21802179
FAFDA2142C7351CB00ECEAE9 /* APIError.swift in Sources */,
21812180
FA9F381C2DB2FF4B00D7AABF /* ShadowOverlayRenderer.swift in Sources */,
21822181
059D47332B2C83BA000987FA /* Highway.swift in Sources */,
@@ -2195,14 +2194,11 @@
21952194
FA8C74D82C60E95100D28220 /* PosmLogin.swift in Sources */,
21962195
FA5071962D6DD31A00CE9798 /* LongElementQuest.swift in Sources */,
21972196
FAFDA20E2C6F58D600ECEAE9 /* UserProfile.swift in Sources */,
2198-
C76CAF712E1118910095E48E /* APIManager.swift in Sources */,
21992197
FABF3CF82B822F120080EAC9 /* CustomSureAlert.swift in Sources */,
22002198
FA18CAEB2CD0F718008247F2 /* CameraView.swift in Sources */,
22012199
05DBBB642B17204300B6F110 /* RealmOPGeometry.swift in Sources */,
22022200
FA87A8102B68142F000A6BEA /* LoadingView.swift in Sources */,
2203-
C76CAF772E112FF70095E48E /* ResponseHandler.swift in Sources */,
22042201
0536DD922B0BD58800B04C4B /* OAuthService.swift in Sources */,
2205-
C76CAF7C2E11335A0095E48E /* WMTSServer.swift in Sources */,
22062202
973FC0112B4D2D1C00878269 /* QuestAndDescriptionView.swift in Sources */,
22072203
FAFDA2042C6E8BEA00ECEAE9 /* APIEnvironment.swift in Sources */,
22082204
973FC0032B47DE0700878269 /* QuestsVM.swift in Sources */,
@@ -2219,9 +2215,11 @@
22192215
FA5853C12B21F17F00301CDA /* OnboardingView.swift in Sources */,
22202216
A4B83AF32B5F9385006684CA /* StoredWay.swift in Sources */,
22212217
FA18CAE52CC7D0DD008247F2 /* SequenceModel.swift in Sources */,
2218+
C71EB5AC2E2100510009E610 /* WMTSServer.swift in Sources */,
2219+
C71EB5AD2E2100510009E610 /* SatellitePickerSheet.swift in Sources */,
2220+
C71EB5AE2E2100510009E610 /* SatelliteServerResponse.swift in Sources */,
22222221
FAE481A22DD5EF3800149A48 /* PasswordAuthenticationPopupView.swift in Sources */,
22232222
05DBBB5F2B1263FF00B6F110 /* DatabaseConnector.swift in Sources */,
2224-
C76CAF752E112FDF0095E48E /* NetworkMonitor.swift in Sources */,
22252223
FAF44FC12B30850A004FE664 /* OnboardingView3.swift in Sources */,
22262224
970D5BD12B62B61300C20BE7 /* MapViewController.swift in Sources */,
22272225
FA9FE2D82BAC75390036F618 /* OAuthViewController.swift in Sources */,
@@ -2234,13 +2232,17 @@
22342232
973FC04C2B5A5F5F00878269 /* RadioItem.swift in Sources */,
22352233
FA18CAE92CCFD212008247F2 /* FinishUploadingModel.swift in Sources */,
22362234
C7ED070F2D70E2EC001FFFE2 /* TokenRefresher.swift in Sources */,
2235+
C71EB5B62E2100E30009E610 /* ResponseHandler.swift in Sources */,
2236+
C71EB5B72E2100E30009E610 /* NetworkManager.swift in Sources */,
2237+
C71EB5B82E2100E30009E610 /* NetworkMonitor.swift in Sources */,
2238+
C71EB5B92E2100E30009E610 /* APIManager.swift in Sources */,
22372239
FA50718C2D54E08800CE9798 /* AddFeatureView.swift in Sources */,
2240+
C71EB5B02E2100B80009E610 /* MapRepository.swift in Sources */,
22382241
A495DF2D2B6A190400478E44 /* CustomMapView.swift in Sources */,
22392242
05DBBB662B17209600B6F110 /* RealmOPMeta.swift in Sources */,
22402243
B0CCB98E2B8626C600AA73DE /* ProfileViewVM.swift in Sources */,
22412244
FA8C74C92C57B9AE00D28220 /* LongQuestView.swift in Sources */,
22422245
FAFDA1FF2C6D337800ECEAE9 /* PosmLoginModel.swift in Sources */,
2243-
C76CAF7A2E1133060095E48E /* SatelliteServerResponse.swift in Sources */,
22442246
0536DD942B0BD59900B04C4B /* OAuthError.swift in Sources */,
22452247
973FC0172B4D567900878269 /* WidthView.swift in Sources */,
22462248
FABF3CFD2B8607860080EAC9 /* MeasureWidthContainer.swift in Sources */,

‎GoInfoGame/GoInfoGame.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)