OFU-Crew · O-O-wl · Jan 3, 2021 · Jan 3, 2021
diff --git a/Dear-World/Dear-World.xcodeproj/project.pbxproj b/Dear-World/Dear-World.xcodeproj/project.pbxproj
@@ -59,6 +59,8 @@
 		39E9F7D025A1738F00BC2CC2 /* AboutReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E9F7CF25A1738F00BC2CC2 /* AboutReactor.swift */; };
 		39E9F7DB25A1BBED00BC2CC2 /* PixelWorldMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E9F7DA25A1BBED00BC2CC2 /* PixelWorldMapView.swift */; };
 		39E9F7E025A1BC3C00BC2CC2 /* NoticeBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E9F7DF25A1BC3C00BC2CC2 /* NoticeBadge.swift */; };
+		39E9F7E625A1C80300BC2CC2 /* WorldMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E9F7E525A1C80300BC2CC2 /* WorldMap.swift */; };
+		39E9F7ED25A1C84900BC2CC2 /* WorldMap.Model.Country.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E9F7EC25A1C84900BC2CC2 /* WorldMap.Model.Country.swift */; };
 		39EED22E259CFEB8007452E1 /* World.Model.Ranker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39EED22D259CFEB8007452E1 /* World.Model.Ranker.swift */; };
 		39EED23C259D00F8007452E1 /* CheeringMapReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39EED23B259D00F8007452E1 /* CheeringMapReactor.swift */; };
 		39EED241259D0227007452E1 /* Revision.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39EED240259D0227007452E1 /* Revision.swift */; };
@@ -140,6 +142,8 @@
 		39E9F7CF25A1738F00BC2CC2 /* AboutReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutReactor.swift; sourceTree = "<group>"; };
 		39E9F7DA25A1BBED00BC2CC2 /* PixelWorldMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelWorldMapView.swift; sourceTree = "<group>"; };
 		39E9F7DF25A1BC3C00BC2CC2 /* NoticeBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeBadge.swift; sourceTree = "<group>"; };
+		39E9F7E525A1C80300BC2CC2 /* WorldMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldMap.swift; sourceTree = "<group>"; };
+		39E9F7EC25A1C84900BC2CC2 /* WorldMap.Model.Country.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldMap.Model.Country.swift; sourceTree = "<group>"; };
 		39EED22D259CFEB8007452E1 /* World.Model.Ranker.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = World.Model.Ranker.swift; sourceTree = "<group>"; tabWidth = 2; };
 		39EED23B259D00F8007452E1 /* CheeringMapReactor.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = CheeringMapReactor.swift; sourceTree = "<group>"; tabWidth = 2; };
 		39EED240259D0227007452E1 /* Revision.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Revision.swift; sourceTree = "<group>"; };
@@ -351,6 +355,7 @@
 			isa = PBXGroup;
 			children = (
 				39658FAD259AE4D30050D180 /* World */,
+				39E9F7E425A1C78900BC2CC2 /* World Map */,
 				3971EB16259A7BB10084E6DC /* Emoji */,
 				128313EA2598A0C800BDF8A3 /* Message */,
 			);
@@ -504,6 +509,31 @@
 			path = API;
 			sourceTree = "<group>";
 		};
+		39E9F7E425A1C78900BC2CC2 /* World Map */ = {
+			isa = PBXGroup;
+			children = (
+				39E9F7EB25A1C83500BC2CC2 /* Model */,
+				39E9F7EA25A1C83100BC2CC2 /* API */,
+				39E9F7E525A1C80300BC2CC2 /* WorldMap.swift */,
+			);
+			path = "World Map";
+			sourceTree = "<group>";
+		};
+		39E9F7EA25A1C83100BC2CC2 /* API */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = API;
+			sourceTree = "<group>";
+		};
+		39E9F7EB25A1C83500BC2CC2 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				39E9F7EC25A1C84900BC2CC2 /* WorldMap.Model.Country.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		39F0C1802598684100A7001F /* Network */ = {
 			isa = PBXGroup;
 			children = (
@@ -727,6 +757,7 @@
 				39658F8D259AD9900050D180 /* SplashViewController.swift in Sources */,
 				3971EB29259A7D720084E6DC /* SendMessageReactor.swift in Sources */,
 				39F0C19B2598860100A7001F /* ResponseWrapper.swift in Sources */,
+				39E9F7E625A1C80300BC2CC2 /* WorldMap.swift in Sources */,
 				3971EB3C259A9C860084E6DC /* Message.Model.SendMessage.swift in Sources */,
 				39658FAF259AE4E40050D180 /* World.swift in Sources */,
 				3971EB24259A7C420084E6DC /* Emoji.Model.Random.swift in Sources */,
@@ -739,6 +770,7 @@
 				121BDB2A2597259E0062B15A /* MessageCountBadgeView.swift in Sources */,
 				39F0C16B2597C7DF00A7001F /* UIImage+.swift in Sources */,
 				39E9F7E025A1BC3C00BC2CC2 /* NoticeBadge.swift in Sources */,
+				39E9F7ED25A1C84900BC2CC2 /* WorldMap.Model.Country.swift in Sources */,
 				121BDB6C2597A49B0062B15A /* MessageMock.swift in Sources */,
 				39658FC0259AE58C0050D180 /* World.Model.Country.swift in Sources */,
 				121BDB8E259829840062B15A /* CountrySelectController.swift in Sources */,

diff --git a/Dear-World/Dear-World/Source/Domain/World Map/Model/WorldMap.Model.Country.swift b/Dear-World/Dear-World/Source/Domain/World Map/Model/WorldMap.Model.Country.swift
@@ -0,0 +1,110 @@
+//
+//  WorldMap.Model.Country.swift
+//  Dear-World
+//
+//  Created by dongyoung.lee on 2021/01/03.
+//
+
+import UIKit
+
+extension WorldMap.Model {
+  struct Country {
+    let code: String
+    let name: String
+    let locations: [Location]
+  }
+
+  struct Location {
+    let x: Int
+    let y: Int
+  }
+}
+extension WorldMap.Model {
+  static let US = Country(
+    code: "US",
+    name: "United States",
+    locations: [
+      Location(x: 1, y: 16),
+      Location(x: 1, y: 18),
+      Location(x: 1, y: 20),
+      Location(x: 2, y: 15),
+      Location(x: 2, y: 16),
+      Location(x: 2, y: 17),
+      Location(x: 2, y: 18),
+      Location(x: 2, y: 19),
+      Location(x: 2, y: 20),
+      Location(x: 3, y: 15),
+      Location(x: 3, y: 16),
+      Location(x: 3, y: 17),
+      Location(x: 3, y: 18),
+      Location(x: 3, y: 19),
+      Location(x: 3, y: 20),
+      Location(x: 3, y: 21),
+      Location(x: 4, y: 15),
+      Location(x: 4, y: 16),
+      Location(x: 4, y: 17),
+      Location(x: 4, y: 18),
+      Location(x: 4, y: 19),
+      Location(x: 4, y: 20),
+      Location(x: 5, y: 16),
+      Location(x: 5, y: 17),
+      Location(x: 5, y: 18),
+      Location(x: 5, y: 19),
+      Location(x: 5, y: 20),
+      Location(x: 6, y: 16),
+      Location(x: 6, y: 17),
+      Location(x: 6, y: 18),
+      Location(x: 6, y: 19),
+      Location(x: 10, y: 25),
+      Location(x: 10, y: 26),
+      Location(x: 10, y: 27),
+      Location(x: 11, y: 25),
+      Location(x: 11, y: 26),
+      Location(x: 11, y: 27),
+      Location(x: 11, y: 28),
+      Location(x: 12, y: 25),
+      Location(x: 12, y: 26),
+      Location(x: 12, y: 27),
+      Location(x: 12, y: 28),
+      Location(x: 12, y: 29),
+      Location(x: 13, y: 25),
+      Location(x: 13, y: 26),
+      Location(x: 13, y: 27),
+      Location(x: 13, y: 28),
+      Location(x: 13, y: 29),
+      Location(x: 14, y: 25),
+      Location(x: 14, y: 26),
+      Location(x: 14, y: 27),
+      Location(x: 14, y: 28),
+      Location(x: 14, y: 29),
+      Location(x: 15, y: 25),
+      Location(x: 15, y: 26),
+      Location(x: 15, y: 27),
+      Location(x: 15, y: 28),
+      Location(x: 15, y: 29),
+      Location(x: 15, y: 30),
+      Location(x: 16, y: 25),
+      Location(x: 16, y: 26),
+      Location(x: 16, y: 27),
+      Location(x: 16, y: 28),
+      Location(x: 16, y: 29),
+      Location(x: 17, y: 25),
+      Location(x: 17, y: 26),
+      Location(x: 17, y: 27),
+      Location(x: 17, y: 28),
+      Location(x: 17, y: 29),
+      Location(x: 18, y: 26),
+      Location(x: 18, y: 27),
+      Location(x: 18, y: 28),
+      Location(x: 18, y: 29),
+      Location(x: 19, y: 27),
+      Location(x: 19, y: 28),
+      Location(x: 19, y: 29),
+      Location(x: 19, y: 30),
+      Location(x: 20, y: 26),
+      Location(x: 20, y: 27),
+      Location(x: 20, y: 28),
+      Location(x: 21, y: 26)
+    ]
+  )
+}
diff --git a/Dear-World/Dear-World/Source/Domain/World Map/WorldMap.swift b/Dear-World/Dear-World/Source/Domain/World Map/WorldMap.swift
@@ -0,0 +1,13 @@
+//
+//  WorldMap.swift
+//  Dear-World
+//
+//  Created by dongyoung.lee on 2021/01/03.
+//
+
+import Foundation
+
+enum WorldMap {
+  enum API {}
+  enum Model {}
+}
diff --git a/Dear-World/Dear-World/Source/Domain/World/Model/World.Model.Rank.swift b/Dear-World/Dear-World/Source/Domain/World/Model/World.Model.Rank.swift
@@ -11,5 +11,4 @@ extension World.Model {
   struct Rank: Decodable {
     let ranking: [Ranker]
   }
-
 }
diff --git a/Dear-World/Dear-World/Source/Network/ServiceAPI.swift b/Dear-World/Dear-World/Source/Network/ServiceAPI.swift
@@ -18,7 +18,7 @@ protocol ServiceAPI: URLRequestConvertible {
 }
 extension ServiceAPI {
   var baseURL: URL {
-    URL(string: "http://52.79.222.79/")!
+    URL(string: "http://api.dear-world.live")!
   }
 
   var parameters: [String: Any]? { nil }

diff --git a/Dear-World/Dear-World/Source/Presentation/View/PixelWorldMapView.swift b/Dear-World/Dear-World/Source/Presentation/View/PixelWorldMapView.swift
@@ -7,3 +7,7 @@
 
 import UIKit
 
+final class PixelWorldMapView: UIView {
+  private let collectionView: UICollectionView = UICollectionView()
+
+}
diff --git a/Dear-World/Dear-World/Support File/Info.plist b/Dear-World/Dear-World/Support File/Info.plist
@@ -1,54 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>UIUserInterfaceStyle</key>
-	<string>Light</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string> Dear World, 🌏</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-	</dict>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
+  <dict>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+      <key>NSAllowsArbitraryLoads</key>
+      <true/>
+    </dict>
+    <key>UIUserInterfaceStyle</key>
+    <string>Light</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>$(DEVELOPMENT_LANGUAGE)</string>
+    <key>CFBundleDisplayName</key>
+    <string> Dear World, 🌏</string>
+    <key>CFBundleExecutable</key>
+    <string>$(EXECUTABLE_NAME)</string>
+    <key>CFBundleIdentifier</key>
+    <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>$(PRODUCT_NAME)</string>
+    <key>CFBundlePackageType</key>
+    <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleVersion</key>
+    <string>1</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>UIApplicationSceneManifest</key>
+    <dict>
+      <key>UIApplicationSupportsMultipleScenes</key>
+      <false/>
+    </dict>
+    <key>UIApplicationSupportsIndirectInputEvents</key>
+    <true/>
+    <key>UILaunchStoryboardName</key>
+    <string>LaunchScreen</string>
+    <key>UIRequiredDeviceCapabilities</key>
+    <array>
+      <string>armv7</string>
+    </array>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+      <string>UIInterfaceOrientationPortrait</string>
+      <string>UIInterfaceOrientationLandscapeLeft</string>
+      <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+      <string>UIInterfaceOrientationPortrait</string>
+      <string>UIInterfaceOrientationPortraitUpsideDown</string>
+      <string>UIInterfaceOrientationLandscapeLeft</string>
+      <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+  </dict>
 </plist>
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,5 +11,4 @@ extension World.Model { @@
       struct Rank: Decodable {
         let ranking: [Ranker]
       }
     }