IOS-106: Remove unused code, fix analytics for native ads.

1Weather/Ads/Configuration/AdConfig.swift

@@ -16,16 +16,11 @@ public struct AdConfig: Codable {
     var a9MaxCachedPerPlacement: UInt
     var a9MaxCachedPerPlacement: UInt
     
     
     var placements: [AdPlacementName: AdPlacement]?
     var placements: [AdPlacementName: AdPlacement]?
-    var nativePlacements: [AdPlacementName: NativeAdPlacement]?
     
     
     func placement(named name:String) -> AdPlacement? {
     func placement(named name:String) -> AdPlacement? {
         return placements?[name]
         return placements?[name]
     }
     }
     
     
-    func nativePlacement(named name:String) -> NativeAdPlacement? {
-        return nativePlacements?[name]
-    }
-    
     struct CodingKeys: CodingKey {
     struct CodingKeys: CodingKey {
         var stringValue: String
         var stringValue: String
         init(stringValue: String) {
         init(stringValue: String) {
@@ -89,8 +84,7 @@ extension AdConfig: Equatable {
     public static func == (lhs: AdConfig, rhs: AdConfig) -> Bool {
     public static func == (lhs: AdConfig, rhs: AdConfig) -> Bool {
         return lhs.adsEnabled == rhs.adsEnabled &&
         return lhs.adsEnabled == rhs.adsEnabled &&
             lhs.a9RefreshRate == rhs.a9RefreshRate &&
             lhs.a9RefreshRate == rhs.a9RefreshRate &&
-            lhs.placements == rhs.placements &&
-            lhs.nativePlacements == rhs.nativePlacements
+            lhs.placements == rhs.placements
     }
     }
 }
 }
 
 
@@ -104,21 +98,6 @@ extension ContentUrlConfig: Equatable {
     }
     }
 }
 }
 
 
-struct NativeAdPlacement: Codable {
-    
-    var name: String
-    var adUnitId: String
-    var refreshInterval: TimeInterval
-    var interstitialScreenCount: Int?
-        
-    enum CodingKeys: String, CodingKey {
-        case name
-        case adUnitId = "ad_unit_id"
-        case refreshInterval = "refresh_interval"
-        case interstitialScreenCount = "interstitial_screen_count"
-    }
-}
-
 struct AdPlacement: Codable {
 struct AdPlacement: Codable {
     var name: String
     var name: String
     var adUnitId: String
     var adUnitId: String
@@ -143,12 +122,3 @@ extension AdPlacement: Equatable {
             lhs.refreshInterval == rhs.refreshInterval
             lhs.refreshInterval == rhs.refreshInterval
     }
     }
 }
 }
-
-extension NativeAdPlacement: Equatable {
-    static func == (lhs: NativeAdPlacement, rhs: NativeAdPlacement) -> Bool {
-        return lhs.name == rhs.name &&
-            lhs.adUnitId == rhs.adUnitId &&
-            lhs.refreshInterval == rhs.refreshInterval &&
-            lhs.interstitialScreenCount == rhs.interstitialScreenCount
-    }
-}

1Weather/Ads/Native/NativeAdItem.swift

@@ -18,8 +18,8 @@ final class NativeAdItem: NSObject {
         case banner
         case banner
     }
     }
     
     
-    private var placement: NativeAdPlacement? {
-        return AdConfigManager.shared.adConfig.nativePlacements?.filter({ $0.value.adUnitId == adUnitId }).first?.value
+    private var placement: AdPlacement? {
+        return AdConfigManager.shared.adConfig.placements?.filter({ $0.value.adUnitId == adUnitId }).first?.value
     }
     }
     
     
     private var analyticsParams: [AnalyticsParameter: Any] {
     private var analyticsParams: [AnalyticsParameter: Any] {
@@ -60,9 +60,6 @@ final class NativeAdItem: NSObject {
     }
     }
         
         
     func placementName() -> AdPlacementName? {
     func placementName() -> AdPlacementName? {
-        if let nativePlacement = AdConfigManager.shared.adConfig.nativePlacements?.filter({ $0.value.adUnitId == adUnitId }).first {
-            return nativePlacement.key
-        }
         if let bannerPlacement = AdConfigManager.shared.adConfig.placements?.filter({ $0.value.adUnitId == adUnitId }).first {
         if let bannerPlacement = AdConfigManager.shared.adConfig.placements?.filter({ $0.value.adUnitId == adUnitId }).first {
             return bannerPlacement.key
             return bannerPlacement.key
         }
         }